From 48e635ad74dcebe700fbeef3adbfe26679cafb2d Mon Sep 17 00:00:00 2001 From: Giancarlo Panichi Date: Wed, 4 Dec 2013 13:32:36 +0000 Subject: [PATCH] Minor updated git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-portlet@86544 82a268e6-3cf1-43bd-a215-b396298e98cf --- pom.xml | 7 ++ .../user/td/client/TabularDataController.java | 67 +++++++++++-------- .../user/td/client/ribbon/FileToolBar.java | 2 +- .../user/td/tabulardataportlet.gwt.xml | 2 +- src/main/webapp/WEB-INF/web.xml | 4 +- 5 files changed, 50 insertions(+), 32 deletions(-) diff --git a/pom.xml b/pom.xml index b41e888..e72a88d 100644 --- a/pom.xml +++ b/pom.xml @@ -199,6 +199,13 @@ tabular-data-csv-export-widget [1.0.0-SNAPSHOT,2.0.0-SNAPSHOT) + + + + org.gcube.portlets.user + tabular-data-sdmx-export-widget + [1.0.0-SNAPSHOT,2.0.0-SNAPSHOT) + diff --git a/src/main/java/org/gcube/portlets/user/td/client/TabularDataController.java b/src/main/java/org/gcube/portlets/user/td/client/TabularDataController.java index d7f1852..809db78 100644 --- a/src/main/java/org/gcube/portlets/user/td/client/TabularDataController.java +++ b/src/main/java/org/gcube/portlets/user/td/client/TabularDataController.java @@ -3,6 +3,7 @@ */ package org.gcube.portlets.user.td.client; +import org.gcube.portlets.user.td.sdmxexportwidget.client.SDMXExportWizardTD; import org.gcube.portlets.user.td.sdmximportwidget.client.SDMXImportWizardTD; import org.gcube.portlets.user.td.wizardwidget.client.WizardListener; @@ -365,34 +366,44 @@ public class TabularDataController { } protected void openSDMXExportWizard() { - /* - * GWT.runAsync(new RunAsyncCallback() { - * - * @Override public void onSuccess() { SDMXExportWizardTD exportWizard = - * new SDMXExportWizardTD( "SDMX Export"); - * - * exportWizard .addListener(new - * org.gcube.portlets.user.sdmxexportwizardtd - * .client.general.WizardListener() { - * - * @Override public void failed(Throwable throwable, String reason, - * String details) { - * - * } - * - * @Override public void completed(TRId id) { - * - * } - * - * @Override public void aborted() { - * - * } }); - * - * exportWizard.show(); } - * - * @Override public void onFailure(Throwable reason) { - * asyncCodeLoadingFailed(reason); } }); - */ + GWT.runAsync(new RunAsyncCallback() { + + @Override + public void onSuccess() { + openWizard(); + SDMXExportWizardTD exportWizard = new SDMXExportWizardTD( + "SDMX Export"); + + exportWizard.addListener(new WizardListener() { + @Override + public void failed(Throwable throwable, String reason, + String details) { + alertMessage(reason, details); + resumeUIState(); + } + + @Override + public void completed(TRId id) { + resumeUIState(); + + } + + @Override + public void aborted() { + resumeUIState(); + } + }); + + exportWizard.show(); + } + + @Override + public void onFailure(Throwable reason) { + asyncCodeLoadingFailed(reason); + } + }); + + } /** diff --git a/src/main/java/org/gcube/portlets/user/td/client/ribbon/FileToolBar.java b/src/main/java/org/gcube/portlets/user/td/client/ribbon/FileToolBar.java index fa1f0fa..f34c4aa 100644 --- a/src/main/java/org/gcube/portlets/user/td/client/ribbon/FileToolBar.java +++ b/src/main/java/org/gcube/portlets/user/td/client/ribbon/FileToolBar.java @@ -334,7 +334,7 @@ public class FileToolBar { importSDMXButton.enable(); exportCSVButton.enable(); exportJSONButton.disable(); - exportSDMXButton.disable(); + exportSDMXButton.enable(); break; case WIZARD_OPEN: openButton.disable(); diff --git a/src/main/resources/org/gcube/portlets/user/td/tabulardataportlet.gwt.xml b/src/main/resources/org/gcube/portlets/user/td/tabulardataportlet.gwt.xml index 5646fe5..b51af07 100644 --- a/src/main/resources/org/gcube/portlets/user/td/tabulardataportlet.gwt.xml +++ b/src/main/resources/org/gcube/portlets/user/td/tabulardataportlet.gwt.xml @@ -21,7 +21,7 @@ - + diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml index 9e9df21..ec5f3c5 100644 --- a/src/main/webapp/WEB-INF/web.xml +++ b/src/main/webapp/WEB-INF/web.xml @@ -23,7 +23,7 @@ org.gcube.portlets.user.tdw.server.TabularDataServlet - + TDGWTService org.gcube.portlets.user.td.gwtservice.server.TDGWTServiceImpl @@ -95,7 +95,7 @@ /tabulardataportlet/tdwdata - + TDGWTService /tabulardataportlet/TDGWTService