diff --git a/.classpath b/.classpath index 97fbfe1..e5b8044 100644 --- a/.classpath +++ b/.classpath @@ -1,12 +1,12 @@ - + - + @@ -28,5 +28,5 @@ - + diff --git a/src/main/java/org/gcube/portlets/user/tdwx/shared/model/ColumnDefinition.java b/src/main/java/org/gcube/portlets/user/tdwx/shared/model/ColumnDefinition.java index ec21aaa..5459f16 100644 --- a/src/main/java/org/gcube/portlets/user/tdwx/shared/model/ColumnDefinition.java +++ b/src/main/java/org/gcube/portlets/user/tdwx/shared/model/ColumnDefinition.java @@ -18,15 +18,12 @@ public class ColumnDefinition implements Serializable { protected String id; //Column Name on service protected String columnLocalId; //ColumnLocalId on service + protected boolean viewColumn; + protected String sourceTableDimensionColumnId; + protected String targetTableColumnId; + protected long targetTableId; + protected String label; //Label - public String getColumnLocalId() { - return columnLocalId; - } - - public void setColumnLocalId(String columnLocalId) { - this.columnLocalId = columnLocalId; - } - protected ValueType valueType; protected int width; protected boolean editable; @@ -36,7 +33,7 @@ public class ColumnDefinition implements Serializable { protected String tooltipMessage; protected String columnTypeName; protected String columnDataType; - + protected ColumnKey key; public ColumnDefinition(){} @@ -209,17 +206,69 @@ public class ColumnDefinition implements Serializable { public void setColumnDataType(String columnDataType) { this.columnDataType = columnDataType; } + + + public String getColumnLocalId() { + return columnLocalId; + } + + public void setColumnLocalId(String columnLocalId) { + this.columnLocalId = columnLocalId; + } + + public boolean isViewColumn() { + return viewColumn; + } + + public void setViewColumn(boolean viewColumn) { + this.viewColumn = viewColumn; + } + + public String getSourceTableDimensionColumnId() { + return sourceTableDimensionColumnId; + } + + public void setSourceTableDimensionColumnId(String sourceTableDimensionColumnId) { + this.sourceTableDimensionColumnId = sourceTableDimensionColumnId; + } + + public String getTargetTableColumnId() { + return targetTableColumnId; + } + + public void setTargetTableColumnId(String targetTableColumnId) { + this.targetTableColumnId = targetTableColumnId; + } + + public long getTargetTableId() { + return targetTableId; + } + + public void setTargetTableId(long targetTableId) { + this.targetTableId = targetTableId; + } + + public void setLabel(String label) { + this.label = label; + } @Override public String toString() { - return "ColumnDefinition [id=" + id + ", label=" + label - + ", columnLocalId=" + columnLocalId + ", valueType=" - + valueType + ", width=" + width + ", editable=" + editable - + ", visible=" + visible + ", type=" + type + ", position=" - + position + ", tooltipMessage=" + tooltipMessage - + ", columnTypeName=" + columnTypeName + ", columnDataType=" - + columnDataType + ", key=" + key + "]"; + return "ColumnDefinition [id=" + id + ", columnLocalId=" + + columnLocalId + ", viewColumn=" + viewColumn + + ", sourceTableDimensionColumnId=" + + sourceTableDimensionColumnId + ", targetTableColumnId=" + + targetTableColumnId + ", targetTableId=" + targetTableId + + ", label=" + label + ", valueType=" + valueType + ", width=" + + width + ", editable=" + editable + ", visible=" + visible + + ", type=" + type + ", position=" + position + + ", tooltipMessage=" + tooltipMessage + ", columnTypeName=" + + columnTypeName + ", columnDataType=" + columnDataType + + ", key=" + key + "]"; } + + +