From 0916296bc47610eeb192c98fcc2d6325d8662d7a Mon Sep 17 00:00:00 2001 From: Giancarlo Panichi Date: Tue, 4 Mar 2014 19:25:50 +0000 Subject: [PATCH] Minor Updated git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-column-widget@92655 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../client/ChangeColumnTypePanel.java | 72 +++++++++---------- 1 file changed, 35 insertions(+), 37 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 6fb3704..a4f550a 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 @@ -34,8 +34,6 @@ import com.google.gwt.event.logical.shared.SelectionHandler; import com.google.gwt.user.client.rpc.AsyncCallback; import com.google.web.bindery.event.shared.EventBus; import com.sencha.gxt.cell.core.client.form.ComboBoxCell.TriggerAction; -import com.sencha.gxt.core.client.IdentityValueProvider; -import com.sencha.gxt.core.client.ValueProvider; import com.sencha.gxt.core.client.util.Margins; import com.sencha.gxt.data.client.loader.RpcProxy; import com.sencha.gxt.data.shared.LabelProvider; @@ -47,7 +45,6 @@ import com.sencha.gxt.data.shared.loader.ListLoadResultBean; import com.sencha.gxt.data.shared.loader.ListLoader; import com.sencha.gxt.data.shared.loader.LoadResultListStoreBinding; import com.sencha.gxt.widget.core.client.FramedPanel; -import com.sencha.gxt.widget.core.client.ListView; import com.sencha.gxt.widget.core.client.box.AlertMessageBox; import com.sencha.gxt.widget.core.client.button.TextButton; import com.sencha.gxt.widget.core.client.container.VerticalLayoutContainer; @@ -291,11 +288,11 @@ public class ChangeColumnTypePanel extends FramedPanel implements addHandlersForComboTimeDimensionType(propsTimeDimensionType.label()); - comboTimeDimensionType.setEmptyText("Select a time dimension type..."); comboTimeDimensionType.setWidth(191); comboTimeDimensionType.setTypeAhead(true); comboTimeDimensionType.setTriggerAction(TriggerAction.ALL); + //comboTimeDimensionType.getListView().getElement().applyStyles("width:170px;"); comboTimeDimensionTypeLabel = new FieldLabel(comboTimeDimensionType, "Time Type"); @@ -489,44 +486,45 @@ public class ChangeColumnTypePanel extends FramedPanel implements protected void updateColumnType(ColumnTypeCode type) { Log.debug("Update ColumnTypeCode " + type.toString()); - if (type == ColumnTypeCode.MEASURE) { + switch (type){ + case ATTRIBUTE: + comboMeasureTypeLabel.setVisible(false); + comboAttributeTypeLabel.setVisible(true); + comboDimensionTypeLabel.setVisible(false); + comboColumnReferenceTypeLabel.setVisible(false); + comboTimeDimensionTypeLabel.setVisible(false); + break; + case DIMENSION: + comboMeasureTypeLabel.setVisible(false); + comboAttributeTypeLabel.setVisible(false); + comboDimensionTypeLabel.setVisible(true); + comboColumnReferenceTypeLabel.setVisible(false); + comboTimeDimensionTypeLabel.setVisible(false); + break; + case MEASURE: comboMeasureTypeLabel.setVisible(true); comboAttributeTypeLabel.setVisible(false); comboDimensionTypeLabel.setVisible(false); comboColumnReferenceTypeLabel.setVisible(false); comboTimeDimensionTypeLabel.setVisible(false); - } else { - if (type == ColumnTypeCode.ATTRIBUTE) { - comboMeasureTypeLabel.setVisible(false); - comboAttributeTypeLabel.setVisible(true); - comboDimensionTypeLabel.setVisible(false); - comboColumnReferenceTypeLabel.setVisible(false); - comboTimeDimensionTypeLabel.setVisible(false); - } else { - if (type == ColumnTypeCode.DIMENSION) { - comboMeasureTypeLabel.setVisible(false); - comboAttributeTypeLabel.setVisible(false); - comboDimensionTypeLabel.setVisible(true); - comboColumnReferenceTypeLabel.setVisible(false); - comboTimeDimensionTypeLabel.setVisible(false); - } else { - if (type == ColumnTypeCode.TIMEDIMENSION) { - comboMeasureTypeLabel.setVisible(false); - comboAttributeTypeLabel.setVisible(false); - comboDimensionTypeLabel.setVisible(false); - comboColumnReferenceTypeLabel.setVisible(false); - comboTimeDimensionTypeLabel.setVisible(true); - } else { - comboMeasureTypeLabel.setVisible(false); - comboAttributeTypeLabel.setVisible(false); - comboDimensionTypeLabel.setVisible(false); - comboColumnReferenceTypeLabel.setVisible(false); - comboTimeDimensionTypeLabel.setVisible(false); - } - } - } - + break; + case TIMEDIMENSION: + comboMeasureTypeLabel.setVisible(false); + comboAttributeTypeLabel.setVisible(false); + comboDimensionTypeLabel.setVisible(false); + comboColumnReferenceTypeLabel.setVisible(false); + comboTimeDimensionTypeLabel.setVisible(true); + break; + default: + comboMeasureTypeLabel.setVisible(false); + comboAttributeTypeLabel.setVisible(false); + comboDimensionTypeLabel.setVisible(false); + comboColumnReferenceTypeLabel.setVisible(false); + comboTimeDimensionTypeLabel.setVisible(false); + break; } + + forceLayout(); } protected void updateMeasureType(ColumnDataType type) { @@ -538,7 +536,7 @@ public class ChangeColumnTypePanel extends FramedPanel implements } protected void updateTimeDimensionType(TimeDimensionType type) { - + } protected void loadData(ListLoadConfig loadConfig,