From aa742e89e1fff938a14f1ac0cbe0cb92a4b8930e Mon Sep 17 00:00:00 2001 From: Giancarlo Panichi Date: Fri, 6 Feb 2015 09:26:40 +0000 Subject: [PATCH] Updated ValueDataTypeFormat in Change Column Type git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-gwt-service@111757 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../opexecution/OpExecution4ChangeColumnType.java | 7 ++++++- .../tr/column/type/ChangeColumnTypeSession.java | 12 ++++++------ 2 files changed, 12 insertions(+), 7 deletions(-) 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 a31a8ed..aeaf4a5 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 @@ -70,6 +70,8 @@ public class OpExecution4ChangeColumnType extends OpExecutionBuilder { map.put(Constants.PARAMETER_TARGET_DATA_TYPE, ColumnDataTypeMap .map(changeColumnTypeSession.getColumnDataTypeTarget())); + map.put(Constants.PARAMETER_PERIOD_INPUT_FORMAT_ID, changeColumnTypeSession + .getValueDataFormat().getId()); invocation = new OperationExecution(changeColumnTypeSession .getColumnData().getColumnId(), operationDefinition.getOperationId(), map); @@ -152,6 +154,9 @@ public class OpExecution4ChangeColumnType extends OpExecutionBuilder { map.put(Constants.PARAMETER_TARGET_DATA_TYPE, ColumnDataTypeMap .map(changeColumnTypeSession.getColumnDataTypeTarget())); + map.put(Constants.PARAMETER_PERIOD_INPUT_FORMAT_ID, changeColumnTypeSession + .getValueDataFormat().getId()); + invocation = new OperationExecution(changeColumnTypeSession .getColumnData().getColumnId(), operationDefinition.getOperationId(), map); @@ -163,7 +168,7 @@ public class OpExecution4ChangeColumnType extends OpExecutionBuilder { map.put(Constants.PARAMETER_PERIOD_FORMAT, changeColumnTypeSession .getPeriodDataType().getLabel()); map.put(Constants.PARAMETER_PERIOD_INPUT_FORMAT_ID, changeColumnTypeSession - .getTimeDataFormat().getId()); + .getValueDataFormat().getId()); invocation = new OperationExecution(changeColumnTypeSession .getColumnData().getColumnId(), 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 3365852..b392116 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 @@ -22,7 +22,7 @@ public class ChangeColumnTypeSession implements Serializable { private String locale; private PeriodDataType timeDimensionType; - private ValueDataFormat timeDataFormat; + private ValueDataFormat valueDataFormat; private ColumnData codelistColumnReference; private ColumnMappingList columnMappingList; @@ -122,12 +122,12 @@ public class ChangeColumnTypeSession implements Serializable { this.timeDimensionType = timeDimensionType; } - public ValueDataFormat getTimeDataFormat() { - return timeDataFormat; + public ValueDataFormat getValueDataFormat() { + return valueDataFormat; } - public void setTimeDataFormat(ValueDataFormat timeDataFormat) { - this.timeDataFormat = timeDataFormat; + public void setValueDataFormat(ValueDataFormat valueDataFormat) { + this.valueDataFormat = valueDataFormat; } public String getLocale() { @@ -154,7 +154,7 @@ public class ChangeColumnTypeSession implements Serializable { + columnTypeCodeTarget + ", columnDataTypeTarget=" + columnDataTypeTarget + ", locale=" + locale + ", timeDimensionType=" + timeDimensionType - + ", timeDataFormat=" + timeDataFormat + + ", timeDataFormat=" + valueDataFormat + ", codelistColumnReference=" + codelistColumnReference + ", columnMappingList=" + columnMappingList + "]"; }