diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/client/rpc/TDGWTService.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/client/rpc/TDGWTService.java
index d68b09d..f7431f2 100644
--- a/src/main/java/org/gcube/portlets/user/td/gwtservice/client/rpc/TDGWTService.java
+++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/client/rpc/TDGWTService.java
@@ -40,12 +40,9 @@ import org.gcube.portlets.user.td.gwtservice.shared.task.ValidationsTasksMetadat
import org.gcube.portlets.user.td.gwtservice.shared.template.TemplateApplySession;
import org.gcube.portlets.user.td.gwtservice.shared.template.TemplateData;
import org.gcube.portlets.user.td.gwtservice.shared.template.TemplateDeleteSession;
-import org.gcube.portlets.user.td.gwtservice.shared.tr.ColumnData;
-import org.gcube.portlets.user.td.gwtservice.shared.tr.PeriodDataType;
import org.gcube.portlets.user.td.gwtservice.shared.tr.RefColumn;
import org.gcube.portlets.user.td.gwtservice.shared.tr.TabResource;
import org.gcube.portlets.user.td.gwtservice.shared.tr.TableData;
-import org.gcube.portlets.user.td.gwtservice.shared.tr.ValueDataFormat;
import org.gcube.portlets.user.td.gwtservice.shared.tr.batch.Occurrences;
import org.gcube.portlets.user.td.gwtservice.shared.tr.batch.OccurrencesForReplaceBatchColumnSession;
import org.gcube.portlets.user.td.gwtservice.shared.tr.batch.ReplaceBatchColumnSession;
@@ -80,7 +77,10 @@ import org.gcube.portlets.user.td.gwtservice.shared.tr.union.UnionSession;
import org.gcube.portlets.user.td.gwtservice.shared.uriresolver.UriResolverSession;
import org.gcube.portlets.user.td.gwtservice.shared.user.UserInfo;
import org.gcube.portlets.user.td.widgetcommonevent.shared.TRId;
+import org.gcube.portlets.user.td.widgetcommonevent.shared.tr.column.ColumnData;
import org.gcube.portlets.user.td.widgetcommonevent.shared.tr.column.ColumnDataType;
+import org.gcube.portlets.user.td.widgetcommonevent.shared.tr.column.PeriodDataType;
+import org.gcube.portlets.user.td.widgetcommonevent.shared.tr.column.ValueDataFormat;
import com.google.gwt.user.client.rpc.RemoteService;
import com.google.gwt.user.client.rpc.RemoteServiceRelativePath;
diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/client/rpc/TDGWTServiceAsync.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/client/rpc/TDGWTServiceAsync.java
index c9dc914..029f0e9 100644
--- a/src/main/java/org/gcube/portlets/user/td/gwtservice/client/rpc/TDGWTServiceAsync.java
+++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/client/rpc/TDGWTServiceAsync.java
@@ -39,12 +39,9 @@ import org.gcube.portlets.user.td.gwtservice.shared.task.ValidationsTasksMetadat
import org.gcube.portlets.user.td.gwtservice.shared.template.TemplateApplySession;
import org.gcube.portlets.user.td.gwtservice.shared.template.TemplateData;
import org.gcube.portlets.user.td.gwtservice.shared.template.TemplateDeleteSession;
-import org.gcube.portlets.user.td.gwtservice.shared.tr.ColumnData;
-import org.gcube.portlets.user.td.gwtservice.shared.tr.PeriodDataType;
import org.gcube.portlets.user.td.gwtservice.shared.tr.RefColumn;
import org.gcube.portlets.user.td.gwtservice.shared.tr.TabResource;
import org.gcube.portlets.user.td.gwtservice.shared.tr.TableData;
-import org.gcube.portlets.user.td.gwtservice.shared.tr.ValueDataFormat;
import org.gcube.portlets.user.td.gwtservice.shared.tr.batch.Occurrences;
import org.gcube.portlets.user.td.gwtservice.shared.tr.batch.OccurrencesForReplaceBatchColumnSession;
import org.gcube.portlets.user.td.gwtservice.shared.tr.batch.ReplaceBatchColumnSession;
@@ -79,7 +76,10 @@ import org.gcube.portlets.user.td.gwtservice.shared.tr.union.UnionSession;
import org.gcube.portlets.user.td.gwtservice.shared.uriresolver.UriResolverSession;
import org.gcube.portlets.user.td.gwtservice.shared.user.UserInfo;
import org.gcube.portlets.user.td.widgetcommonevent.shared.TRId;
+import org.gcube.portlets.user.td.widgetcommonevent.shared.tr.column.ColumnData;
import org.gcube.portlets.user.td.widgetcommonevent.shared.tr.column.ColumnDataType;
+import org.gcube.portlets.user.td.widgetcommonevent.shared.tr.column.PeriodDataType;
+import org.gcube.portlets.user.td.widgetcommonevent.shared.tr.column.ValueDataFormat;
import com.google.gwt.core.client.GWT;
import com.google.gwt.user.client.rpc.AsyncCallback;
diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/TDGWTServiceImpl.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/TDGWTServiceImpl.java
index 786b42f..a1bd94b 100644
--- a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/TDGWTServiceImpl.java
+++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/TDGWTServiceImpl.java
@@ -212,15 +212,11 @@ import org.gcube.portlets.user.td.gwtservice.shared.task.ValidationsTasksMetadat
import org.gcube.portlets.user.td.gwtservice.shared.template.TemplateApplySession;
import org.gcube.portlets.user.td.gwtservice.shared.template.TemplateData;
import org.gcube.portlets.user.td.gwtservice.shared.template.TemplateDeleteSession;
-import org.gcube.portlets.user.td.gwtservice.shared.tr.ColumnData;
-import org.gcube.portlets.user.td.gwtservice.shared.tr.ColumnViewData;
import org.gcube.portlets.user.td.gwtservice.shared.tr.ConditionCodeMap;
import org.gcube.portlets.user.td.gwtservice.shared.tr.DimensionRow;
-import org.gcube.portlets.user.td.gwtservice.shared.tr.PeriodDataType;
import org.gcube.portlets.user.td.gwtservice.shared.tr.RefColumn;
import org.gcube.portlets.user.td.gwtservice.shared.tr.TabResource;
import org.gcube.portlets.user.td.gwtservice.shared.tr.TableData;
-import org.gcube.portlets.user.td.gwtservice.shared.tr.ValueDataFormat;
import org.gcube.portlets.user.td.gwtservice.shared.tr.batch.Occurrences;
import org.gcube.portlets.user.td.gwtservice.shared.tr.batch.OccurrencesForReplaceBatchColumnSession;
import org.gcube.portlets.user.td.gwtservice.shared.tr.batch.ReplaceBatchColumnSession;
@@ -286,9 +282,13 @@ import org.gcube.portlets.user.td.widgetcommonevent.shared.TRId;
import org.gcube.portlets.user.td.widgetcommonevent.shared.mime.MimeTypeSupport;
import org.gcube.portlets.user.td.widgetcommonevent.shared.operations.OperationsId;
import org.gcube.portlets.user.td.widgetcommonevent.shared.operations.UIOperationsId;
+import org.gcube.portlets.user.td.widgetcommonevent.shared.tr.column.ColumnData;
import org.gcube.portlets.user.td.widgetcommonevent.shared.tr.column.ColumnDataType;
import org.gcube.portlets.user.td.widgetcommonevent.shared.tr.column.ColumnTypeCode;
+import org.gcube.portlets.user.td.widgetcommonevent.shared.tr.column.ColumnViewData;
+import org.gcube.portlets.user.td.widgetcommonevent.shared.tr.column.PeriodDataType;
import org.gcube.portlets.user.td.widgetcommonevent.shared.tr.column.RelationshipData;
+import org.gcube.portlets.user.td.widgetcommonevent.shared.tr.column.ValueDataFormat;
import org.gcube.portlets.user.uriresolvermanager.UriResolverManager;
import org.gcube.resources.discovery.client.api.DiscoveryClient;
import org.gcube.resources.discovery.client.queries.api.SimpleQuery;
diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4AddColumn.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4AddColumn.java
index 147761b..0c8afaf 100644
--- a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4AddColumn.java
+++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4AddColumn.java
@@ -15,10 +15,10 @@ import org.gcube.portlets.user.td.gwtservice.server.trservice.OperationDefinitio
import org.gcube.portlets.user.td.gwtservice.server.trservice.TDTypeValueMap;
import org.gcube.portlets.user.td.gwtservice.shared.Constants;
import org.gcube.portlets.user.td.gwtservice.shared.exception.TDGWTServiceException;
-import org.gcube.portlets.user.td.gwtservice.shared.tr.ColumnMockUp;
import org.gcube.portlets.user.td.gwtservice.shared.tr.column.AddColumnSession;
import org.gcube.portlets.user.td.widgetcommonevent.shared.operations.OperationsId;
import org.gcube.portlets.user.td.widgetcommonevent.shared.tr.column.ColumnDataType;
+import org.gcube.portlets.user.td.widgetcommonevent.shared.tr.column.ColumnMockUp;
import org.gcube.portlets.user.td.widgetcommonevent.shared.tr.column.ColumnTypeCode;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4ChangeColumnType.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4ChangeColumnType.java
index 7158fc6..a529453 100644
--- a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4ChangeColumnType.java
+++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4ChangeColumnType.java
@@ -15,13 +15,13 @@ import org.gcube.portlets.user.td.gwtservice.server.trservice.ColumnDataTypeMap;
import org.gcube.portlets.user.td.gwtservice.server.trservice.OperationDefinitionMap;
import org.gcube.portlets.user.td.gwtservice.shared.Constants;
import org.gcube.portlets.user.td.gwtservice.shared.exception.TDGWTServiceException;
-import org.gcube.portlets.user.td.gwtservice.shared.tr.ColumnData;
import org.gcube.portlets.user.td.gwtservice.shared.tr.DimensionRow;
import org.gcube.portlets.user.td.gwtservice.shared.tr.column.mapping.ColumnMappingData;
import org.gcube.portlets.user.td.gwtservice.shared.tr.column.mapping.ColumnMappingList;
import org.gcube.portlets.user.td.gwtservice.shared.tr.column.type.ChangeColumnTypeSession;
import org.gcube.portlets.user.td.widgetcommonevent.shared.TRId;
import org.gcube.portlets.user.td.widgetcommonevent.shared.operations.OperationsId;
+import org.gcube.portlets.user.td.widgetcommonevent.shared.tr.column.ColumnData;
import org.gcube.portlets.user.td.widgetcommonevent.shared.tr.column.ColumnTypeCode;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4ChangeColumnsPosition.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4ChangeColumnsPosition.java
index ab82b78..acf5de6 100644
--- a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4ChangeColumnsPosition.java
+++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4ChangeColumnsPosition.java
@@ -13,10 +13,10 @@ import org.gcube.data.analysis.tabulardata.service.TabularDataService;
import org.gcube.portlets.user.td.gwtservice.server.trservice.OperationDefinitionMap;
import org.gcube.portlets.user.td.gwtservice.shared.Constants;
import org.gcube.portlets.user.td.gwtservice.shared.exception.TDGWTServiceException;
-import org.gcube.portlets.user.td.gwtservice.shared.tr.ColumnData;
import org.gcube.portlets.user.td.gwtservice.shared.tr.column.ChangeColumnsPositionSession;
import org.gcube.portlets.user.td.widgetcommonevent.shared.TRId;
import org.gcube.portlets.user.td.widgetcommonevent.shared.operations.OperationsId;
+import org.gcube.portlets.user.td.widgetcommonevent.shared.tr.column.ColumnData;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4CodelistMapping.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4CodelistMapping.java
index 81247ac..83193b2 100644
--- a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4CodelistMapping.java
+++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4CodelistMapping.java
@@ -13,8 +13,8 @@ import org.gcube.portlets.user.td.gwtservice.server.trservice.OperationDefinitio
import org.gcube.portlets.user.td.gwtservice.shared.Constants;
import org.gcube.portlets.user.td.gwtservice.shared.codelisthelper.CodelistMappingSession;
import org.gcube.portlets.user.td.gwtservice.shared.exception.TDGWTServiceException;
-import org.gcube.portlets.user.td.gwtservice.shared.tr.ColumnData;
import org.gcube.portlets.user.td.widgetcommonevent.shared.operations.OperationsId;
+import org.gcube.portlets.user.td.widgetcommonevent.shared.tr.column.ColumnData;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4DeleteColumn.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4DeleteColumn.java
index e0bbdd1..0a25aa7 100644
--- a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4DeleteColumn.java
+++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4DeleteColumn.java
@@ -9,9 +9,9 @@ import org.gcube.data.analysis.tabulardata.commons.webservice.types.operations.O
import org.gcube.data.analysis.tabulardata.service.TabularDataService;
import org.gcube.portlets.user.td.gwtservice.server.trservice.OperationDefinitionMap;
import org.gcube.portlets.user.td.gwtservice.shared.exception.TDGWTServiceException;
-import org.gcube.portlets.user.td.gwtservice.shared.tr.ColumnData;
import org.gcube.portlets.user.td.gwtservice.shared.tr.column.DeleteColumnSession;
import org.gcube.portlets.user.td.widgetcommonevent.shared.operations.OperationsId;
+import org.gcube.portlets.user.td.widgetcommonevent.shared.tr.column.ColumnData;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4Denormalization.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4Denormalization.java
index 86e1951..744f304 100644
--- a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4Denormalization.java
+++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4Denormalization.java
@@ -12,10 +12,10 @@ import org.gcube.data.analysis.tabulardata.service.TabularDataService;
import org.gcube.portlets.user.td.gwtservice.server.trservice.OperationDefinitionMap;
import org.gcube.portlets.user.td.gwtservice.shared.Constants;
import org.gcube.portlets.user.td.gwtservice.shared.exception.TDGWTServiceException;
-import org.gcube.portlets.user.td.gwtservice.shared.tr.ColumnData;
import org.gcube.portlets.user.td.gwtservice.shared.tr.normalization.DenormalizationSession;
import org.gcube.portlets.user.td.widgetcommonevent.shared.TRId;
import org.gcube.portlets.user.td.widgetcommonevent.shared.operations.OperationsId;
+import org.gcube.portlets.user.td.widgetcommonevent.shared.tr.column.ColumnData;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4Duplicates.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4Duplicates.java
index 88eb41b..e76cec8 100644
--- a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4Duplicates.java
+++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4Duplicates.java
@@ -13,10 +13,10 @@ import org.gcube.data.analysis.tabulardata.service.TabularDataService;
import org.gcube.portlets.user.td.gwtservice.server.trservice.OperationDefinitionMap;
import org.gcube.portlets.user.td.gwtservice.shared.Constants;
import org.gcube.portlets.user.td.gwtservice.shared.exception.TDGWTServiceException;
-import org.gcube.portlets.user.td.gwtservice.shared.tr.ColumnData;
import org.gcube.portlets.user.td.gwtservice.shared.tr.rows.DuplicatesSession;
import org.gcube.portlets.user.td.widgetcommonevent.shared.TRId;
import org.gcube.portlets.user.td.widgetcommonevent.shared.operations.OperationsId;
+import org.gcube.portlets.user.td.widgetcommonevent.shared.tr.column.ColumnData;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4GeometryCreatePoint.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4GeometryCreatePoint.java
index 2409c9f..76404e1 100644
--- a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4GeometryCreatePoint.java
+++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4GeometryCreatePoint.java
@@ -21,9 +21,9 @@ import org.gcube.portlets.user.td.gwtservice.server.trservice.OperationDefinitio
import org.gcube.portlets.user.td.gwtservice.shared.Constants;
import org.gcube.portlets.user.td.gwtservice.shared.exception.TDGWTServiceException;
import org.gcube.portlets.user.td.gwtservice.shared.geometry.GeometryCreatePointSession;
-import org.gcube.portlets.user.td.gwtservice.shared.tr.ColumnData;
import org.gcube.portlets.user.td.widgetcommonevent.shared.TRId;
import org.gcube.portlets.user.td.widgetcommonevent.shared.operations.OperationsId;
+import org.gcube.portlets.user.td.widgetcommonevent.shared.tr.column.ColumnData;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4GeospatialCreateCoordinates.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4GeospatialCreateCoordinates.java
index a45d60a..8277752 100644
--- a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4GeospatialCreateCoordinates.java
+++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4GeospatialCreateCoordinates.java
@@ -15,9 +15,9 @@ import org.gcube.portlets.user.td.gwtservice.server.trservice.OperationDefinitio
import org.gcube.portlets.user.td.gwtservice.shared.Constants;
import org.gcube.portlets.user.td.gwtservice.shared.exception.TDGWTServiceException;
import org.gcube.portlets.user.td.gwtservice.shared.geospatial.GeospatialCreateCoordinatesSession;
-import org.gcube.portlets.user.td.gwtservice.shared.tr.ColumnData;
import org.gcube.portlets.user.td.widgetcommonevent.shared.TRId;
import org.gcube.portlets.user.td.widgetcommonevent.shared.operations.OperationsId;
+import org.gcube.portlets.user.td.widgetcommonevent.shared.tr.column.ColumnData;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4GeospatialDownscaleCSquare.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4GeospatialDownscaleCSquare.java
index f448f14..9090fec 100644
--- a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4GeospatialDownscaleCSquare.java
+++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4GeospatialDownscaleCSquare.java
@@ -10,8 +10,8 @@ import org.gcube.portlets.user.td.gwtservice.server.trservice.OperationDefinitio
import org.gcube.portlets.user.td.gwtservice.shared.Constants;
import org.gcube.portlets.user.td.gwtservice.shared.exception.TDGWTServiceException;
import org.gcube.portlets.user.td.gwtservice.shared.geospatial.GeospatialDownscaleCSquareSession;
-import org.gcube.portlets.user.td.gwtservice.shared.tr.ColumnData;
import org.gcube.portlets.user.td.widgetcommonevent.shared.operations.OperationsId;
+import org.gcube.portlets.user.td.widgetcommonevent.shared.tr.column.ColumnData;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4LabelColumn.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4LabelColumn.java
index f4b83cc..0e6de6b 100644
--- a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4LabelColumn.java
+++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4LabelColumn.java
@@ -14,10 +14,10 @@ import org.gcube.data.analysis.tabulardata.service.TabularDataService;
import org.gcube.portlets.user.td.gwtservice.server.trservice.OperationDefinitionMap;
import org.gcube.portlets.user.td.gwtservice.shared.Constants;
import org.gcube.portlets.user.td.gwtservice.shared.exception.TDGWTServiceException;
-import org.gcube.portlets.user.td.gwtservice.shared.tr.ColumnData;
import org.gcube.portlets.user.td.gwtservice.shared.tr.column.LabelColumnSession;
import org.gcube.portlets.user.td.widgetcommonevent.shared.TRId;
import org.gcube.portlets.user.td.widgetcommonevent.shared.operations.OperationsId;
+import org.gcube.portlets.user.td.widgetcommonevent.shared.tr.column.ColumnData;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4MapCreation.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4MapCreation.java
index e59d9de..9ab7b28 100644
--- a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4MapCreation.java
+++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4MapCreation.java
@@ -14,8 +14,8 @@ import org.gcube.portlets.user.td.gwtservice.server.trservice.OperationDefinitio
import org.gcube.portlets.user.td.gwtservice.shared.Constants;
import org.gcube.portlets.user.td.gwtservice.shared.exception.TDGWTServiceException;
import org.gcube.portlets.user.td.gwtservice.shared.map.MapCreationSession;
-import org.gcube.portlets.user.td.gwtservice.shared.tr.ColumnData;
import org.gcube.portlets.user.td.widgetcommonevent.shared.operations.OperationsId;
+import org.gcube.portlets.user.td.widgetcommonevent.shared.tr.column.ColumnData;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4Normalization.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4Normalization.java
index 548b635..96e484b 100644
--- a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4Normalization.java
+++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4Normalization.java
@@ -14,10 +14,10 @@ import org.gcube.data.analysis.tabulardata.service.TabularDataService;
import org.gcube.portlets.user.td.gwtservice.server.trservice.OperationDefinitionMap;
import org.gcube.portlets.user.td.gwtservice.shared.Constants;
import org.gcube.portlets.user.td.gwtservice.shared.exception.TDGWTServiceException;
-import org.gcube.portlets.user.td.gwtservice.shared.tr.ColumnData;
import org.gcube.portlets.user.td.gwtservice.shared.tr.normalization.NormalizationSession;
import org.gcube.portlets.user.td.widgetcommonevent.shared.TRId;
import org.gcube.portlets.user.td.widgetcommonevent.shared.operations.OperationsId;
+import org.gcube.portlets.user.td.widgetcommonevent.shared.tr.column.ColumnData;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/trservice/ColumnMap.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/trservice/ColumnMap.java
index aa53331..2ae16f3 100644
--- a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/trservice/ColumnMap.java
+++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/trservice/ColumnMap.java
@@ -9,11 +9,11 @@ import org.gcube.data.analysis.tabulardata.model.column.ColumnReference;
import org.gcube.data.analysis.tabulardata.model.table.TableId;
import org.gcube.portlets.user.td.gwtservice.shared.Constants;
import org.gcube.portlets.user.td.gwtservice.shared.exception.TDGWTServiceException;
-import org.gcube.portlets.user.td.gwtservice.shared.tr.ColumnData;
import org.gcube.portlets.user.td.gwtservice.shared.tr.TabResource;
import org.gcube.portlets.user.td.gwtservice.shared.tr.union.UnionColumnsMapping;
import org.gcube.portlets.user.td.gwtservice.shared.tr.union.UnionSession;
import org.gcube.portlets.user.td.widgetcommonevent.shared.TRId;
+import org.gcube.portlets.user.td.widgetcommonevent.shared.tr.column.ColumnData;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/trservice/ExpressionGenerator.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/trservice/ExpressionGenerator.java
index 748f73f..cfaf8f6 100644
--- a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/trservice/ExpressionGenerator.java
+++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/trservice/ExpressionGenerator.java
@@ -17,13 +17,13 @@ import org.gcube.data.analysis.tabulardata.model.table.Table;
import org.gcube.data.analysis.tabulardata.model.table.TableId;
import org.gcube.data.analysis.tabulardata.service.TabularDataService;
import org.gcube.portlets.user.td.gwtservice.shared.exception.TDGWTServiceException;
-import org.gcube.portlets.user.td.gwtservice.shared.tr.ColumnData;
import org.gcube.portlets.user.td.gwtservice.shared.tr.batch.OccurrencesForReplaceBatchColumnSession;
import org.gcube.portlets.user.td.gwtservice.shared.tr.batch.ReplaceBatchColumnSession;
import org.gcube.portlets.user.td.gwtservice.shared.tr.batch.ReplaceEntry;
import org.gcube.portlets.user.td.gwtservice.shared.tr.column.ReplaceColumnByExpressionSession;
import org.gcube.portlets.user.td.gwtservice.shared.tr.column.ReplaceColumnSession;
import org.gcube.portlets.user.td.widgetcommonevent.shared.TRId;
+import org.gcube.portlets.user.td.widgetcommonevent.shared.tr.column.ColumnData;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/trservice/ExtractCodelistOperationMap.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/trservice/ExtractCodelistOperationMap.java
index 2af99b6..b03255b 100644
--- a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/trservice/ExtractCodelistOperationMap.java
+++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/trservice/ExtractCodelistOperationMap.java
@@ -18,9 +18,9 @@ import org.gcube.data.analysis.tabulardata.model.table.TableId;
import org.gcube.portlets.user.td.gwtservice.shared.Constants;
import org.gcube.portlets.user.td.gwtservice.shared.extract.ExtractCodelistSession;
import org.gcube.portlets.user.td.gwtservice.shared.extract.ExtractCodelistTargetColumn;
-import org.gcube.portlets.user.td.gwtservice.shared.tr.ColumnData;
-import org.gcube.portlets.user.td.gwtservice.shared.tr.ColumnMockUp;
import org.gcube.portlets.user.td.widgetcommonevent.shared.TRId;
+import org.gcube.portlets.user.td.widgetcommonevent.shared.tr.column.ColumnData;
+import org.gcube.portlets.user.td.widgetcommonevent.shared.tr.column.ColumnMockUp;
import org.gcube.portlets.user.td.widgetcommonevent.shared.tr.column.ColumnTypeCode;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/trservice/PeriodTypeMap.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/trservice/PeriodTypeMap.java
index fa0774c..c3491a1 100644
--- a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/trservice/PeriodTypeMap.java
+++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/trservice/PeriodTypeMap.java
@@ -5,8 +5,8 @@ import java.util.List;
import org.gcube.data.analysis.tabulardata.model.ValueFormat;
import org.gcube.data.analysis.tabulardata.model.time.PeriodType;
-import org.gcube.portlets.user.td.gwtservice.shared.tr.PeriodDataType;
-import org.gcube.portlets.user.td.gwtservice.shared.tr.ValueDataFormat;
+import org.gcube.portlets.user.td.widgetcommonevent.shared.tr.column.PeriodDataType;
+import org.gcube.portlets.user.td.widgetcommonevent.shared.tr.column.ValueDataFormat;
/**
*
diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/trservice/QueryService.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/trservice/QueryService.java
index ea32269..0da61ec 100644
--- a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/trservice/QueryService.java
+++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/trservice/QueryService.java
@@ -24,13 +24,13 @@ import org.gcube.data.analysis.tabulardata.query.parameters.select.QuerySelect;
import org.gcube.data.analysis.tabulardata.service.TabularDataService;
import org.gcube.data.analysis.tabulardata.service.exception.NoSuchTableException;
import org.gcube.portlets.user.td.gwtservice.shared.exception.TDGWTServiceException;
-import org.gcube.portlets.user.td.gwtservice.shared.tr.ColumnData;
import org.gcube.portlets.user.td.gwtservice.shared.tr.ConditionCode;
import org.gcube.portlets.user.td.gwtservice.shared.tr.batch.Occurrences;
import org.gcube.portlets.user.td.gwtservice.shared.tr.batch.OccurrencesForReplaceBatchColumnSession;
import org.gcube.portlets.user.td.gwtservice.shared.tr.batch.ShowOccurrencesType;
import org.gcube.portlets.user.td.gwtservice.shared.tr.paging.Direction;
import org.gcube.portlets.user.td.widgetcommonevent.shared.TRId;
+import org.gcube.portlets.user.td.widgetcommonevent.shared.tr.column.ColumnData;
import org.json.JSONArray;
import org.json.JSONException;
import org.slf4j.Logger;
diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/trservice/ValueMap.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/trservice/ValueMap.java
index bb4f4b8..2604583 100644
--- a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/trservice/ValueMap.java
+++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/trservice/ValueMap.java
@@ -19,8 +19,8 @@ import org.gcube.data.analysis.tabulardata.model.datatype.value.TDText;
import org.gcube.data.analysis.tabulardata.model.table.TableId;
import org.gcube.portlets.user.td.gwtservice.shared.Constants;
import org.gcube.portlets.user.td.gwtservice.shared.exception.TDGWTServiceException;
-import org.gcube.portlets.user.td.gwtservice.shared.tr.ColumnData;
import org.gcube.portlets.user.td.widgetcommonevent.shared.TRId;
+import org.gcube.portlets.user.td.widgetcommonevent.shared.tr.column.ColumnData;
import org.gcube.portlets.user.td.widgetcommonevent.shared.tr.column.ColumnDataType;
import org.gcube.portlets.user.td.widgetcommonevent.shared.tr.column.ColumnTypeCode;
import org.slf4j.Logger;
diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/chart/ChartSession.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/chart/ChartSession.java
index 7a88880..f5b72d7 100644
--- a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/chart/ChartSession.java
+++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/chart/ChartSession.java
@@ -3,9 +3,9 @@ package org.gcube.portlets.user.td.gwtservice.shared.chart;
import java.io.Serializable;
import java.util.ArrayList;
-import org.gcube.portlets.user.td.gwtservice.shared.tr.ColumnData;
import org.gcube.portlets.user.td.gwtservice.shared.user.UserInfo;
import org.gcube.portlets.user.td.widgetcommonevent.shared.TRId;
+import org.gcube.portlets.user.td.widgetcommonevent.shared.tr.column.ColumnData;
import com.google.web.bindery.event.shared.EventBus;
diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/chart/ChartTopRatingSession.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/chart/ChartTopRatingSession.java
index bd50b8e..21bf610 100644
--- a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/chart/ChartTopRatingSession.java
+++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/chart/ChartTopRatingSession.java
@@ -5,8 +5,8 @@ package org.gcube.portlets.user.td.gwtservice.shared.chart;
import java.io.Serializable;
-import org.gcube.portlets.user.td.gwtservice.shared.tr.ColumnData;
import org.gcube.portlets.user.td.widgetcommonevent.shared.TRId;
+import org.gcube.portlets.user.td.widgetcommonevent.shared.tr.column.ColumnData;
/**
*
diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/codelisthelper/CodelistMappingSession.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/codelisthelper/CodelistMappingSession.java
index 20dbe71..4d3775f 100644
--- a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/codelisthelper/CodelistMappingSession.java
+++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/codelisthelper/CodelistMappingSession.java
@@ -3,10 +3,10 @@ package org.gcube.portlets.user.td.gwtservice.shared.codelisthelper;
import java.io.Serializable;
import org.gcube.portlets.user.td.gwtservice.shared.source.Source;
-import org.gcube.portlets.user.td.gwtservice.shared.tr.ColumnData;
import org.gcube.portlets.user.td.gwtservice.shared.tr.TabResource;
import org.gcube.portlets.user.td.gwtservice.shared.tr.resources.ResourceTDDescriptor;
import org.gcube.portlets.user.td.widgetcommonevent.shared.TRId;
+import org.gcube.portlets.user.td.widgetcommonevent.shared.tr.column.ColumnData;
/**
*
diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/csv/CSVExportSession.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/csv/CSVExportSession.java
index 355326d..b68046d 100644
--- a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/csv/CSVExportSession.java
+++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/csv/CSVExportSession.java
@@ -7,8 +7,8 @@ import java.io.Serializable;
import java.util.ArrayList;
import org.gcube.portlets.user.td.gwtservice.shared.destination.Destination;
-import org.gcube.portlets.user.td.gwtservice.shared.tr.ColumnData;
import org.gcube.portlets.user.td.gwtservice.shared.tr.TabResource;
+import org.gcube.portlets.user.td.widgetcommonevent.shared.tr.column.ColumnData;
/**
*
diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/extract/ExtractCodelistSession.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/extract/ExtractCodelistSession.java
index 2233d24..3f36028 100644
--- a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/extract/ExtractCodelistSession.java
+++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/extract/ExtractCodelistSession.java
@@ -6,9 +6,9 @@ package org.gcube.portlets.user.td.gwtservice.shared.extract;
import java.io.Serializable;
import java.util.ArrayList;
-import org.gcube.portlets.user.td.gwtservice.shared.tr.ColumnData;
import org.gcube.portlets.user.td.gwtservice.shared.tr.TabResource;
import org.gcube.portlets.user.td.widgetcommonevent.shared.TRId;
+import org.gcube.portlets.user.td.widgetcommonevent.shared.tr.column.ColumnData;
/**
*
diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/extract/ExtractCodelistTargetColumn.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/extract/ExtractCodelistTargetColumn.java
index 5c6b323..875871c 100644
--- a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/extract/ExtractCodelistTargetColumn.java
+++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/extract/ExtractCodelistTargetColumn.java
@@ -2,9 +2,9 @@ package org.gcube.portlets.user.td.gwtservice.shared.extract;
import java.io.Serializable;
-import org.gcube.portlets.user.td.gwtservice.shared.tr.ColumnData;
-import org.gcube.portlets.user.td.gwtservice.shared.tr.ColumnMockUp;
import org.gcube.portlets.user.td.widgetcommonevent.shared.TRId;
+import org.gcube.portlets.user.td.widgetcommonevent.shared.tr.column.ColumnData;
+import org.gcube.portlets.user.td.widgetcommonevent.shared.tr.column.ColumnMockUp;
/**
*
diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/geometry/GeometryCreatePointSession.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/geometry/GeometryCreatePointSession.java
index 46d83d0..2b94260 100644
--- a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/geometry/GeometryCreatePointSession.java
+++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/geometry/GeometryCreatePointSession.java
@@ -2,8 +2,8 @@ package org.gcube.portlets.user.td.gwtservice.shared.geometry;
import java.io.Serializable;
-import org.gcube.portlets.user.td.gwtservice.shared.tr.ColumnData;
import org.gcube.portlets.user.td.widgetcommonevent.shared.TRId;
+import org.gcube.portlets.user.td.widgetcommonevent.shared.tr.column.ColumnData;
/**
*
diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/geospatial/GeospatialCreateCoordinatesSession.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/geospatial/GeospatialCreateCoordinatesSession.java
index e789f37..d59e420 100644
--- a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/geospatial/GeospatialCreateCoordinatesSession.java
+++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/geospatial/GeospatialCreateCoordinatesSession.java
@@ -2,9 +2,9 @@ package org.gcube.portlets.user.td.gwtservice.shared.geospatial;
import java.io.Serializable;
-import org.gcube.portlets.user.td.gwtservice.shared.tr.ColumnData;
import org.gcube.portlets.user.td.widgetcommonevent.shared.TRId;
import org.gcube.portlets.user.td.widgetcommonevent.shared.geospatial.GeospatialCoordinatesType;
+import org.gcube.portlets.user.td.widgetcommonevent.shared.tr.column.ColumnData;
/**
*
diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/geospatial/GeospatialDownscaleCSquareSession.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/geospatial/GeospatialDownscaleCSquareSession.java
index cff2385..401b268 100644
--- a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/geospatial/GeospatialDownscaleCSquareSession.java
+++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/geospatial/GeospatialDownscaleCSquareSession.java
@@ -2,8 +2,8 @@ package org.gcube.portlets.user.td.gwtservice.shared.geospatial;
import java.io.Serializable;
-import org.gcube.portlets.user.td.gwtservice.shared.tr.ColumnData;
import org.gcube.portlets.user.td.widgetcommonevent.shared.TRId;
+import org.gcube.portlets.user.td.widgetcommonevent.shared.tr.column.ColumnData;
/**
*
diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/json/JSONExportSession.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/json/JSONExportSession.java
index 97bbe80..90e2db6 100644
--- a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/json/JSONExportSession.java
+++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/json/JSONExportSession.java
@@ -7,8 +7,8 @@ import java.io.Serializable;
import java.util.ArrayList;
import org.gcube.portlets.user.td.gwtservice.shared.destination.Destination;
-import org.gcube.portlets.user.td.gwtservice.shared.tr.ColumnData;
import org.gcube.portlets.user.td.gwtservice.shared.tr.TabResource;
+import org.gcube.portlets.user.td.widgetcommonevent.shared.tr.column.ColumnData;
/**
*
diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/map/MapCreationSession.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/map/MapCreationSession.java
index 4be2293..ca0a1fd 100644
--- a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/map/MapCreationSession.java
+++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/map/MapCreationSession.java
@@ -6,8 +6,8 @@ package org.gcube.portlets.user.td.gwtservice.shared.map;
import java.io.Serializable;
import java.util.ArrayList;
-import org.gcube.portlets.user.td.gwtservice.shared.tr.ColumnData;
import org.gcube.portlets.user.td.widgetcommonevent.shared.TRId;
+import org.gcube.portlets.user.td.widgetcommonevent.shared.tr.column.ColumnData;
/**
*
diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/task/TaskResumeSession.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/task/TaskResumeSession.java
index 62b0328..60086de 100644
--- a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/task/TaskResumeSession.java
+++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/task/TaskResumeSession.java
@@ -3,9 +3,9 @@ package org.gcube.portlets.user.td.gwtservice.shared.task;
import java.io.Serializable;
import java.util.ArrayList;
-import org.gcube.portlets.user.td.gwtservice.shared.tr.ColumnData;
import org.gcube.portlets.user.td.gwtservice.shared.tr.column.mapping.ColumnMappingData;
import org.gcube.portlets.user.td.widgetcommonevent.shared.TRId;
+import org.gcube.portlets.user.td.widgetcommonevent.shared.tr.column.ColumnData;
/**
*
diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/ColumnData.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/ColumnData.java
deleted file mode 100644
index 378ad71..0000000
--- a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/ColumnData.java
+++ /dev/null
@@ -1,241 +0,0 @@
-package org.gcube.portlets.user.td.gwtservice.shared.tr;
-
-import java.io.Serializable;
-import java.util.ArrayList;
-
-import org.gcube.portlets.user.td.widgetcommonevent.shared.TRId;
-import org.gcube.portlets.user.td.widgetcommonevent.shared.tr.column.RelationshipData;
-
-/**
- *
- * @author "Giancarlo Panichi" g.panichi@isti.cnr.it
- *
- */
-public class ColumnData implements Serializable {
-
- private static final long serialVersionUID = 7614033455605898209L;
-
- private String id; // For insert in table only
- private String columnId; // Id of column on server
- private String name;
- private String typeName;
- private String typeCode;
- private String dataTypeName;
- private String label;
- private String locale;
-
- private TRId trId;
-
- private boolean viewColumn;
- private ColumnViewData columnViewData;
-
- private PeriodDataType periodDataType;
-
- // Relationship for Dimension and Timedimension columns
- private RelationshipData relationship;
-
- // validation columns that validate this column
- private ArrayList validationColumnReferences;
-
- // true if this is a validation column
- private boolean validationColumn;
- // if this is a validation column then contains the columns validated
- private ArrayList validatedColumns;
-
-
- public ColumnData(){
-
- }
-
- /**
- *
- * @param id
- * @param columnId
- * @param name
- * @param typeName
- * @param typeCode
- * @param dataTypeName
- * @param label
- * @param locale
- * @param trId
- * @param viewColumn
- * @param columnViewData
- * @param periodDataType
- * @param relationship
- * @param validationColumnReferences
- * @param validationColumn
- * @param validatedColumns
- */
- public ColumnData(String id, String columnId, String name, String typeName,
- String typeCode, String dataTypeName, String label, String locale,
- TRId trId, boolean viewColumn, ColumnViewData columnViewData,
- PeriodDataType periodDataType, RelationshipData relationship,
- ArrayList validationColumnReferences,
- boolean validationColumn, ArrayList validatedColumns) {
- super();
- this.id = id;
- this.columnId = columnId;
- this.name = name;
- this.typeName = typeName;
- this.typeCode = typeCode;
- this.dataTypeName = dataTypeName;
- this.label = label;
- this.locale = locale;
- this.trId = trId;
- this.viewColumn = viewColumn;
- this.columnViewData = columnViewData;
- this.periodDataType = periodDataType;
- this.relationship = relationship;
- this.validationColumnReferences = validationColumnReferences;
- this.validationColumn = validationColumn;
- this.validatedColumns = validatedColumns;
- }
-
-
- public String getColumnId() {
- return columnId;
- }
-
- public void setColumnId(String columnId) {
- this.columnId = columnId;
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public String getTypeName() {
- return typeName;
- }
-
- public void setTypeName(String typeName) {
- this.typeName = typeName;
- }
-
- public String getTypeCode() {
- return typeCode;
- }
-
- public void setTypeCode(String typeCode) {
- this.typeCode = typeCode;
- }
-
- public TRId getTrId() {
- return trId;
- }
-
- public void setTrId(TRId trId) {
- this.trId = trId;
- }
-
- public String getId() {
- return id;
- }
-
- public void setId(String id) {
- this.id = id;
- }
-
- public String getDataTypeName() {
- return dataTypeName;
- }
-
- public void setDataTypeName(String dataTypeName) {
- this.dataTypeName = dataTypeName;
- }
-
- public String getLabel() {
- return label;
- }
-
- public void setLabel(String label) {
- this.label = label;
- }
-
- public ColumnViewData getColumnViewData() {
- return columnViewData;
- }
-
- public void setColumnViewData(ColumnViewData columnViewData) {
- this.columnViewData = columnViewData;
- }
-
- public boolean isViewColumn() {
- return viewColumn;
- }
-
- public void setViewColumn(boolean viewColumn) {
- this.viewColumn = viewColumn;
- }
-
- public boolean isValidationColumn() {
- return validationColumn;
- }
-
- public void setValidationColumn(boolean validationColumn) {
- this.validationColumn = validationColumn;
- }
-
- public ArrayList getValidatedColumns() {
- return validatedColumns;
- }
-
- public void setValidatedColumns(ArrayList validatedColumns) {
- this.validatedColumns = validatedColumns;
- }
-
- public ArrayList getValidationColumnReferences() {
- return validationColumnReferences;
- }
-
- public void setValidationColumnReferences(
- ArrayList validationColumnReferences) {
- this.validationColumnReferences = validationColumnReferences;
- }
-
- public String getLocale() {
- return locale;
- }
-
- public void setLocale(String locale) {
- this.locale = locale;
- }
-
- public RelationshipData getRelationship() {
- return relationship;
- }
-
- public void setRelationship(RelationshipData relationship) {
- this.relationship = relationship;
- }
-
- public PeriodDataType getPeriodDataType() {
- return periodDataType;
- }
-
- public void setPeriodDataType(PeriodDataType periodDataType) {
- this.periodDataType = periodDataType;
- }
-
-
- @Override
- public String toString() {
- return "ColumnData [id=" + id + ", columnId=" + columnId + ", name="
- + name + ", typeName=" + typeName + ", typeCode=" + typeCode
- + ", dataTypeName=" + dataTypeName + ", label=" + label
- + ", locale=" + locale + ", trId=" + trId + ", viewColumn="
- + viewColumn + ", columnViewData=" + columnViewData
- + ", periodDataType=" + periodDataType + ", relationship="
- + relationship + ", validationColumnReferences="
- + validationColumnReferences + ", validationColumn="
- + validationColumn + ", validatedColumns=" + validatedColumns
- + "]";
- }
-
-
-}
diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/ColumnMockUp.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/ColumnMockUp.java
deleted file mode 100644
index 913d329..0000000
--- a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/ColumnMockUp.java
+++ /dev/null
@@ -1,341 +0,0 @@
-package org.gcube.portlets.user.td.gwtservice.shared.tr;
-
-import java.io.Serializable;
-
-import org.gcube.portlets.user.td.widgetcommonevent.shared.expression.C_Expression;
-import org.gcube.portlets.user.td.widgetcommonevent.shared.tr.column.ColumnDataType;
-import org.gcube.portlets.user.td.widgetcommonevent.shared.tr.column.ColumnTypeCode;
-
-/**
- *
- * @author "Giancarlo Panichi"
- *
- */
-public class ColumnMockUp implements Serializable {
-
- private static final long serialVersionUID = 7467523779864189492L;
-
- private String id;// For grid and combo only;
- private String columnId;//ColumnId for template only;
- private ColumnTypeCode columnType;
- private ColumnDataType columnDataType;
- private String defaultValue;
- private String label;
- private String localeName;
- private boolean hasExpression;
- private C_Expression expression;
-
- protected PeriodDataType timeDimensionType;
- protected ColumnData codelistColumnReference;
-
- public ColumnMockUp() {
-
- }
-
-
- /**
- * ColumnMockUp
- *
- *
- * @param id
- * @param columnId
- * @param columnType
- * @param columnDataType
- * @param label
- */
- public ColumnMockUp(String id, String columnId, ColumnTypeCode columnType,
- ColumnDataType columnDataType, String label) {
- super();
- this.id = id;
- this.columnId = columnId;
- this.columnType = columnType;
- this.columnDataType = columnDataType;
- this.defaultValue = null;
- this.label = label;
- this.localeName = null;
- this.hasExpression = false;
- this.expression = null;
- this.timeDimensionType = null;
- this.codelistColumnReference = null;
- }
-
-
-
- /**
- * For Code, CodeDescription and Annotation Column
- * @param id TODO
- * @param columnId TODO
- * @param label
- * @param columnType
- * @param defaultValue
- * @param localeName
- */
- public ColumnMockUp(String id,String columnId,
- String label, ColumnTypeCode columnType, String defaultValue) {
- this.id = id;
- this.columnId=columnId;
- this.label = label;
- this.columnType = columnType;
- this.columnDataType = ColumnDataType.Text;
- this.defaultValue = defaultValue;
- hasExpression = false;
- expression = null;
- }
-
- /**
- * For Code, CodeDescription and Annotation Column
- * @param id TODO
- * @param columnId TODO
- * @param label
- * @param columnType
- * @param expressionWrapper
- */
- public ColumnMockUp(String id, String columnId,
- String label, ColumnTypeCode columnType, C_Expression expression) {
- this.id = null;
- this.columnId=null;
- this.label = label;
- this.columnType = columnType;
- this.columnDataType = ColumnDataType.Text;
- this.defaultValue = null;
- hasExpression = true;
- this.expression = expression;
- }
-
- /**
- * For Attribute and Measure Column
- * @param id TODO
- * @param columnId TODO
- * @param label
- * @param columnType
- * @param defaultValue
- * @param localeName
- */
- public ColumnMockUp(String id, String columnId,
- String label, ColumnTypeCode columnType, ColumnDataType columnDataType, String defaultValue) {
- this.id = id;
- this.columnId=columnId;
- this.label = label;
- this.columnType = columnType;
- this.columnDataType = columnDataType;
- this.defaultValue = defaultValue;
- hasExpression = false;
- expression = null;
- }
-
- /**
- * For Attribute and Measure Column
- * @param id TODO
- * @param columnId TODO
- * @param label
- * @param columnType
- * @param columnDataType
- * @param expressionContainer
- */
- public ColumnMockUp(String id, String columnId,
- String label, ColumnTypeCode columnType, ColumnDataType columnDataType, C_Expression expression) {
- this.id = id;
- this.columnId=columnId;
- this.label = label;
- this.columnType = columnType;
- this.columnDataType = columnDataType;
- this.defaultValue = null;
- hasExpression = true;
- this.expression = expression;
- }
-
- /**
- * For CodeName Column
- * @param id TODO
- * @param columnId TODO
- * @param label
- * @param columnType
- * @param localeName
- * @param defaultValue
- */
- public ColumnMockUp(String id, String columnId,
- String label, ColumnTypeCode columnType, String localeName, String defaultValue) {
- this.id = null;
- this.columnId=null;
- this.label = label;
- this.columnType = columnType;
- this.columnDataType = ColumnDataType.Text;
- this.localeName = localeName;
- this.defaultValue = defaultValue;
- hasExpression = false;
- expression = null;
- }
-
- /**
- *
- * @param id TODO
- * @param columnId TODO
- * @param label
- * @param columnType
- * @param localeName
- * @param expressionContainer
- */
- public ColumnMockUp(String id, String columnId,
- String label, ColumnTypeCode columnType, String localeName, C_Expression expression) {
- this.id = id;
- this.columnId=columnId;
- this.label = label;
- this.columnType = columnType;
- this.columnDataType = ColumnDataType.Text;
- this.localeName = localeName;
- this.defaultValue = null;
- hasExpression = true;
- this.expression = expression;
- }
-
- /**
- * For Dimension
- * @param id TODO
- * @param columnId TODO
- * @param label
- * @param columnType
- * @param defaultValue
- * @param timeDimensionType
- */
- public ColumnMockUp(String id, String columnId,
- String label, ColumnTypeCode columnType, ColumnData codelistColumnReference, String defaultValue) {
- this.id = id;
- this.columnId=columnId;
- this.label = label;
- this.columnType = columnType;
- this.columnDataType = ColumnDataType.Integer;
- this.codelistColumnReference = codelistColumnReference;
- this.defaultValue = defaultValue;
- hasExpression = false;
- expression = null;
-
- }
-
- /**
- * For TimeDimension
- * @param id TODO
- * @param columnId TODO
- * @param label
- * @param columnType
- * @param timeDimensionType
- * @param defaultValue
- */
- public ColumnMockUp(String id, String columnId,
- String label, ColumnTypeCode columnType, PeriodDataType timeDimensionType, String defaultValue) {
- this.id = id;
- this.columnId=columnId;
- this.label = label;
- this.columnType = columnType;
- this.columnDataType = ColumnDataType.Integer;
- this.timeDimensionType = timeDimensionType;
- this.defaultValue = defaultValue;
- hasExpression = false;
- expression = null;
-
- }
-
- public String getLabel() {
- return label;
- }
-
- public void setLabel(String label) {
- this.label = label;
- }
-
- public ColumnTypeCode getColumnType() {
- return columnType;
- }
-
- public void setColumnType(ColumnTypeCode columnType) {
- this.columnType = columnType;
- }
-
- public String getDefaultValue() {
- return defaultValue;
- }
-
- public void setDefaultValue(String defaultValue) {
- this.defaultValue = defaultValue;
- }
-
- public String getLocaleName() {
- return localeName;
- }
-
- public void setLocaleName(String localeName) {
- this.localeName = localeName;
- }
-
- public ColumnDataType getColumnDataType() {
- return columnDataType;
- }
-
- public void setColumnDataType(ColumnDataType columnDataType) {
- this.columnDataType = columnDataType;
- }
-
- public PeriodDataType getTimeDimensionType() {
- return timeDimensionType;
- }
-
- public void setTimeDimensionType(PeriodDataType timeDimensionType) {
- this.timeDimensionType = timeDimensionType;
- }
-
- public ColumnData getCodelistColumnReference() {
- return codelistColumnReference;
- }
-
- public void setCodelistColumnReference(ColumnData codelistColumnReference) {
- this.codelistColumnReference = codelistColumnReference;
- }
-
- public String getId() {
- return id;
- }
-
- public void setId(String id) {
- this.id = id;
- }
-
- public boolean hasExpression() {
- return hasExpression;
- }
-
- public void setHasExpression(boolean hasExpression) {
- this.hasExpression = hasExpression;
- }
-
- public C_Expression getExpression() {
- return expression;
- }
-
- public void setExpression(C_Expression expression) {
- this.expression = expression;
- }
-
- public String getColumnId() {
- return columnId;
- }
-
- public void setColumnId(String columnId) {
- this.columnId = columnId;
- }
-
- @Override
- public String toString() {
- return "ColumnMockUp [id=" + id + ", columnId=" + columnId
- + ", columnType=" + columnType + ", columnDataType="
- + columnDataType + ", defaultValue=" + defaultValue
- + ", label=" + label + ", localeName=" + localeName
- + ", hasExpression=" + hasExpression + ", expression="
- + expression + ", timeDimensionType=" + timeDimensionType
- + ", codelistColumnReference=" + codelistColumnReference + "]";
- }
-
-
-
-
-
-
-}
diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/ColumnViewData.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/ColumnViewData.java
deleted file mode 100644
index 0942ec4..0000000
--- a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/ColumnViewData.java
+++ /dev/null
@@ -1,74 +0,0 @@
-package org.gcube.portlets.user.td.gwtservice.shared.tr;
-
-import java.io.Serializable;
-
-/**
- *
- * @author "Giancarlo Panichi" g.panichi@isti.cnr.it
- *
- */
-public class ColumnViewData implements Serializable {
-
- private static final long serialVersionUID = 6727733264842637144L;
-
- /**
- * ColumnId of dimension column in view
- */
- protected String sourceTableDimensionColumnId;
-
- /**
- * ColumnId of dimension column in table
- */
- protected String targetTableColumnId;
-
- /**
- * TableId of table
- */
- protected long targetTableId;
-
- public ColumnViewData() {
-
- }
-
- public ColumnViewData(String sourceTableDimensionColumnId,
- String targetTableColumnId, long targetTableId) {
- this.sourceTableDimensionColumnId = sourceTableDimensionColumnId;
- this.targetTableColumnId = targetTableColumnId;
- this.targetTableId = targetTableId;
- }
-
- 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;
- }
-
- @Override
- public String toString() {
- return "ColumnViewData [sourceTableDimensionColumnId="
- + sourceTableDimensionColumnId + ", targetTableColumnId="
- + targetTableColumnId + ", targetTableId=" + targetTableId
- + "]";
- }
-
-}
diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/PeriodDataType.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/PeriodDataType.java
deleted file mode 100644
index c09970c..0000000
--- a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/PeriodDataType.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package org.gcube.portlets.user.td.gwtservice.shared.tr;
-
-import java.io.Serializable;
-import java.util.ArrayList;
-
-/**
- *
- * @author giancarlo email: g.panichi@isti.cnr.it
- *
- */
-public class PeriodDataType implements Serializable, Comparable {
-
- private static final long serialVersionUID = -5172920999547673068L;
-
- private String name;
- private String label;
- private ArrayList timeDataFormats;
-
- public PeriodDataType() {
-
- }
-
- public PeriodDataType(String name, String label,
- ArrayList timeDataFormats) {
- super();
- this.name = name;
- this.label = label;
- this.timeDataFormats = timeDataFormats;
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public String getLabel() {
- return label;
- }
-
- public void setLabel(String label) {
- this.label = label;
- }
-
- public ArrayList getTimeDataFormats() {
- return timeDataFormats;
- }
-
- public void setTimeDataFormats(ArrayList timeDataFormats) {
- this.timeDataFormats = timeDataFormats;
- }
-
- @Override
- public int compareTo(PeriodDataType periodDataType) {
- return periodDataType.getName().compareTo(name);
- }
-
- @Override
- public String toString() {
- return "PeriodDataType [name=" + name + ", label=" + label
- + ", timeDataFormats=" + timeDataFormats + "]";
- }
-
-
-}
diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/TableData.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/TableData.java
index 603914d..b28f2cc 100644
--- a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/TableData.java
+++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/TableData.java
@@ -4,6 +4,7 @@ import java.io.Serializable;
import java.util.ArrayList;
import org.gcube.portlets.user.td.widgetcommonevent.shared.TRId;
+import org.gcube.portlets.user.td.widgetcommonevent.shared.tr.column.ColumnData;
/**
*
diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/ValueDataFormat.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/ValueDataFormat.java
deleted file mode 100644
index d902800..0000000
--- a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/ValueDataFormat.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package org.gcube.portlets.user.td.gwtservice.shared.tr;
-
-import java.io.Serializable;
-
-/**
- *
- * @author giancarlo email: g.panichi@isti.cnr.it
- *
- */
-public class ValueDataFormat implements Serializable {
-
- private static final long serialVersionUID = 6790236931169590842L;
-
- private String id;
- private String example;
- private String regexp;
-
- public ValueDataFormat() {
-
- }
-
- public ValueDataFormat(String id, String example, String regexp) {
- super();
- this.id=id;
- this.example = example;
- this.regexp = regexp;
- }
-
- public String getId() {
- return id;
- }
-
- public void setId(String id) {
- this.id = id;
- }
-
- public String getExample() {
- return example;
- }
-
- public void setExample(String example) {
- this.example = example;
- }
-
- public String getRegexp() {
- return regexp;
- }
-
- public void setRegexp(String regexp) {
- this.regexp = regexp;
- }
-
- public String getLabel(){
- return id;
- }
-
- @Override
- public String toString() {
- return "TimeDataFormat [id=" + id + ", example=" + example
- + ", regexp=" + regexp + "]";
- }
-
-}
diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/batch/OccurrencesForReplaceBatchColumnSession.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/batch/OccurrencesForReplaceBatchColumnSession.java
index 6bcf2a0..e8ee98d 100644
--- a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/batch/OccurrencesForReplaceBatchColumnSession.java
+++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/batch/OccurrencesForReplaceBatchColumnSession.java
@@ -2,8 +2,8 @@ package org.gcube.portlets.user.td.gwtservice.shared.tr.batch;
import java.io.Serializable;
-import org.gcube.portlets.user.td.gwtservice.shared.tr.ColumnData;
import org.gcube.portlets.user.td.gwtservice.shared.tr.ConditionCode;
+import org.gcube.portlets.user.td.widgetcommonevent.shared.tr.column.ColumnData;
/**
*
diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/batch/ReplaceBatchColumnSession.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/batch/ReplaceBatchColumnSession.java
index c0070b6..6a30255 100644
--- a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/batch/ReplaceBatchColumnSession.java
+++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/batch/ReplaceBatchColumnSession.java
@@ -3,8 +3,8 @@ package org.gcube.portlets.user.td.gwtservice.shared.tr.batch;
import java.io.Serializable;
import java.util.ArrayList;
-import org.gcube.portlets.user.td.gwtservice.shared.tr.ColumnData;
import org.gcube.portlets.user.td.widgetcommonevent.shared.TRId;
+import org.gcube.portlets.user.td.widgetcommonevent.shared.tr.column.ColumnData;
/**
*
diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/column/AddColumnSession.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/column/AddColumnSession.java
index 8153787..c6e0dd6 100644
--- a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/column/AddColumnSession.java
+++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/column/AddColumnSession.java
@@ -2,8 +2,8 @@ package org.gcube.portlets.user.td.gwtservice.shared.tr.column;
import java.io.Serializable;
-import org.gcube.portlets.user.td.gwtservice.shared.tr.ColumnMockUp;
import org.gcube.portlets.user.td.widgetcommonevent.shared.TRId;
+import org.gcube.portlets.user.td.widgetcommonevent.shared.tr.column.ColumnMockUp;
/**
*
diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/column/ChangeColumnsPositionSession.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/column/ChangeColumnsPositionSession.java
index ecb5995..c4bdb2e 100644
--- a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/column/ChangeColumnsPositionSession.java
+++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/column/ChangeColumnsPositionSession.java
@@ -3,8 +3,8 @@ package org.gcube.portlets.user.td.gwtservice.shared.tr.column;
import java.io.Serializable;
import java.util.ArrayList;
-import org.gcube.portlets.user.td.gwtservice.shared.tr.ColumnData;
import org.gcube.portlets.user.td.widgetcommonevent.shared.TRId;
+import org.gcube.portlets.user.td.widgetcommonevent.shared.tr.column.ColumnData;
/**
*
diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/column/DeleteColumnSession.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/column/DeleteColumnSession.java
index 7cd8064..40c02bf 100644
--- a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/column/DeleteColumnSession.java
+++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/column/DeleteColumnSession.java
@@ -3,8 +3,8 @@ package org.gcube.portlets.user.td.gwtservice.shared.tr.column;
import java.io.Serializable;
import java.util.ArrayList;
-import org.gcube.portlets.user.td.gwtservice.shared.tr.ColumnData;
import org.gcube.portlets.user.td.widgetcommonevent.shared.TRId;
+import org.gcube.portlets.user.td.widgetcommonevent.shared.tr.column.ColumnData;
/**
*
diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/column/FilterColumnSession.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/column/FilterColumnSession.java
index d030f91..f116a56 100644
--- a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/column/FilterColumnSession.java
+++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/column/FilterColumnSession.java
@@ -2,8 +2,8 @@ package org.gcube.portlets.user.td.gwtservice.shared.tr.column;
import java.io.Serializable;
-import org.gcube.portlets.user.td.gwtservice.shared.tr.ColumnData;
import org.gcube.portlets.user.td.widgetcommonevent.shared.expression.C_Expression;
+import org.gcube.portlets.user.td.widgetcommonevent.shared.tr.column.ColumnData;
/**
*
diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/column/LabelColumnSession.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/column/LabelColumnSession.java
index 059447f..510486e 100644
--- a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/column/LabelColumnSession.java
+++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/column/LabelColumnSession.java
@@ -3,8 +3,8 @@ package org.gcube.portlets.user.td.gwtservice.shared.tr.column;
import java.io.Serializable;
import java.util.HashMap;
-import org.gcube.portlets.user.td.gwtservice.shared.tr.ColumnData;
import org.gcube.portlets.user.td.widgetcommonevent.shared.TRId;
+import org.gcube.portlets.user.td.widgetcommonevent.shared.tr.column.ColumnData;
/**
*
diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/column/MergeColumnSession.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/column/MergeColumnSession.java
index e6d5a71..983a467 100644
--- a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/column/MergeColumnSession.java
+++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/column/MergeColumnSession.java
@@ -3,7 +3,7 @@ package org.gcube.portlets.user.td.gwtservice.shared.tr.column;
import java.io.Serializable;
import org.gcube.data.analysis.tabulardata.expression.Expression;
-import org.gcube.portlets.user.td.gwtservice.shared.tr.ColumnData;
+import org.gcube.portlets.user.td.widgetcommonevent.shared.tr.column.ColumnData;
import org.gcube.portlets.user.td.widgetcommonevent.shared.tr.column.ColumnDataType;
import org.gcube.portlets.user.td.widgetcommonevent.shared.tr.column.ColumnTypeCode;
diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/column/ReplaceColumnByExpressionSession.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/column/ReplaceColumnByExpressionSession.java
index fc33a3b..bd352d2 100644
--- a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/column/ReplaceColumnByExpressionSession.java
+++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/column/ReplaceColumnByExpressionSession.java
@@ -2,8 +2,8 @@ package org.gcube.portlets.user.td.gwtservice.shared.tr.column;
import java.io.Serializable;
-import org.gcube.portlets.user.td.gwtservice.shared.tr.ColumnData;
import org.gcube.portlets.user.td.widgetcommonevent.shared.expression.C_Expression;
+import org.gcube.portlets.user.td.widgetcommonevent.shared.tr.column.ColumnData;
/**
*
diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/column/ReplaceColumnSession.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/column/ReplaceColumnSession.java
index d3e4d92..eded136 100644
--- a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/column/ReplaceColumnSession.java
+++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/column/ReplaceColumnSession.java
@@ -2,8 +2,8 @@ package org.gcube.portlets.user.td.gwtservice.shared.tr.column;
import java.io.Serializable;
-import org.gcube.portlets.user.td.gwtservice.shared.tr.ColumnData;
import org.gcube.portlets.user.td.widgetcommonevent.shared.TRId;
+import org.gcube.portlets.user.td.widgetcommonevent.shared.tr.column.ColumnData;
/**
*
diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/column/SplitColumnSession.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/column/SplitColumnSession.java
index d9ff6a0..1a6d456 100644
--- a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/column/SplitColumnSession.java
+++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/column/SplitColumnSession.java
@@ -4,7 +4,7 @@ import java.io.Serializable;
import java.util.ArrayList;
import org.gcube.data.analysis.tabulardata.expression.Expression;
-import org.gcube.portlets.user.td.gwtservice.shared.tr.ColumnData;
+import org.gcube.portlets.user.td.widgetcommonevent.shared.tr.column.ColumnData;
import org.gcube.portlets.user.td.widgetcommonevent.shared.tr.column.ColumnDataType;
import org.gcube.portlets.user.td.widgetcommonevent.shared.tr.column.ColumnTypeCode;
diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/column/type/ChangeColumnTypeSession.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/column/type/ChangeColumnTypeSession.java
index b392116..ac93d81 100644
--- a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/column/type/ChangeColumnTypeSession.java
+++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/column/type/ChangeColumnTypeSession.java
@@ -2,12 +2,12 @@ package org.gcube.portlets.user.td.gwtservice.shared.tr.column.type;
import java.io.Serializable;
-import org.gcube.portlets.user.td.gwtservice.shared.tr.ColumnData;
-import org.gcube.portlets.user.td.gwtservice.shared.tr.PeriodDataType;
-import org.gcube.portlets.user.td.gwtservice.shared.tr.ValueDataFormat;
import org.gcube.portlets.user.td.gwtservice.shared.tr.column.mapping.ColumnMappingList;
+import org.gcube.portlets.user.td.widgetcommonevent.shared.tr.column.ColumnData;
import org.gcube.portlets.user.td.widgetcommonevent.shared.tr.column.ColumnDataType;
import org.gcube.portlets.user.td.widgetcommonevent.shared.tr.column.ColumnTypeCode;
+import org.gcube.portlets.user.td.widgetcommonevent.shared.tr.column.PeriodDataType;
+import org.gcube.portlets.user.td.widgetcommonevent.shared.tr.column.ValueDataFormat;
public class ChangeColumnTypeSession implements Serializable {
diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/groupby/TimeAggregationSession.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/groupby/TimeAggregationSession.java
index 86ac6d2..5a3335d 100644
--- a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/groupby/TimeAggregationSession.java
+++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/groupby/TimeAggregationSession.java
@@ -3,8 +3,8 @@ package org.gcube.portlets.user.td.gwtservice.shared.tr.groupby;
import java.io.Serializable;
import java.util.HashMap;
-import org.gcube.portlets.user.td.gwtservice.shared.tr.ColumnData;
import org.gcube.portlets.user.td.widgetcommonevent.shared.TRId;
+import org.gcube.portlets.user.td.widgetcommonevent.shared.tr.column.ColumnData;
/**
*
diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/normalization/DenormalizationSession.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/normalization/DenormalizationSession.java
index c9fa0b5..fd98d4a 100644
--- a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/normalization/DenormalizationSession.java
+++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/normalization/DenormalizationSession.java
@@ -2,8 +2,8 @@ package org.gcube.portlets.user.td.gwtservice.shared.tr.normalization;
import java.io.Serializable;
-import org.gcube.portlets.user.td.gwtservice.shared.tr.ColumnData;
import org.gcube.portlets.user.td.widgetcommonevent.shared.TRId;
+import org.gcube.portlets.user.td.widgetcommonevent.shared.tr.column.ColumnData;
/**
diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/normalization/NormalizationSession.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/normalization/NormalizationSession.java
index 8fc4402..926281f 100644
--- a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/normalization/NormalizationSession.java
+++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/normalization/NormalizationSession.java
@@ -3,8 +3,8 @@ package org.gcube.portlets.user.td.gwtservice.shared.tr.normalization;
import java.io.Serializable;
import java.util.ArrayList;
-import org.gcube.portlets.user.td.gwtservice.shared.tr.ColumnData;
import org.gcube.portlets.user.td.widgetcommonevent.shared.TRId;
+import org.gcube.portlets.user.td.widgetcommonevent.shared.tr.column.ColumnData;
/**
diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/replacebyexternal/ReplaceByExternalColumnsMapping.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/replacebyexternal/ReplaceByExternalColumnsMapping.java
index 1a766ca..e1b3542 100644
--- a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/replacebyexternal/ReplaceByExternalColumnsMapping.java
+++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/replacebyexternal/ReplaceByExternalColumnsMapping.java
@@ -2,7 +2,7 @@ package org.gcube.portlets.user.td.gwtservice.shared.tr.replacebyexternal;
import java.io.Serializable;
-import org.gcube.portlets.user.td.gwtservice.shared.tr.ColumnData;
+import org.gcube.portlets.user.td.widgetcommonevent.shared.tr.column.ColumnData;
/**
*
diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/replacebyexternal/ReplaceByExternalSession.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/replacebyexternal/ReplaceByExternalSession.java
index b2a41c3..bacf484 100644
--- a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/replacebyexternal/ReplaceByExternalSession.java
+++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/replacebyexternal/ReplaceByExternalSession.java
@@ -3,9 +3,9 @@ package org.gcube.portlets.user.td.gwtservice.shared.tr.replacebyexternal;
import java.io.Serializable;
import java.util.ArrayList;
-import org.gcube.portlets.user.td.gwtservice.shared.tr.ColumnData;
import org.gcube.portlets.user.td.gwtservice.shared.tr.TabResource;
import org.gcube.portlets.user.td.widgetcommonevent.shared.TRId;
+import org.gcube.portlets.user.td.widgetcommonevent.shared.tr.column.ColumnData;
/**
*
diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/rows/DuplicatesSession.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/rows/DuplicatesSession.java
index 9984b23..9c3015a 100644
--- a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/rows/DuplicatesSession.java
+++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/rows/DuplicatesSession.java
@@ -3,8 +3,8 @@ package org.gcube.portlets.user.td.gwtservice.shared.tr.rows;
import java.io.Serializable;
import java.util.ArrayList;
-import org.gcube.portlets.user.td.gwtservice.shared.tr.ColumnData;
import org.gcube.portlets.user.td.widgetcommonevent.shared.TRId;
+import org.gcube.portlets.user.td.widgetcommonevent.shared.tr.column.ColumnData;
/**
*
diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/rows/EditRowSession.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/rows/EditRowSession.java
index 61529c4..85c8a05 100644
--- a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/rows/EditRowSession.java
+++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/rows/EditRowSession.java
@@ -4,8 +4,8 @@ import java.io.Serializable;
import java.util.ArrayList;
import java.util.HashMap;
-import org.gcube.portlets.user.td.gwtservice.shared.tr.ColumnData;
import org.gcube.portlets.user.td.widgetcommonevent.shared.TRId;
+import org.gcube.portlets.user.td.widgetcommonevent.shared.tr.column.ColumnData;
/**
*
diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/union/UnionColumnsMapping.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/union/UnionColumnsMapping.java
index 033a35e..6ddeeaf 100644
--- a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/union/UnionColumnsMapping.java
+++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/union/UnionColumnsMapping.java
@@ -2,7 +2,7 @@ package org.gcube.portlets.user.td.gwtservice.shared.tr.union;
import java.io.Serializable;
-import org.gcube.portlets.user.td.gwtservice.shared.tr.ColumnData;
+import org.gcube.portlets.user.td.widgetcommonevent.shared.tr.column.ColumnData;
/**
*