From 9af555a96aa3d0e1d857733d39c5ab03935c07d8 Mon Sep 17 00:00:00 2001 From: Giancarlo Panichi Date: Mon, 9 Feb 2015 17:30:42 +0000 Subject: [PATCH] Minor Update git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-column-widget@111829 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../td/columnwidget/client/ChangeColumnTypePanel.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/ChangeColumnTypePanel.java b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/ChangeColumnTypePanel.java index e26184c..800df9a 100644 --- a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/ChangeColumnTypePanel.java +++ b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/ChangeColumnTypePanel.java @@ -784,7 +784,8 @@ public class ChangeColumnTypePanel extends FramedPanel implements comboColumnReferenceTypeLabel.setVisible(false); comboColumnMappingLabel.setVisible(false); comboPeriodTypeLabel.setVisible(false); - comboValueDataFormatLabel.setVisible(true); + comboValueDataFormatLabel.setVisible(false); + comboAttributeType.reset(); break; case DIMENSION: comboLocaleTypeLabel.setVisible(false); @@ -804,7 +805,7 @@ public class ChangeColumnTypePanel extends FramedPanel implements comboColumnReferenceTypeLabel.setVisible(false); comboColumnMappingLabel.setVisible(false); comboPeriodTypeLabel.setVisible(false); - comboValueDataFormatLabel.setVisible(true); + comboValueDataFormatLabel.setVisible(false); break; case TIMEDIMENSION: comboLocaleTypeLabel.setVisible(false); @@ -836,6 +837,7 @@ public class ChangeColumnTypePanel extends FramedPanel implements } protected void updateMeasureType(ColumnDataType type) { + comboValueDataFormatLabel.setVisible(true); ArrayList valueDataFormats = valueDataFormatMap .get(type); comboValueDataFormat.clear(); @@ -965,6 +967,7 @@ public class ChangeColumnTypePanel extends FramedPanel implements .selectedMeasure(cd.getDataTypeName())); comboMeasureType.setValue(ColumnDataTypeStore .selectedMeasureElement(cd.getDataTypeName())); + comboValueDataFormatLabel.setVisible(true); ColumnDataType columnDataType = ColumnDataType .getColumnDataTypeFromId(cd.getDataTypeName()); ArrayList valueDataFormats = valueDataFormatMap @@ -1231,7 +1234,9 @@ public class ChangeColumnTypePanel extends FramedPanel implements .setColumnDataTypeTarget(dataType); ValueDataFormat valueDataFormat = comboValueDataFormat .getCurrentValue(); - if (valueDataFormat != null) { + if (valueDataFormat != null + || (valueDataFormat == null && dataType + .compareTo(ColumnDataType.Text) == 0)) { changeColumnTypeSession .setValueDataFormat(valueDataFormat); callChangeColumnType();