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
This commit is contained in:
parent
47103b7257
commit
9af555a96a
|
@ -784,7 +784,8 @@ public class ChangeColumnTypePanel extends FramedPanel implements
|
||||||
comboColumnReferenceTypeLabel.setVisible(false);
|
comboColumnReferenceTypeLabel.setVisible(false);
|
||||||
comboColumnMappingLabel.setVisible(false);
|
comboColumnMappingLabel.setVisible(false);
|
||||||
comboPeriodTypeLabel.setVisible(false);
|
comboPeriodTypeLabel.setVisible(false);
|
||||||
comboValueDataFormatLabel.setVisible(true);
|
comboValueDataFormatLabel.setVisible(false);
|
||||||
|
comboAttributeType.reset();
|
||||||
break;
|
break;
|
||||||
case DIMENSION:
|
case DIMENSION:
|
||||||
comboLocaleTypeLabel.setVisible(false);
|
comboLocaleTypeLabel.setVisible(false);
|
||||||
|
@ -804,7 +805,7 @@ public class ChangeColumnTypePanel extends FramedPanel implements
|
||||||
comboColumnReferenceTypeLabel.setVisible(false);
|
comboColumnReferenceTypeLabel.setVisible(false);
|
||||||
comboColumnMappingLabel.setVisible(false);
|
comboColumnMappingLabel.setVisible(false);
|
||||||
comboPeriodTypeLabel.setVisible(false);
|
comboPeriodTypeLabel.setVisible(false);
|
||||||
comboValueDataFormatLabel.setVisible(true);
|
comboValueDataFormatLabel.setVisible(false);
|
||||||
break;
|
break;
|
||||||
case TIMEDIMENSION:
|
case TIMEDIMENSION:
|
||||||
comboLocaleTypeLabel.setVisible(false);
|
comboLocaleTypeLabel.setVisible(false);
|
||||||
|
@ -836,6 +837,7 @@ public class ChangeColumnTypePanel extends FramedPanel implements
|
||||||
}
|
}
|
||||||
|
|
||||||
protected void updateMeasureType(ColumnDataType type) {
|
protected void updateMeasureType(ColumnDataType type) {
|
||||||
|
comboValueDataFormatLabel.setVisible(true);
|
||||||
ArrayList<ValueDataFormat> valueDataFormats = valueDataFormatMap
|
ArrayList<ValueDataFormat> valueDataFormats = valueDataFormatMap
|
||||||
.get(type);
|
.get(type);
|
||||||
comboValueDataFormat.clear();
|
comboValueDataFormat.clear();
|
||||||
|
@ -965,6 +967,7 @@ public class ChangeColumnTypePanel extends FramedPanel implements
|
||||||
.selectedMeasure(cd.getDataTypeName()));
|
.selectedMeasure(cd.getDataTypeName()));
|
||||||
comboMeasureType.setValue(ColumnDataTypeStore
|
comboMeasureType.setValue(ColumnDataTypeStore
|
||||||
.selectedMeasureElement(cd.getDataTypeName()));
|
.selectedMeasureElement(cd.getDataTypeName()));
|
||||||
|
comboValueDataFormatLabel.setVisible(true);
|
||||||
ColumnDataType columnDataType = ColumnDataType
|
ColumnDataType columnDataType = ColumnDataType
|
||||||
.getColumnDataTypeFromId(cd.getDataTypeName());
|
.getColumnDataTypeFromId(cd.getDataTypeName());
|
||||||
ArrayList<ValueDataFormat> valueDataFormats = valueDataFormatMap
|
ArrayList<ValueDataFormat> valueDataFormats = valueDataFormatMap
|
||||||
|
@ -1231,7 +1234,9 @@ public class ChangeColumnTypePanel extends FramedPanel implements
|
||||||
.setColumnDataTypeTarget(dataType);
|
.setColumnDataTypeTarget(dataType);
|
||||||
ValueDataFormat valueDataFormat = comboValueDataFormat
|
ValueDataFormat valueDataFormat = comboValueDataFormat
|
||||||
.getCurrentValue();
|
.getCurrentValue();
|
||||||
if (valueDataFormat != null) {
|
if (valueDataFormat != null
|
||||||
|
|| (valueDataFormat == null && dataType
|
||||||
|
.compareTo(ColumnDataType.Text) == 0)) {
|
||||||
changeColumnTypeSession
|
changeColumnTypeSession
|
||||||
.setValueDataFormat(valueDataFormat);
|
.setValueDataFormat(valueDataFormat);
|
||||||
callChangeColumnType();
|
callChangeColumnType();
|
||||||
|
|
Loading…
Reference in New Issue