From 70fc57fbc056a8f78a4d1a46238c35932f9b17aa Mon Sep 17 00:00:00 2001
From: Giancarlo Panichi <giancarlo.panichi@isti.cnr.it>
Date: Fri, 24 Jan 2014 10:30:30 +0000
Subject: [PATCH] Minor Update

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-widget-common-event@90465 82a268e6-3cf1-43bd-a215-b396298e98cf
---
 .../shared/column/ColumnDataType.java         | 14 +++-
 .../shared/column/ColumnTypeCode.java         | 77 +++++++++++++------
 2 files changed, 67 insertions(+), 24 deletions(-)

diff --git a/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/shared/column/ColumnDataType.java b/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/shared/column/ColumnDataType.java
index 312d965..429e8aa 100644
--- a/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/shared/column/ColumnDataType.java
+++ b/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/shared/column/ColumnDataType.java
@@ -31,7 +31,19 @@ public enum ColumnDataType {
 		return id;
 	}
 	
-	public List<String> getColumnDataTypes(){
+	public List<ColumnDataType> getColumnDataTypes(){
+		List<ColumnDataType> types=new ArrayList<ColumnDataType>();
+		types.add(Boolean);
+		types.add(Geometry);
+		types.add(Integer);
+		types.add(Numeric);
+		types.add(Text);
+		
+		return types;
+	}
+	
+	
+	public List<String> getColumnDataTypesAsString(){
 		List<String> types=new ArrayList<String>();
 		types.add(Boolean.toString());
 		types.add(Geometry.toString());
diff --git a/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/shared/column/ColumnTypeCode.java b/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/shared/column/ColumnTypeCode.java
index 7b34b8c..e194b78 100644
--- a/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/shared/column/ColumnTypeCode.java
+++ b/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/shared/column/ColumnTypeCode.java
@@ -1,26 +1,19 @@
 package org.gcube.portlets.user.td.widgetcommonevent.shared.column;
 
-
 import java.util.ArrayList;
 import java.util.List;
 
 /**
  * 
- * @author "Giancarlo Panichi" 
- * <a href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a> 
- *
+ * @author "Giancarlo Panichi" <a
+ *         href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a>
+ * 
  */
 public enum ColumnTypeCode {
-	ANNOTATION("ANNOTATION"),
-	ATTRIBUTE("ATTRIBUTE"),
-	CODE("CODE"),
-	CODEDESCRIPTION("CODEDESCRIPTION"),
-	CODENAME("CODENAME"),
-	DIMENSION("DIMENSION"),
-	MEASURE("MESAURE"),
-	TIMEDIMENSION("TIMEDIMENSION");
-	
-	
+	ANNOTATION("ANNOTATION"), ATTRIBUTE("ATTRIBUTE"), CODE("CODE"), CODEDESCRIPTION(
+			"CODEDESCRIPTION"), CODENAME("CODENAME"), DIMENSION("DIMENSION"), MEASURE(
+			"MESAURE"), TIMEDIMENSION("TIMEDIMENSION");
+
 	/**
 	 * @param text
 	 */
@@ -29,14 +22,52 @@ public enum ColumnTypeCode {
 	}
 
 	private final String id;
-	
+
 	@Override
 	public String toString() {
 		return id;
 	}
+
+	public String getColumnTypeCodeLabel() {
+		switch (this) {
+		case ANNOTATION:
+			return "Annotation";
+		case ATTRIBUTE:
+			return "Attribute";
+		case CODE:
+			return "Code";
+		case CODEDESCRIPTION:
+			return "Code Description";
+		case CODENAME:
+			return "Code Name";
+		case DIMENSION:
+			return "Dimension";
+		case MEASURE:
+			return "Measure";
+		case TIMEDIMENSION:
+			return "Time Dimension";
+		default:
+			return null;
+		}
+
+	}
+
+	public List<ColumnTypeCode> getColumnTypesCode() {
+		List<ColumnTypeCode> types = new ArrayList<ColumnTypeCode>();
+		types.add(ANNOTATION);
+		types.add(ATTRIBUTE);
+		types.add(CODE);
+		types.add(CODEDESCRIPTION);
+		types.add(CODENAME);
+		types.add(DIMENSION);
+		types.add(MEASURE);
+		types.add(TIMEDIMENSION);
+
+		return types;
+	}
 	
-	public List<String> getColumnDataTypes(){
-		List<String> types=new ArrayList<String>();
+	public List<String> getColumnTypesCodeAsString() {
+		List<String> types = new ArrayList<String>();
 		types.add(ANNOTATION.toString());
 		types.add(ATTRIBUTE.toString());
 		types.add(CODE.toString());
@@ -45,12 +76,12 @@ public enum ColumnTypeCode {
 		types.add(DIMENSION.toString());
 		types.add(MEASURE.toString());
 		types.add(TIMEDIMENSION.toString());
-		
+
 		return types;
 	}
-	
-	public List<String> getColumnDataTypesLabel(){
-		List<String> types=new ArrayList<String>();
+
+	public List<String> getColumnTypesCodeLabels() {
+		List<String> types = new ArrayList<String>();
 		types.add("Annotation");
 		types.add("Attribute");
 		types.add("Code");
@@ -59,8 +90,8 @@ public enum ColumnTypeCode {
 		types.add("Dimension");
 		types.add("Measure");
 		types.add("Time Dimension");
-		
+
 		return types;
 	}
-	
+
 }