From ca7f76b5e667e6c1de399101d2568abd2735de3f Mon Sep 17 00:00:00 2001 From: Giancarlo Panichi Date: Fri, 24 Jan 2014 10:45:51 +0000 Subject: [PATCH] Minor Update git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-column-widget@90470 82a268e6-3cf1-43bd-a215-b396298e98cf --- .gwt/.gwt-log | 32 +++++++ .settings/org.eclipse.wst.common.component | 6 ++ .../client/ChangeColumnTypePanel.java | 87 ++++++++++--------- .../client/ChangeLabelColumnDialog.java | 1 + .../ChangeToAnnotationColumnDialog.java | 1 + .../client/RemoveColumnDialog.java | 1 + .../ColumnDataProperties.java | 2 +- .../properties/ColumnTypeCodeProperties.java | 20 +++++ 8 files changed, 109 insertions(+), 41 deletions(-) rename src/main/java/org/gcube/portlets/user/td/columnwidget/client/{ => properties}/ColumnDataProperties.java (89%) create mode 100644 src/main/java/org/gcube/portlets/user/td/columnwidget/client/properties/ColumnTypeCodeProperties.java diff --git a/.gwt/.gwt-log b/.gwt/.gwt-log index bb7afba..a91de44 100644 --- a/.gwt/.gwt-log +++ b/.gwt/.gwt-log @@ -158,3 +158,35 @@ Compiling... Compilation completed in 0.00 seconds Removing invalidated units Finding entry point classes +Public resources found in... +Translatable source found in... +Found 0 cached/archived units. Used 0 / 2719 units from cache. +Compiling... + 60% complete (ETR: 2 seconds) + 60% complete (ETR: 2 seconds) + 60% complete (ETR: 2 seconds) + 60% complete (ETR: 2 seconds) + 60% complete (ETR: 2 seconds) + 60% complete (ETR: 2 seconds) + 60% complete (ETR: 2 seconds) + 70% complete (ETR: 2 seconds) + 80% complete (ETR: 1 seconds) + 90% complete (ETR: 1 seconds) + 100% complete (ETR: 0 seconds) + Compilation completed in 10.68 seconds +Removing invalidated units +Finding entry point classes +Public resources found in... +Translatable source found in... +Found 2719 cached/archived units. Used 2719 / 2719 units from cache. +Compiling... + Compilation completed in 0.00 seconds +Removing invalidated units +Finding entry point classes +Public resources found in... +Translatable source found in... +Found 2719 cached/archived units. Used 2719 / 2719 units from cache. +Compiling... + Compilation completed in 0.00 seconds +Removing invalidated units +Finding entry point classes diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component index 5030e3e..a8e7681 100644 --- a/.settings/org.eclipse.wst.common.component +++ b/.settings/org.eclipse.wst.common.component @@ -4,6 +4,12 @@ + + uses + + + uses + 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 1bf362b..75d630c 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 @@ -2,9 +2,11 @@ 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; import org.gcube.portlets.user.td.widgetcommonevent.shared.TRId; +import org.gcube.portlets.user.td.widgetcommonevent.shared.tr.column.ColumnTypeCode; import com.allen_sauer.gwt.log.client.Log; import com.google.gwt.core.client.GWT; @@ -38,13 +40,15 @@ import com.sencha.gxt.widget.core.client.info.Info; public class ChangeColumnTypePanel extends FramedPanel { protected String WIDTH = "640px"; protected String HEIGHT = "520px"; - + protected ChangeColumnTypeDialog parent; - protected TextField label=null; + protected TextField label = null; protected TRId trId; protected String columnName; protected ColumnData column; - protected ComboBox combo=null; + protected ComboBox comboColumn = null; + protected ComboBox comboTypeColumn = null; + public ChangeColumnTypePanel(TRId trId, String columnName){ @@ -76,9 +80,8 @@ public class ChangeColumnTypePanel extends FramedPanel { Log.trace("Loader created"); - combo = new ComboBox(store, - props.label()){ - @Override + comboColumn = new ComboBox(store, props.label()){ + protected void onAfterFirstAttach() { super.onAfterFirstAttach(); Scheduler.get().scheduleDeferred(new ScheduledCommand() { @@ -90,21 +93,28 @@ public class ChangeColumnTypePanel extends FramedPanel { }; Log.trace("Combo created"); - addHandlersForEventObservation(combo, props.label()); + addHandlersForEventObservation(comboColumn, props.label()); - combo.setEmptyText("Select a column..."); - combo.setWidth(150); - combo.setTypeAhead(true); - combo.setTriggerAction(TriggerAction.ALL); - combo.setLoader(loader); + comboColumn.setEmptyText("Select a column..."); + comboColumn.setWidth(150); + comboColumn.setTypeAhead(true); + comboColumn.setTriggerAction(TriggerAction.ALL); + comboColumn.setLoader(loader); FramedPanel form = new FramedPanel(); form.setHeaderVisible(false); //form.setWidth(350); form.setBodyStyle("background: none;"); + TextField labelColumn=new TextField(); + + + + VerticalLayoutContainer v = new VerticalLayoutContainer(); - v.add(new FieldLabel(combo, "Column"), new VerticalLayoutData(1, -1)); + v.add(new FieldLabel(comboColumn, "Column"), new VerticalLayoutData(1, -1)); + v.add(new FieldLabel(labelColumn, "Label"), new VerticalLayoutData(1, -1)); + form.add(v); form.addButton(new TextButton("Change")); @@ -126,7 +136,7 @@ public class ChangeColumnTypePanel extends FramedPanel { + (event.getValue() == null ? "nothing" : labelProvider.getLabel(event .getValue()) + "!")); - + } }); combo.addSelectionHandler(new SelectionHandler() { @@ -140,37 +150,34 @@ public class ChangeColumnTypePanel extends FramedPanel { } }); } - - - - protected void loadData(ListLoadConfig loadConfig, final AsyncCallback> callback) { - TDGWTServiceAsync.INSTANCE.getColumns(trId, new AsyncCallback>(){ + TDGWTServiceAsync.INSTANCE.getColumns(trId, + new AsyncCallback>() { - public void onFailure(Throwable caught) { - Log.error("load combo failure:"+caught.getLocalizedMessage()); - callback.onFailure(caught); - } - - public void onSuccess(ArrayList result) { - Log.trace("loaded " + result.size() + " ColumnData"); - if(columnName!=null){ - for(ColumnData cd: result){ - if(cd.getName().compareTo(columnName)==0){ - combo.setValue(cd); - } + public void onFailure(Throwable caught) { + Log.error("load combo failure:" + + caught.getLocalizedMessage()); + callback.onFailure(caught); } - } - callback.onSuccess(new ListLoadResultBean( - result)); - - } - - }); - + + public void onSuccess(ArrayList result) { + Log.trace("loaded " + result.size() + " ColumnData"); + if (columnName != null) { + for (ColumnData cd : result) { + if (cd.getName().compareTo(columnName) == 0) { + comboColumn.setValue(cd); + } + } + } + callback.onSuccess(new ListLoadResultBean( + result)); + + } + + }); + } - } diff --git a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/ChangeLabelColumnDialog.java b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/ChangeLabelColumnDialog.java index 34acb1b..4f445e8 100644 --- a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/ChangeLabelColumnDialog.java +++ b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/ChangeLabelColumnDialog.java @@ -3,6 +3,7 @@ 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; import org.gcube.portlets.user.td.widgetcommonevent.shared.TRId; diff --git a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/ChangeToAnnotationColumnDialog.java b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/ChangeToAnnotationColumnDialog.java index 57e5e94..efdf506 100644 --- a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/ChangeToAnnotationColumnDialog.java +++ b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/ChangeToAnnotationColumnDialog.java @@ -2,6 +2,7 @@ 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; import org.gcube.portlets.user.td.widgetcommonevent.shared.TRId; diff --git a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/RemoveColumnDialog.java b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/RemoveColumnDialog.java index e45c5ce..3743ab7 100644 --- a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/RemoveColumnDialog.java +++ b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/RemoveColumnDialog.java @@ -2,6 +2,7 @@ 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; import org.gcube.portlets.user.td.widgetcommonevent.shared.TRId; diff --git a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/ColumnDataProperties.java b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/properties/ColumnDataProperties.java similarity index 89% rename from src/main/java/org/gcube/portlets/user/td/columnwidget/client/ColumnDataProperties.java rename to src/main/java/org/gcube/portlets/user/td/columnwidget/client/properties/ColumnDataProperties.java index 85a94df..1df2f7c 100644 --- a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/ColumnDataProperties.java +++ b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/properties/ColumnDataProperties.java @@ -1,4 +1,4 @@ -package org.gcube.portlets.user.td.columnwidget.client; +package org.gcube.portlets.user.td.columnwidget.client.properties; import org.gcube.portlets.user.td.gwtservice.shared.tr.ColumnData; diff --git a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/properties/ColumnTypeCodeProperties.java b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/properties/ColumnTypeCodeProperties.java new file mode 100644 index 0000000..b3329ad --- /dev/null +++ b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/properties/ColumnTypeCodeProperties.java @@ -0,0 +1,20 @@ +package org.gcube.portlets.user.td.columnwidget.client.properties; + + +import org.gcube.portlets.user.td.gwtservice.shared.tr.ColumnTypeCode; + +import com.google.gwt.editor.client.Editor.Path; +import com.sencha.gxt.data.shared.LabelProvider; +import com.sencha.gxt.data.shared.ModelKeyProvider; +import com.sencha.gxt.data.shared.PropertyAccess; + +public interface ColumnTypeCodeProperties extends + PropertyAccess { + + @Path("id") + ModelKeyProvider id(); + + LabelProvider label(); + + +}