diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component
index 999a69b..7e3f616 100644
--- a/.settings/org.eclipse.wst.common.component
+++ b/.settings/org.eclipse.wst.common.component
@@ -10,61 +10,7 @@
uses
-
- uses
-
-
- uses
-
-
- uses
-
-
- uses
-
-
- uses
-
-
- uses
-
-
- uses
-
-
- uses
-
-
- uses
-
-
- uses
-
-
- uses
-
-
- uses
-
-
- uses
-
-
- uses
-
-
- uses
-
-
- uses
-
-
- uses
-
-
- uses
-
-
+
uses
diff --git a/pom.xml b/pom.xml
index be5e754..4f999ae 100644
--- a/pom.xml
+++ b/pom.xml
@@ -272,7 +272,7 @@
tabular-data-sdmx-import-widget
[2.0.0-SNAPSHOT,3.0.0-SNAPSHOT)
-
+
org.gcube.portlets.user
@@ -293,7 +293,14 @@
tabular-data-sdmx-export-widget
[1.0.0-SNAPSHOT,2.0.0-SNAPSHOT)
-
+
+
+
+ org.gcube.portlets.user
+ tabular-data-json-export-widget
+ [1.0.0-SNAPSHOT,2.0.0-SNAPSHOT)
+
+
org.gcube.portlets.user
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 55f09fe..69a203a 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
@@ -20,6 +20,7 @@ import org.gcube.portlets.user.td.expressionwidget.client.ReplaceColumnByExpress
import org.gcube.portlets.user.td.extractcodelistwidget.client.ExtractCodelistWizardTD;
import org.gcube.portlets.user.td.gwtservice.client.rpc.TDGWTServiceAsync;
import org.gcube.portlets.user.td.gwtservice.shared.exception.TDGWTSessionExpiredException;
+import org.gcube.portlets.user.td.jsonexportwidget.client.JSONExportWidgetTD;
import org.gcube.portlets.user.td.openwidget.client.TDOpen;
import org.gcube.portlets.user.td.sdmxexportwidget.client.SDMXExportWizardTD;
import org.gcube.portlets.user.td.sdmximportwidget.client.SDMXImportWizardTD;
@@ -483,6 +484,7 @@ public class TabularDataController {
openCSVExportWizard();
break;
case EXPORTJSON:
+ openJSONExportWizard();
break;
case TEMPLATEOPEN:
openTemplateOpen();
@@ -794,6 +796,52 @@ public class TabularDataController {
});
}
+
+ protected void openJSONExportWizard() {
+ GWT.runAsync(new RunAsyncCallback() {
+
+ public void onSuccess() {
+ openWizard();
+ JSONExportWidgetTD exportWizard = new JSONExportWidgetTD(
+ "JSON Export", eventBus);
+
+ exportWizard.addListener(new WizardListener() {
+
+ @Override
+ public void completed(TRId id) {
+ resumeUIState();
+
+ }
+
+ @Override
+ public void putInBackground() {
+ Log.debug("PutInBakground");
+ }
+
+ @Override
+ public void aborted() {
+ resumeUIState();
+ }
+
+ @Override
+ public void failed(String title, String message,
+ Throwable throwable) {
+ UtilsGXT3.alert(title, message);
+ resumeUIState();
+ }
+
+ });
+
+ exportWizard.show();
+ }
+
+ 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 5931f2c..1e04485 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
@@ -631,7 +631,7 @@ public class FileToolBar {
exportSDMXButton.disable();
}
exportCSVButton.enable();
- exportJSONButton.disable();
+ exportJSONButton.enable();
templateOpenButton.enable();
templateNewButton.enable();
templateDeleteButton.enable();
diff --git a/src/main/java/org/gcube/portlets/user/td/tabulardataportlet.gwt.xml b/src/main/java/org/gcube/portlets/user/td/tabulardataportlet.gwt.xml
index f44212e..e7566f0 100644
--- a/src/main/java/org/gcube/portlets/user/td/tabulardataportlet.gwt.xml
+++ b/src/main/java/org/gcube/portlets/user/td/tabulardataportlet.gwt.xml
@@ -38,6 +38,8 @@
name='org.gcube.portlets.user.td.csvimportwidget.CSVImportWizardTD' />
+
+
+
+
+ Added Export JSON
+
Added validation from and validation until to