diff --git a/src/main/java/org/gcube/portlets/user/td/unionwizardwidget/client/ColumnMappingCard.java b/src/main/java/org/gcube/portlets/user/td/unionwizardwidget/client/ColumnMappingCard.java index fad4164..d4e2908 100644 --- a/src/main/java/org/gcube/portlets/user/td/unionwizardwidget/client/ColumnMappingCard.java +++ b/src/main/java/org/gcube/portlets/user/td/unionwizardwidget/client/ColumnMappingCard.java @@ -17,7 +17,7 @@ public class ColumnMappingCard extends WizardCard { this.unionSession = unionSession; thisCard = this; - columnMappingPanel = new ColumnMappingPanel(thisCard,unionSession,res); + columnMappingPanel = new ColumnMappingPanel(thisCard,res); /* columnMappingPanel diff --git a/src/main/java/org/gcube/portlets/user/td/unionwizardwidget/client/ColumnMappingPanel.java b/src/main/java/org/gcube/portlets/user/td/unionwizardwidget/client/ColumnMappingPanel.java index b2bcffa..c93d8c0 100644 --- a/src/main/java/org/gcube/portlets/user/td/unionwizardwidget/client/ColumnMappingPanel.java +++ b/src/main/java/org/gcube/portlets/user/td/unionwizardwidget/client/ColumnMappingPanel.java @@ -5,42 +5,35 @@ import java.util.ArrayList; 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.tr.ColumnData; -import org.gcube.portlets.user.td.gwtservice.shared.tr.TabResource; import org.gcube.portlets.user.td.unionwizardwidget.client.utils.UtilsGXT3; import org.gcube.portlets.user.td.widgetcommonevent.client.event.SessionExpiredEvent; import org.gcube.portlets.user.td.widgetcommonevent.client.type.SessionExpiredType; import org.gcube.portlets.user.td.widgetcommonevent.shared.TRId; -import org.gcube.portlets.user.td.wizardwidget.client.WizardCard; import org.gcube.portlets.user.td.wizardwidget.client.dataresource.ResourceBundle; import com.allen_sauer.gwt.log.client.Log; import com.google.gwt.user.client.rpc.AsyncCallback; -import com.sencha.gxt.cell.core.client.ButtonCell.IconAlign; import com.sencha.gxt.core.client.dom.ScrollSupport.ScrollMode; import com.sencha.gxt.core.client.util.Margins; import com.sencha.gxt.widget.core.client.ContentPanel; import com.sencha.gxt.widget.core.client.Resizable; import com.sencha.gxt.widget.core.client.Resizable.Dir; -import com.sencha.gxt.widget.core.client.button.TextButton; -import com.sencha.gxt.widget.core.client.container.HBoxLayoutContainer; 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.BoxLayoutContainer.BoxLayoutData; -import com.sencha.gxt.widget.core.client.container.BoxLayoutContainer.BoxLayoutPack; -import com.sencha.gxt.widget.core.client.container.HBoxLayoutContainer.HBoxLayoutAlign; 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.SelectEvent.SelectHandler; import com.sencha.gxt.widget.core.client.form.FieldLabel; public class ColumnMappingPanel extends ContentPanel { + protected ResourceBundle res; - private ColumnMappingCard parent; - - public ColumnMappingPanel(ColumnMappingCard parent,ResourceBundle res) { + protected ColumnMappingCard parent; + protected VerticalLayoutContainer vert; + + public ColumnMappingPanel(ColumnMappingCard parent, ResourceBundle res) { this.res = res; this.parent = parent; + Log.debug("ColumnMappingPanel"); init(); retrieveColumns(); @@ -53,19 +46,17 @@ public class ColumnMappingPanel extends ContentPanel { } protected void create() { - /* - itemIdSourceValueArg = "SourceArg" + selectedColumn.getName(); - itemIdTargetValueArg = "TargetArg" + selectedColumn.getName(); + + //itemIdSourceValueArg = "SourceArg" + selectedColumn.getName(); + //itemIdTargetValueArg = "TargetArg" + selectedColumn.getName(); SimpleContainer container = new SimpleContainer(); - container.setHeight(CONTAINERHEIGHT); - container.setWidth(CONTAINERWIDTH); - + vert = new VerticalLayoutContainer(); vert.setScrollMode(ScrollMode.AUTO); vert.setAdjustForScroll(true); - setColumnMappingData(); + //setColumnMappingData(); container.add(vert); container.forceLayout(); @@ -79,7 +70,7 @@ public class ColumnMappingPanel extends ContentPanel { add(vPanel); forceLayout(); - */ + } private void retrieveColumns() {