gCubeSystem
/
tabular-data-gwt-service
15
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-gwt-service@91000 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Giancarlo Panichi 2014-02-06 18:04:43 +00:00
parent 61b3475d1e
commit 12fc60cd34
2 changed files with 20 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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());

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

@ -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 String columnName;
protected ColumnData columnData;
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="
+ columnName + ", columnTypeCode=" + columnTypeCode
+ ", columnDataType=" + columnDataType
+ ", columnTypeCodeTarget=" + columnTypeCodeTarget
+ ", columnDataTypeTarget=" + columnDataTypeTarget + "]";
return "ChangeColumnTypeSession [columnData=" + columnData
+ ", columnTypeCode=" + columnTypeCode + ", columnDataType="
+ columnDataType + ", columnTypeCodeTarget="
+ columnTypeCodeTarget + ", columnDataTypeTarget="
+ columnDataTypeTarget + "]";
}
}