Minor Update

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-gwt-service@96338 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Giancarlo Panichi 2014-05-30 16:02:58 +00:00
parent b2fae7fff1
commit e8da8c451d
1 changed files with 23 additions and 15 deletions

View File

@ -15,6 +15,7 @@ public class DefNewColumn implements Serializable {
private static final long serialVersionUID = 7467523779864189492L;
protected String id;// For grid and combo only;
protected ColumnTypeCode columnType;
protected ColumnDataType columnDataType;
protected String defaultValue;
@ -28,7 +29,6 @@ public class DefNewColumn implements Serializable {
}
/**
* For Code, CodeDescription and Annotation Column
*
@ -39,13 +39,12 @@ public class DefNewColumn implements Serializable {
*/
public DefNewColumn(String label, ColumnTypeCode columnType,
String defaultValue) {
this.id = "1";
this.label = label;
this.columnType = columnType;
this.defaultValue = defaultValue;
}
/**
* For Attribute and Measure Column
*
@ -56,14 +55,13 @@ public class DefNewColumn implements Serializable {
*/
public DefNewColumn(String label, ColumnTypeCode columnType,
ColumnDataType columnDataType, String defaultValue) {
this.id = "1";
this.label = label;
this.columnType = columnType;
this.columnDataType = columnDataType;
this.defaultValue = defaultValue;
}
/**
* For CodeName Column
*
@ -74,13 +72,13 @@ public class DefNewColumn implements Serializable {
*/
public DefNewColumn(String label, ColumnTypeCode columnType,
String localeName, String defaultValue) {
this.id = "1";
this.label = label;
this.columnType = columnType;
this.localeName = localeName;
this.defaultValue = defaultValue;
}
/**
* For Dimension
*
@ -92,13 +90,14 @@ public class DefNewColumn implements Serializable {
*/
public DefNewColumn(String label, ColumnTypeCode columnType,
ColumnData codelistColumnReference, String defaultValue) {
this.id = "1";
this.label = label;
this.columnType = columnType;
this.codelistColumnReference= codelistColumnReference;
this.codelistColumnReference = codelistColumnReference;
this.defaultValue = defaultValue;
}
/**
* For TimeDimension
*
@ -110,11 +109,12 @@ public class DefNewColumn implements Serializable {
*/
public DefNewColumn(String label, ColumnTypeCode columnType,
TimeDimensionType timeDimensionType, String defaultValue) {
this.id = "1";
this.label = label;
this.columnType = columnType;
this.timeDimensionType=timeDimensionType;
this.timeDimensionType = timeDimensionType;
this.defaultValue = defaultValue;
}
public String getLabel() {
@ -173,12 +173,20 @@ public class DefNewColumn implements Serializable {
this.codelistColumnReference = codelistColumnReference;
}
public String getId() {
return id;
}
public void setId(String id) {
this.id = id;
}
@Override
public String toString() {
return "DefNewColumn [columnType=" + columnType + ", columnDataType="
+ columnDataType + ", defaultValue=" + defaultValue
+ ", label=" + label + ", localeName=" + localeName
+ ", timeDimensionType=" + timeDimensionType
return "DefNewColumn [id=" + id + ", columnType=" + columnType
+ ", columnDataType=" + columnDataType + ", defaultValue="
+ defaultValue + ", label=" + label + ", localeName="
+ localeName + ", timeDimensionType=" + timeDimensionType
+ ", codelistColumnReference=" + codelistColumnReference + "]";
}