From 169b7745b6d94a1d63dfeab4c18d2f9b5fc850e6 Mon Sep 17 00:00:00 2001 From: Giancarlo Panichi Date: Thu, 10 Apr 2014 13:15:33 +0000 Subject: [PATCH] Minor Update git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-table-widget@94701 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../validation/ValidationsTablePanel.java | 96 +++++++++---------- 1 file changed, 44 insertions(+), 52 deletions(-) diff --git a/src/main/java/org/gcube/portlets/user/td/tablewidget/client/validation/ValidationsTablePanel.java b/src/main/java/org/gcube/portlets/user/td/tablewidget/client/validation/ValidationsTablePanel.java index 84285e0..48aa9fe 100644 --- a/src/main/java/org/gcube/portlets/user/td/tablewidget/client/validation/ValidationsTablePanel.java +++ b/src/main/java/org/gcube/portlets/user/td/tablewidget/client/validation/ValidationsTablePanel.java @@ -33,7 +33,6 @@ import com.sencha.gxt.widget.core.client.FramedPanel; 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; -import com.sencha.gxt.widget.core.client.form.FieldLabel; import com.sencha.gxt.widget.core.client.grid.ColumnConfig; import com.sencha.gxt.widget.core.client.grid.ColumnModel; import com.sencha.gxt.widget.core.client.grid.Grid; @@ -57,7 +56,7 @@ public class ValidationsTablePanel extends FramedPanel { protected ComboBox comboValidations; protected ListStore storeValidations; protected ListLoader> loader; - protected Grid grid; + protected Grid grid; public ValidationsTablePanel(TRId trId, EventBus eventBus) { super(); @@ -75,44 +74,42 @@ public class ValidationsTablePanel extends FramedPanel { setBodyBorder(false); } - protected void create(){ - ValidationsProperties props = GWT - .create(ValidationsProperties.class); - + protected void create() { + ValidationsProperties props = GWT.create(ValidationsProperties.class); ColumnConfig descriptionCol = new ColumnConfig( props.description(), 168, "Description"); ColumnConfig validCol = new ColumnConfig( props.valid(), 32, "Valid"); - validCol.setCell(new AbstractCell(){ + validCol.setCell(new AbstractCell() { @Override public void render(Context context, Boolean value, SafeHtmlBuilder sb) { - - if(value){ - sb.appendHtmlConstant("true"); - + + if (value) { + sb.appendHtmlConstant("true"); + } else { - sb.appendHtmlConstant("true"); - + sb.appendHtmlConstant("true"); + } - + } }); - - - + List> l = new ArrayList>(); l.add(descriptionCol); l.add(validCol); - + ColumnModel cm = new ColumnModel(l); storeValidations = new ListStore(props.id()); - - RpcProxy> proxy = new RpcProxy>() { public void load(ListLoadConfig loadConfig, @@ -120,9 +117,8 @@ public class ValidationsTablePanel extends FramedPanel { loadData(loadConfig, callback); } - }; - + loader = new ListLoader>( proxy); @@ -130,10 +126,7 @@ public class ValidationsTablePanel extends FramedPanel { loader.addLoadHandler(new LoadResultListStoreBinding>( storeValidations) { }); - - - - + grid = new Grid(storeValidations, cm) { @Override protected void onAfterFirstAttach() { @@ -157,56 +150,55 @@ public class ValidationsTablePanel extends FramedPanel { grid.setColumnReordering(true); grid.setColumnResize(true); grid.getView().setAutoExpandColumn(descriptionCol); - - //FieldLabel validationsLabel = new FieldLabel(null, "Validations"); - //validationsLabel.getElement().applyStyles("font-weight:bold"); - + grid.getView().setEmptyText("No validations"); + + // FieldLabel validationsLabel = new FieldLabel(null, "Validations"); + // validationsLabel.getElement().applyStyles("font-weight:bold"); + VerticalLayoutContainer v = new VerticalLayoutContainer(); v.setScrollMode(ScrollMode.AUTO); - //v.add(validationsLabel, new VerticalLayoutData(-1, -1, new Margins(2,1,5,1))); + // v.add(validationsLabel, new VerticalLayoutData(-1, -1, new + // Margins(2,1,5,1))); v.add(grid, new VerticalLayoutData(1, -1, new Margins(0))); add(v); - + } - - + protected void loadData(ListLoadConfig loadConfig, final AsyncCallback> callback) { - TDGWTServiceAsync.INSTANCE.getTableValidationsMetadata(trId, + TDGWTServiceAsync.INSTANCE.getTableValidationsMetadata(trId, new AsyncCallback() { public void onFailure(Throwable caught) { - Log.error("load validations metadata failure:" + Log.error("Load validations metadata failure: " + caught.getLocalizedMessage()); - UtilsGXT3.alert("Error retrieving validations metadata", + UtilsGXT3.alert( + "Error retrieving validations metadata", "Error retrieving validations metadata"); callback.onFailure(caught); } public void onSuccess(TabValidationsMetadata result) { - Log.trace("loaded " + result.getId()); - if(result.getValidations()!=null){ - callback.onSuccess(new ListLoadResultBean( - result.getValidations())); - } else { - Log.error("load validations metadata failure: null"); - UtilsGXT3.alert("Error retrieving validations metadata", - "Error retrieving validations metadata"); - callback.onFailure(new Exception("Error retrieving validations metadata")); - } - + Log.debug("loaded " + result.getId()); + if (result.getValidations() != null) { + Log.debug("Validations Retrieved: " + + result.getValidations().size()); + callback.onSuccess(new ListLoadResultBean( + result.getValidations())); + } else { + Log.debug("No validations"); + ArrayList empty=new ArrayList(); + callback.onSuccess(new ListLoadResultBean( + empty)); + } } }); } - - - - public void update(TRId trId) { this.trId = trId; loader.load();