gCubeSystem
/
tabular-data-widget-common-event
16
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Minor Update 

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-widget-common-event@113636 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Giancarlo Panichi 2015-03-18 09:30:59 +00:00
parent ef48de7e4d
commit 9a783981a0
2 changed files with 33 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
src/main/java/org/gcube/portlets/user/td/widgetcommonevent/shared/tr/column/ColumnDataType.java
View File

@ -1,21 +1,15 @@
package org.gcube.portlets.user.td.widgetcommonevent.shared.tr.column; package org.gcube.portlets.user.td.widgetcommonevent.shared.tr.column;
/** /**
* *
* @author "Giancarlo Panichi" * @author "Giancarlo Panichi" <a
* <a href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a> * href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a>
* *
*/ */
public enum ColumnDataType { public enum ColumnDataType {
Boolean("Boolean"), Boolean("Boolean"), Geometry("Geometry"), Integer("Integer"), Numeric(
Geometry("Geometry"), "Numeric"), Date("Date"), Text("Text");
Integer("Integer"),
Numeric("Numeric"),
Date("Date"),
Text("Text");
/** /**
* @param text * @param text
*/ */
@ -24,39 +18,28 @@ public enum ColumnDataType {
} }
private final String id; private final String id;
@Override @Override
public String toString() { public String toString() {
return id; return id;
} }
public static ColumnDataType getColumnDataTypeFromId(String id){ public String getColumnDataTypeLabel() {
if(id.compareTo(Boolean.id)==0){ return id;
return Boolean;
} else {
if(id.compareTo(Geometry.id)==0){
return Geometry;
} else {
if(id.compareTo(Integer.id)==0){
return Integer;
} else {
if(id.compareTo(Numeric.id)==0){
return Numeric;
} else {
if(id.compareTo(Date.id)==0){
return Date;
} else {
if(id.compareTo(Text.id)==0){
return Text;
} else {
return null;
}
}
}
}
}
}
} }
/**
*
* @param id
* @return
*/
public static ColumnDataType getColumnDataTypeFromId(String id) {
for (ColumnDataType columnDataType : values()) {
if (columnDataType.id.compareToIgnoreCase(id) == 0) {
return columnDataType;
}
}
return null;
}
} }

42
src/main/java/org/gcube/portlets/user/td/widgetcommonevent/shared/tr/column/ColumnTypeCode.java
View File

@ -49,40 +49,20 @@ public enum ColumnTypeCode {
} }
/**
*
* @param id
* @return
*/
public static ColumnTypeCode getColumnTypeCodeFromId(String id) { public static ColumnTypeCode getColumnTypeCodeFromId(String id) {
if (id.compareTo(ANNOTATION.id) == 0) { for (ColumnTypeCode columnTypeCode : values()) {
return ANNOTATION; if (columnTypeCode.id.compareToIgnoreCase(id) == 0) {
} else { return columnTypeCode;
if (id.compareTo(ATTRIBUTE.id) == 0) {
return ATTRIBUTE;
} else {
if (id.compareTo(CODE.id) == 0) {
return CODE;
} else {
if (id.compareTo(CODEDESCRIPTION.id) == 0) {
return CODEDESCRIPTION;
} else {
if (id.compareTo(CODENAME.id) == 0) {
return CODENAME;
} else {
if (id.compareTo(DIMENSION.id) == 0) {
return DIMENSION;
} else {
if (id.compareTo(MEASURE.id) == 0) {
return MEASURE;
} else {
if (id.compareTo(TIMEDIMENSION.id) == 0) {
return TIMEDIMENSION;
} else {
return null;
}
}
}
}
}
}
} }
} }
return null;
} }
} }