From 208b7b089f3f88836a7b93490b4a8f905f10c1a8 Mon Sep 17 00:00:00 2001 From: Giancarlo Panichi Date: Mon, 22 Jun 2015 15:23:56 +0000 Subject: [PATCH] Removed Validations git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-information-widget@115467 82a268e6-3cf1-43bd-a215-b396298e98cf --- pom.xml | 3 ++- .../client/TabularResourceProperties.java | 21 +++++++++++-------- .../td/informationwidget/Information.gwt.xml | 3 +-- 3 files changed, 15 insertions(+), 12 deletions(-) diff --git a/pom.xml b/pom.xml index 825fd2e..daddcd3 100644 --- a/pom.xml +++ b/pom.xml @@ -129,12 +129,13 @@ provided - + diff --git a/src/main/java/org/gcube/portlets/user/td/informationwidget/client/TabularResourceProperties.java b/src/main/java/org/gcube/portlets/user/td/informationwidget/client/TabularResourceProperties.java index 2455e8c..edacedd 100644 --- a/src/main/java/org/gcube/portlets/user/td/informationwidget/client/TabularResourceProperties.java +++ b/src/main/java/org/gcube/portlets/user/td/informationwidget/client/TabularResourceProperties.java @@ -19,11 +19,9 @@ import org.gcube.portlets.user.td.informationwidget.client.util.UtilsGXT3; import org.gcube.portlets.user.td.widgetcommonevent.client.event.DataViewRequestEvent; import org.gcube.portlets.user.td.widgetcommonevent.client.event.RibbonEvent; import org.gcube.portlets.user.td.widgetcommonevent.client.event.SessionExpiredEvent; -import org.gcube.portlets.user.td.widgetcommonevent.client.event.WidgetRequestEvent; import org.gcube.portlets.user.td.widgetcommonevent.client.type.DataViewRequestType; import org.gcube.portlets.user.td.widgetcommonevent.client.type.RibbonType; import org.gcube.portlets.user.td.widgetcommonevent.client.type.SessionExpiredType; -import org.gcube.portlets.user.td.widgetcommonevent.client.type.WidgetRequestType; import org.gcube.portlets.user.td.widgetcommonevent.shared.TRId; import org.gcube.portlets.user.td.widgetcommonevent.shared.dataview.TabularResourceDataView; @@ -96,7 +94,7 @@ public class TabularResourceProperties extends FramedPanel { private VerticalLayoutContainer layoutTabularResource; private TextButton saveButton; - private TextButton validationsButton; + //private TextButton validationsButton; //private TextButton resourcesButton; private ArrayList licencesList; @@ -275,7 +273,7 @@ public class TabularResourceProperties extends FramedPanel { saveButton.addSelectHandler(saveHandler); // Validation Button - validationsButton = new TextButton(msgs.validationsButton()); + /*validationsButton = new TextButton(msgs.validationsButton()); validationsButton.setIcon(ResourceBundle.INSTANCE.tableValidation()); validationsButton.setIconAlign(IconAlign.RIGHT); validationsButton.setToolTip(msgs.validationsButtonToolTip()); @@ -288,7 +286,9 @@ public class TabularResourceProperties extends FramedPanel { } }; validationsButton.addSelectHandler(validationsHandler); - + */ + + // Resources Button /*resourcesButton = new TextButton(msgs.resourcesButton()); resourcesButton.setIcon(ResourceBundle.INSTANCE.resources()); @@ -306,9 +306,9 @@ public class TabularResourceProperties extends FramedPanel { // HBoxLayoutContainer hBox = new HBoxLayoutContainer(); - hBox.setPack(BoxLayoutPack.CENTER); + hBox.setPack(BoxLayoutPack.START); hBox.add(saveButton, new BoxLayoutData(new Margins(2, 5, 2, 5))); - hBox.add(validationsButton, new BoxLayoutData(new Margins(2, 5, 2, 5))); + //hBox.add(validationsButton, new BoxLayoutData(new Margins(2, 5, 2, 5))); //hBox.add(resourcesButton, new BoxLayoutData(new Margins(2, 5, 2, 5))); layoutTabularResource.add(hBox, new VerticalLayoutData(1, -1, @@ -465,7 +465,8 @@ public class TabularResourceProperties extends FramedPanel { vl.add(tableFieldSet); }*/ - + + /* protected void openValidations() { Log.debug("Request Validations Tab"); if (trId != null) { @@ -477,6 +478,7 @@ public class TabularResourceProperties extends FramedPanel { Log.error("TRId is null"); } } + */ /* protected void openResources() { @@ -495,6 +497,7 @@ public class TabularResourceProperties extends FramedPanel { protected void updateTable(TableData tableData) { trId = tableData.getTrId(); + Log.debug("New :"+trId); forceLayout(); } @@ -505,7 +508,7 @@ public class TabularResourceProperties extends FramedPanel { public void onSuccess(TabResource result) { Log.info("Retrived TR: " + result.getTrId()); updateTabularResource(result); - getLastTable(tabResource.getTrId()); + getLastTable(result.getTrId()); } public void onFailure(Throwable caught) { diff --git a/src/main/resources/org/gcube/portlets/user/td/informationwidget/Information.gwt.xml b/src/main/resources/org/gcube/portlets/user/td/informationwidget/Information.gwt.xml index cbe8f55..409fb4a 100644 --- a/src/main/resources/org/gcube/portlets/user/td/informationwidget/Information.gwt.xml +++ b/src/main/resources/org/gcube/portlets/user/td/informationwidget/Information.gwt.xml @@ -13,10 +13,9 @@ - - +