Minor Update

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-gwt-service@91000 82a268e6-3cf1-43bd-a215-b396298e98cf

src/main/java/org/gcube/portlets/user/td/gwtservice/server/TDGWTServiceImpl.java

@@ -2148,12 +2148,12 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
 			Map<String, Object> parameterInstance = retrieveChangeColumnTypeParameters(changeColumnTypeSession);
 
 			OperationExecution invocation = new OperationExecution(
-					changeColumnTypeSession.getColumnName(),
+					changeColumnTypeSession.getColumnData().getName(),
 					changeToMeasureColumnOperation.getOperationId(),
 					parameterInstance);
 
 			TabularResourceId serviceTR = new TabularResourceId(
-					Long.valueOf(changeColumnTypeSession.getTrId().getId()));
+					Long.valueOf(changeColumnTypeSession.getColumnData().getTrId().getId()));
 			logger.debug("OperationInvocation: \n" + invocation.toString());
 			Task trTask = service.execute(invocation, serviceTR);
 			logger.debug("Start Task on service: TaskId " + trTask.getId());
@@ -2216,7 +2216,7 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
 						Table table = task.getResult().getPrimaryTable();
 						logger.debug("Table retrived: " + table.toString());
 						TRId trId = new TRId();
-						trId.setId(changeColumnTypeSession.getTrId().getId());
+						trId.setId(changeColumnTypeSession.getColumnData().getTrId().getId());
 						trId.setTableId(String
 								.valueOf(table.getId().getValue()));
 						trId.setTableType(table.getTableType().getName());

src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/column/type/ChangeColumnTypeSession.java

@@ -2,6 +2,7 @@ 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.widgetcommonevent.shared.TRId;
 import org.gcube.portlets.user.td.widgetcommonevent.shared.tr.column.ColumnDataType;
 import org.gcube.portlets.user.td.widgetcommonevent.shared.tr.column.ColumnTypeCode;
@@ -10,26 +11,14 @@ public class ChangeColumnTypeSession implements Serializable {
 
 	private static final long serialVersionUID = 7154832921853261421L;
 	
-	protected TRId trId;
+	protected ColumnData columnData;
-	protected String columnName;
 	protected ColumnTypeCode columnTypeCode;
 	protected ColumnDataType columnDataType;
 	protected ColumnTypeCode columnTypeCodeTarget;
 	protected ColumnDataType columnDataTypeTarget;
 	
 	
-	public TRId getTrId() {
+	
-		return trId;
-	}
-	public void setTrId(TRId trId) {
-		this.trId = trId;
-	}
-	public String getColumnName() {
-		return columnName;
-	}
-	public void setColumnName(String columnName) {
-		this.columnName = columnName;
-	}
 	public ColumnTypeCode getColumnTypeCode() {
 		return columnTypeCode;
 	}
@@ -54,15 +43,24 @@ public class ChangeColumnTypeSession implements Serializable {
 	public void setColumnDataTypeTarget(ColumnDataType columnDataTypeTarget) {
 		this.columnDataTypeTarget = columnDataTypeTarget;
 	}
+	public ColumnData getColumnData() {
+		return columnData;
+	}
+	public void setColumnData(ColumnData columnData) {
+		this.columnData = columnData;
+	}
 	@Override
 	public String toString() {
-		return "ChangeColumnTypeSession [trId=" + trId + ", columnName="
+		return "ChangeColumnTypeSession [columnData=" + columnData
-				+ columnName + ", columnTypeCode=" + columnTypeCode
+				+ ", columnTypeCode=" + columnTypeCode + ", columnDataType="
-				+ ", columnDataType=" + columnDataType
+				+ columnDataType + ", columnTypeCodeTarget="
-				+ ", columnTypeCodeTarget=" + columnTypeCodeTarget
+				+ columnTypeCodeTarget + ", columnDataTypeTarget="
-				+ ", columnDataTypeTarget=" + columnDataTypeTarget + "]";
+				+ columnDataTypeTarget + "]";
 	}
 	
 	
 	
+	
+	
+	
 }