Minor Update

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-column-widget@90502 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Giancarlo Panichi 2014-01-24 15:46:47 +00:00
parent cf1f9b2083
commit 2ea51304f5
4 changed files with 42 additions and 81 deletions

View File

@ -11,7 +11,6 @@ import org.gcube.portlets.user.td.columnwidget.client.store.ColumnTypeCodeElemen
import org.gcube.portlets.user.td.columnwidget.client.store.ColumnTypeCodeStore;
import org.gcube.portlets.user.td.gwtservice.client.rpc.TDGWTServiceAsync;
import org.gcube.portlets.user.td.gwtservice.shared.tr.ColumnData;
import org.gcube.portlets.user.td.widgetcommonevent.shared.TRId;
import org.gcube.portlets.user.td.widgetcommonevent.shared.tr.column.ColumnDataType;
import org.gcube.portlets.user.td.widgetcommonevent.shared.tr.column.ColumnTypeCode;
@ -35,7 +34,6 @@ import com.sencha.gxt.data.shared.loader.ListLoadResult;
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.ContentPanel;
import com.sencha.gxt.widget.core.client.FramedPanel;
import com.sencha.gxt.widget.core.client.button.TextButton;
import com.sencha.gxt.widget.core.client.container.VerticalLayoutContainer;
@ -68,11 +66,6 @@ public class ChangeColumnTypePanel extends FramedPanel {
this.trId = trId;
this.columnName = columnName;
VerticalLayoutContainer basicLayout = new VerticalLayoutContainer();
ContentPanel panel = new ContentPanel();
panel.setHeaderVisible(false);
ColumnDataProperties propsColumnData = GWT
.create(ColumnDataProperties.class);
ListStore<ColumnData> storeCombo = new ListStore<ColumnData>(
@ -155,11 +148,6 @@ public class ChangeColumnTypePanel extends FramedPanel {
comboMeasureTypeLabel=new FieldLabel(comboMeasureType, "Measure Type");
comboMeasureTypeLabel.setVisible(false);
FramedPanel form = new FramedPanel();
form.setHeaderVisible(false);
// form.setWidth(350);
form.setBodyStyle("background: none;");
labelColumn = new TextField();
VerticalLayoutContainer v = new VerticalLayoutContainer();
@ -173,13 +161,8 @@ public class ChangeColumnTypePanel extends FramedPanel {
new VerticalLayoutData(1, -1));
form.add(v);
form.addButton(new TextButton("Change"));
panel.add(form);
basicLayout.add(panel, new VerticalLayoutData(-1, -1, new Margins()));
add(basicLayout);
add(v, new VerticalLayoutData(-1, -1, new Margins()));
addButton(new TextButton("Change"));
}
private <T> void addHandlersForEventObservation(ComboBox<T> combo,

View File

@ -2,7 +2,6 @@ package org.gcube.portlets.user.td.columnwidget.client;
import java.util.ArrayList;
import org.gcube.portlets.user.td.columnwidget.client.properties.ColumnDataProperties;
import org.gcube.portlets.user.td.gwtservice.client.rpc.TDGWTServiceAsync;
import org.gcube.portlets.user.td.gwtservice.shared.tr.ColumnData;
@ -27,7 +26,6 @@ import com.sencha.gxt.data.shared.loader.ListLoadResult;
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.ContentPanel;
import com.sencha.gxt.widget.core.client.FramedPanel;
import com.sencha.gxt.widget.core.client.Window;
import com.sencha.gxt.widget.core.client.box.AlertMessageBox;
@ -42,6 +40,8 @@ import com.sencha.gxt.widget.core.client.form.TextField;
import com.sencha.gxt.widget.core.client.info.Info;
public class ChangeLabelColumnDialog extends Window {
protected int WIDTH=400;
protected int HEIGHT=140;
protected TRId trId;
protected TextField label = null;
protected String columnName = null;
@ -59,21 +59,16 @@ public class ChangeLabelColumnDialog extends Window {
protected void create(TRId trId, String columnName) {
this.trId = trId;
this.columnName = columnName;
setWidth(400);
setHeight(140);
setWidth(WIDTH);
setHeight(HEIGHT);
setBodyBorder(false);
setResizable(false);
setHeadingText("Change Column Label");
// getHeader().setIcon(Resources.IMAGES.side_list());
VerticalLayoutContainer basicLayout = new VerticalLayoutContainer();
ContentPanel panel = new ContentPanel();
FramedPanel panel=new FramedPanel();
panel.setHeaderVisible(false);
FramedPanel form = new FramedPanel();
form.setHeaderVisible(false);
form.setBodyBorder(false);
panel.setBodyBorder(false);
VerticalLayoutContainer v = new VerticalLayoutContainer();
@ -124,13 +119,11 @@ public class ChangeLabelColumnDialog extends Window {
v.add(new FieldLabel(label, "Column Label"), new VerticalLayoutData(1,
-1, new Margins(1)));
form.add(v);
form.addButton(new TextButton("Change"));
panel.add(form);
basicLayout.add(panel, new VerticalLayoutData(-1, -1, new Margins()));
panel.add(v);
panel.addButton(new TextButton("Change"));
add(basicLayout);
add(panel);
}

View File

@ -16,9 +16,7 @@ import com.google.gwt.event.logical.shared.SelectionHandler;
import com.google.gwt.event.logical.shared.ValueChangeEvent;
import com.google.gwt.event.logical.shared.ValueChangeHandler;
import com.google.gwt.user.client.rpc.AsyncCallback;
import com.sencha.gxt.cell.core.client.form.ComboBoxCell.TriggerAction;
import com.sencha.gxt.core.client.util.Margins;
import com.sencha.gxt.data.client.loader.RpcProxy;
import com.sencha.gxt.data.shared.LabelProvider;
import com.sencha.gxt.data.shared.ListStore;
@ -27,7 +25,6 @@ import com.sencha.gxt.data.shared.loader.ListLoadResult;
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.ContentPanel;
import com.sencha.gxt.widget.core.client.FramedPanel;
import com.sencha.gxt.widget.core.client.Window;
import com.sencha.gxt.widget.core.client.button.TextButton;
@ -39,6 +36,8 @@ import com.sencha.gxt.widget.core.client.info.Info;
public class ChangeToAnnotationColumnDialog extends Window {
protected int WIDTH=400;
protected int HEIGHT=120;
protected TRId trId;
protected ComboBox<ColumnData> combo=null;
protected String columnName=null;
@ -57,15 +56,15 @@ public class ChangeToAnnotationColumnDialog extends Window {
setBodyBorder(false);
// getHeader().setIcon(Resources.IMAGES.side_list());
setHeadingText("Change To Annotation Column");
setWidth(400);
setHeight(120);
setWidth(WIDTH);
setHeight(HEIGHT);
setResizable(false);
VerticalLayoutContainer basicLayout = new VerticalLayoutContainer();
ContentPanel panel = new ContentPanel();
FramedPanel panel=new FramedPanel();
panel.setHeaderVisible(false);
//panel.setBodyStyle("margin: 0px;");
panel.setBodyBorder(false);
VerticalLayoutContainer v = new VerticalLayoutContainer();
ColumnDataProperties props = GWT.create(ColumnDataProperties.class);
ListStore<ColumnData> store = new ListStore<ColumnData>(props.id());
@ -105,20 +104,12 @@ public class ChangeToAnnotationColumnDialog extends Window {
combo.setTriggerAction(TriggerAction.ALL);
combo.setLoader(loader);
FramedPanel form = new FramedPanel();
form.setHeaderVisible(false);
//form.setWidth(350);
form.setBodyStyle("background: none;");
VerticalLayoutContainer v = new VerticalLayoutContainer();
v.add(new FieldLabel(combo, "Column"), new VerticalLayoutData(1, -1));
form.add(v);
form.addButton(new TextButton("Change"));
panel.add(v);
panel.addButton(new TextButton("Change"));
panel.add(form);
basicLayout.add(panel, new VerticalLayoutData(-1, -1, new Margins()));
add(basicLayout);
add(panel);
}

View File

@ -16,9 +16,7 @@ import com.google.gwt.event.logical.shared.SelectionHandler;
import com.google.gwt.event.logical.shared.ValueChangeEvent;
import com.google.gwt.event.logical.shared.ValueChangeHandler;
import com.google.gwt.user.client.rpc.AsyncCallback;
import com.sencha.gxt.widget.core.client.button.TextButton;
import com.sencha.gxt.cell.core.client.form.ComboBoxCell.TriggerAction;
import com.sencha.gxt.core.client.util.Margins;
import com.sencha.gxt.data.client.loader.RpcProxy;
import com.sencha.gxt.data.shared.LabelProvider;
import com.sencha.gxt.data.shared.ListStore;
@ -27,9 +25,9 @@ import com.sencha.gxt.data.shared.loader.ListLoadResult;
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.ContentPanel;
import com.sencha.gxt.widget.core.client.FramedPanel;
import com.sencha.gxt.widget.core.client.Window;
import com.sencha.gxt.widget.core.client.button.TextButton;
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.form.ComboBox;
@ -37,6 +35,8 @@ import com.sencha.gxt.widget.core.client.form.FieldLabel;
import com.sencha.gxt.widget.core.client.info.Info;
public class RemoveColumnDialog extends Window {
protected int WIDTH=400;
protected int HEIGHT=120;
protected TRId trId;
protected ComboBox<ColumnData> combo = null;
protected String columnName = null;
@ -55,15 +55,15 @@ public class RemoveColumnDialog extends Window {
setBodyBorder(false);
// getHeader().setIcon(Resources.IMAGES.side_list());
setHeadingText("Remove Column");
setWidth(400);
setHeight(120);
setWidth(WIDTH);
setHeight(HEIGHT);
setResizable(false);
VerticalLayoutContainer basicLayout = new VerticalLayoutContainer();
ContentPanel panel = new ContentPanel();
FramedPanel panel=new FramedPanel();
panel.setHeaderVisible(false);
// panel.setBodyStyle("margin: 0px;");
panel.setBodyBorder(false);
VerticalLayoutContainer v = new VerticalLayoutContainer();
ColumnDataProperties props = GWT.create(ColumnDataProperties.class);
ListStore<ColumnData> store = new ListStore<ColumnData>(props.id());
@ -104,19 +104,13 @@ public class RemoveColumnDialog extends Window {
combo.setTriggerAction(TriggerAction.ALL);
combo.setLoader(loader);
FramedPanel form = new FramedPanel();
form.setHeaderVisible(false);
// form.setWidth(350);
form.setBodyStyle("background: none;");
VerticalLayoutContainer v = new VerticalLayoutContainer();
v.add(new FieldLabel(combo, "Column"), new VerticalLayoutData(1, -1));
form.add(v);
form.addButton(new TextButton("Remove"));
panel.add(form);
basicLayout.add(panel, new VerticalLayoutData(-1, -1, new Margins()));
add(basicLayout);
panel.add(v);
panel.addButton(new TextButton("Remove"));
add(panel);
}