From 9b27946ab086b05169af1b5cb31c1468cb16fb21 Mon Sep 17 00:00:00 2001 From: Giancarlo Panichi Date: Tue, 3 Mar 2015 11:44:26 +0000 Subject: [PATCH] Minor Update git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-column-widget@112315 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../client/DeleteColumnDialog.java | 14 +++------- .../client/DeleteColumnPanel.java | 27 +++++++++---------- .../client/LabelColumnDialog.java | 15 +++-------- 3 files changed, 18 insertions(+), 38 deletions(-) diff --git a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/DeleteColumnDialog.java b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/DeleteColumnDialog.java index 50b0ad1..fbd31a3 100644 --- a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/DeleteColumnDialog.java +++ b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/DeleteColumnDialog.java @@ -1,13 +1,11 @@ package org.gcube.portlets.user.td.columnwidget.client; -import org.gcube.portlets.user.td.gwtservice.shared.tr.ColumnData; import org.gcube.portlets.user.td.widgetcommonevent.shared.TRId; import com.google.web.bindery.event.shared.EventBus; import com.sencha.gxt.widget.core.client.Window; 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.ComboBox; /** * Delete Column Dialog @@ -17,12 +15,8 @@ import com.sencha.gxt.widget.core.client.form.ComboBox; * */ public class DeleteColumnDialog extends Window { - protected int WIDTH=400; - protected int HEIGHT=120; - protected TRId trId; - protected ComboBox combo = null; - protected String columnName = null; - protected EventBus eventBus; + private static final int WIDTH=400; + private static final int HEIGHT=120; public DeleteColumnDialog(TRId trId, EventBus eventBus) { create(trId, null, eventBus); @@ -33,9 +27,7 @@ public class DeleteColumnDialog extends Window { } protected void create(TRId trId, String columnName, EventBus eventBus) { - this.trId = trId; - this.columnName = columnName; - this.eventBus=eventBus; + initWindow(); DeleteColumnPanel deleteColumnPanel= new DeleteColumnPanel(trId, columnName, eventBus); diff --git a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/DeleteColumnPanel.java b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/DeleteColumnPanel.java index 2f9c4eb..ef38c07 100644 --- a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/DeleteColumnPanel.java +++ b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/DeleteColumnPanel.java @@ -52,7 +52,6 @@ import com.sencha.gxt.widget.core.client.container.VerticalLayoutContainer.Verti 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; -import com.sencha.gxt.widget.core.client.form.TextField; import com.sencha.gxt.widget.core.client.grid.CheckBoxSelectionModel; import com.sencha.gxt.widget.core.client.grid.ColumnConfig; import com.sencha.gxt.widget.core.client.grid.ColumnModel; @@ -69,23 +68,21 @@ import com.sencha.gxt.widget.core.client.grid.Grid; */ public class DeleteColumnPanel extends FramedPanel implements MonitorDialogListener { - protected String WIDTH = "640px"; - protected String HEIGHT = "520px"; - protected EventBus eventBus; - protected DeleteColumnDialog parent; - protected TextField label = null; - protected TRId trId; - protected String columnName; - protected ColumnData column; + private static final String WIDTH = "640px"; + private static final String HEIGHT = "520px"; + private EventBus eventBus; + private DeleteColumnDialog parent; + private TRId trId; + private String columnName; - protected TextButton delete; - protected ListLoader> loader; - protected Grid grid; - protected CheckBoxSelectionModel sm; - protected FieldLabel columnsSelectLabel; + private TextButton delete; - protected DeleteColumnSession deleteColumnSession; + private ListLoader> loader; + private Grid grid; + private CheckBoxSelectionModel sm; + + private DeleteColumnSession deleteColumnSession; private ListStore store; diff --git a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/LabelColumnDialog.java b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/LabelColumnDialog.java index fd1f7db..202b223 100644 --- a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/LabelColumnDialog.java +++ b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/LabelColumnDialog.java @@ -1,13 +1,11 @@ package org.gcube.portlets.user.td.columnwidget.client; -import org.gcube.portlets.user.td.gwtservice.shared.tr.ColumnData; import org.gcube.portlets.user.td.widgetcommonevent.shared.TRId; import com.google.web.bindery.event.shared.EventBus; import com.sencha.gxt.widget.core.client.Window; 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.ComboBox; /** * Delete Column Dialog @@ -17,12 +15,9 @@ import com.sencha.gxt.widget.core.client.form.ComboBox; * */ public class LabelColumnDialog extends Window { - protected int WIDTH=400; - protected int HEIGHT=120; - protected TRId trId; - protected ComboBox combo = null; - protected String columnName = null; - protected EventBus eventBus; + private static final int WIDTH=400; + private static final int HEIGHT=120; + public LabelColumnDialog(TRId trId, EventBus eventBus) { create(trId, null, eventBus); @@ -33,9 +28,6 @@ public class LabelColumnDialog extends Window { } protected void create(TRId trId, String columnName, EventBus eventBus) { - this.trId = trId; - this.columnName = columnName; - this.eventBus=eventBus; initWindow(); LabelColumnPanel labelColumnPanel= new LabelColumnPanel(trId, columnName, eventBus); @@ -48,7 +40,6 @@ public class LabelColumnDialog extends Window { setBodyBorder(false); setResizable(false); setHeadingText("Label Columns"); - //getHeader().setIcon(Resources.IMAGES.side_list()); }