diff --git a/src/main/java/org/gcube/portlets/user/td/extractcodelistwidget/client/TargetColumnsSelectionPanel.java b/src/main/java/org/gcube/portlets/user/td/extractcodelistwidget/client/TargetColumnsSelectionPanel.java index 656bc54..90d85bb 100644 --- a/src/main/java/org/gcube/portlets/user/td/extractcodelistwidget/client/TargetColumnsSelectionPanel.java +++ b/src/main/java/org/gcube/portlets/user/td/extractcodelistwidget/client/TargetColumnsSelectionPanel.java @@ -4,15 +4,17 @@ import java.util.ArrayList; import org.gcube.portlets.user.td.columnwidget.client.dimension.CodelistSelectionDialog; import org.gcube.portlets.user.td.columnwidget.client.dimension.CodelistSelectionListener; +import org.gcube.portlets.user.td.columnwidget.client.dimension.DimensionRowSelectionDialog; import org.gcube.portlets.user.td.columnwidget.client.properties.ColumnDataPropertiesCombo; import org.gcube.portlets.user.td.columnwidget.client.properties.ExtractCodelistDefColumnPropertiesCombo; import org.gcube.portlets.user.td.columnwidget.client.resources.ResourceBundle; import org.gcube.portlets.user.td.columnwidget.client.utils.UtilsGXT3; import org.gcube.portlets.user.td.gwtservice.client.rpc.TDGWTServiceAsync; import org.gcube.portlets.user.td.gwtservice.shared.exception.TDGWTSessionExpiredException; -import org.gcube.portlets.user.td.gwtservice.shared.extract.ExtractCodelistDefColumn; + import org.gcube.portlets.user.td.gwtservice.shared.extract.ExtractCodelistTargetColumn; import org.gcube.portlets.user.td.gwtservice.shared.tr.ColumnData; +import org.gcube.portlets.user.td.gwtservice.shared.tr.DefNewColumn; import org.gcube.portlets.user.td.gwtservice.shared.tr.TabResource; import org.gcube.portlets.user.td.widgetcommonevent.client.event.SessionExpiredEvent; import org.gcube.portlets.user.td.widgetcommonevent.client.type.SessionExpiredType; @@ -32,7 +34,9 @@ import com.sencha.gxt.widget.core.client.container.SimpleContainer; import com.sencha.gxt.widget.core.client.container.VerticalLayoutContainer; import com.sencha.gxt.widget.core.client.container.VerticalLayoutContainer.VerticalLayoutData; import com.sencha.gxt.widget.core.client.event.SelectEvent; +import com.sencha.gxt.widget.core.client.event.TriggerClickEvent; import com.sencha.gxt.widget.core.client.event.SelectEvent.SelectHandler; +import com.sencha.gxt.widget.core.client.event.TriggerClickEvent.TriggerClickHandler; import com.sencha.gxt.widget.core.client.form.ComboBox; import com.sencha.gxt.widget.core.client.form.FieldLabel; import com.sencha.gxt.widget.core.client.form.TextField; @@ -195,15 +199,31 @@ public class TargetColumnsSelectionPanel extends FramedPanel implements // comboDefColumn ExtractCodelistDefColumnPropertiesCombo props = GWT .create(ExtractCodelistDefColumnPropertiesCombo.class); - ListStore storeComboDefColumn = new ListStore( + ListStore storeComboDefColumn = new ListStore( props.id()); - + - final ComboBox comboDefColumn = new ComboBox( + final ComboBox comboDefColumn = new ComboBox( storeComboDefColumn, props.label()); - Log.debug("ComboDefColumn created"); + + comboDefColumn.addTriggerClickHandler(new TriggerClickHandler() { + @Override + public void onTriggerClick(TriggerClickEvent event) { + Log.debug("ComboDefColumn TriggerClickEvent"); + comboDefColumn.collapse(); + + /*DimensionRowSelectionDialog dialogDimensionRowSelection = new DimensionRowSelectionDialog( + col, cellData, eventBus); + dialogDimensionRowSelection.addListener(listener); + dialogDimensionRowSelection.show();*/ + + } + + }); + + comboDefColumn.setEmptyText("Select a Column..."); comboDefColumn.setWidth(COMBOWIDTH); comboDefColumn.setEditable(false);