diff --git a/config/profile.xml b/config/profile.xml
index 94f2645..0cc43e8 100644
--- a/config/profile.xml
+++ b/config/profile.xml
@@ -6,20 +6,20 @@
tabular-data-csv-export-widget allows csv export inside file and workspace
PortletsUser
tabular-data-csv-export-widget
- 1.6.0-SNAPSHOT
+ 1.7.0-SNAPSHOT
tabular-data-csv-export-widget allows csv export inside file and workspace
tabular-data-csv-export-widget
- 1.6.0-SNAPSHOT
+ 1.7.0-SNAPSHOT
org.gcube.portlets.user
tabular-data-csv-export-widget
- 1.6.0-SNAPSHOT
+ 1.7.0-SNAPSHOT
library
- tabular-data-csv-export-widget-1.6.0-SNAPSHOT.jar
+ tabular-data-csv-export-widget-1.7.0-SNAPSHOT.jar
diff --git a/distro/README b/distro/README
index df08f9d..85ecc29 100644
--- a/distro/README
+++ b/distro/README
@@ -13,7 +13,7 @@ Istituto di Scienza e Tecnologie dell'Informazione "A. Faedo"
Version and Release Date
------------------------
-v. 1.6.0-SNAPSHOT (2015-04-30)
+v. 1.7.0-SNAPSHOT (2015-07-03)
Description
diff --git a/distro/changelog.xml b/distro/changelog.xml
index bfa8f5d..9102e0f 100644
--- a/distro/changelog.xml
+++ b/distro/changelog.xml
@@ -1,4 +1,9 @@
+
+ Fixed Layout
+ Updated dependencies
+
Updated dependency
diff --git a/pom.xml b/pom.xml
index 181a9d8..e78aaa2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,7 +13,7 @@
4.0.0
org.gcube.portlets.user
tabular-data-csv-export-widget
- 1.6.0-SNAPSHOT
+ 1.7.0-SNAPSHOT
tabular-data-csv-export-widget
tabular-data-csv-export-widget allows csv export inside file and workspace
@@ -37,7 +37,7 @@
${project.basedir}/distro
${project.build.directory}/${project.build.finalName}
- 2015-04-30
+ 2015-07-03
https://gcube.wiki.gcube-system.org/gcube/index.php/Tabular_Data_Manager
templates
distro
@@ -88,20 +88,6 @@
-
- javax.validation
- validation-api
- 1.0.0.GA
- test
-
-
- javax.validation
- validation-api
- 1.0.0.GA
- sources
- test
-
-
com.sencha.gxt
gxt
@@ -152,7 +138,6 @@
org.gcube.common
home-library
- [1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT)
provided
@@ -184,9 +169,6 @@
-
-
-
${webappDirectory}/WEB-INF/classes
diff --git a/src/main/java/org/gcube/portlets/user/td/csvexportwidget/client/CSVExportConfigCard.java b/src/main/java/org/gcube/portlets/user/td/csvexportwidget/client/CSVExportConfigCard.java
index aa61503..f418fb8 100644
--- a/src/main/java/org/gcube/portlets/user/td/csvexportwidget/client/CSVExportConfigCard.java
+++ b/src/main/java/org/gcube/portlets/user/td/csvexportwidget/client/CSVExportConfigCard.java
@@ -6,7 +6,10 @@ import org.gcube.portlets.user.td.csvexportwidget.client.grid.ColumnDataGridPane
import org.gcube.portlets.user.td.gwtservice.client.rpc.TDGWTServiceAsync;
import org.gcube.portlets.user.td.gwtservice.shared.csv.AvailableCharsetList;
import org.gcube.portlets.user.td.gwtservice.shared.csv.CSVExportSession;
+import org.gcube.portlets.user.td.gwtservice.shared.destination.WorkspaceDestination;
+import org.gcube.portlets.user.td.gwtservice.shared.exception.TDGWTIsLockedException;
import org.gcube.portlets.user.td.gwtservice.shared.exception.TDGWTSessionExpiredException;
+import org.gcube.portlets.user.td.gwtservice.shared.tr.TabResource;
import org.gcube.portlets.user.td.widgetcommonevent.client.event.SessionExpiredEvent;
import org.gcube.portlets.user.td.widgetcommonevent.client.type.SessionExpiredType;
import org.gcube.portlets.user.td.widgetcommonevent.shared.tr.column.ColumnData;
@@ -310,17 +313,72 @@ public class CSVExportConfigCard extends WizardCard {
exportSession.setEncoding(encodings.getCurrentValue());
exportSession.setSeparator(String.valueOf(getSelectedDelimiter()));
exportSession.setExportViewColumns(getExportViewColumns());
- goNext();
+ useWorkspaceDestination();
}
}
+
+ protected void useWorkspaceDestination(){
+ final WorkspaceDestination workspaceDestination = WorkspaceDestination.INSTANCE;
+ exportSession.setDestination(workspaceDestination);
+ retrieveTabularResource();
+ }
+
+ protected void retrieveTabularResource() {
+ TDGWTServiceAsync.INSTANCE
+ .getTabResourceInformation(new AsyncCallback() {
+
+ public void onSuccess(TabResource result) {
+ Log.info("Retrived TR: " + result.getTrId());
+ exportSession.setTabResource(result);
+ goNext();
+ }
+
+ public void onFailure(Throwable caught) {
+ if (caught instanceof TDGWTSessionExpiredException) {
+ getEventBus()
+ .fireEvent(
+ new SessionExpiredEvent(
+ SessionExpiredType.EXPIREDONSERVER));
+ } else {
+
+ if (caught instanceof TDGWTIsLockedException) {
+ Log.error(caught.getLocalizedMessage());
+ showErrorAndHide("Error Locked",
+ caught.getLocalizedMessage(), "",
+ caught);
+ } else {
+ showErrorAndHide(
+ "Error",
+ "Error retrienving tabular resource info: ",
+ caught.getLocalizedMessage(), caught);
+
+ }
+ }
+
+ }
+
+ });
+
+ }
+
+
protected void goNext() {
try {
- DestinationSelectionCard destCard = new DestinationSelectionCard(
+ //Enable this for multi destination selection
+ /*DestinationSelectionCard destCard = new DestinationSelectionCard(
exportSession);
getWizardWindow().addCard(destCard);
+ getWizardWindow().nextCard();*/
+
+ Log.info("NextCard CSVWorkspaceSelectionCard");
+ CSVWorkSpaceSelectionCard csvWorkspaceSelectionCard = new CSVWorkSpaceSelectionCard(
+ exportSession);
+ getWizardWindow().addCard(
+ csvWorkspaceSelectionCard);
getWizardWindow().nextCard();
+
} catch (Exception e) {
Log.error("sayNextCard :" + e.getLocalizedMessage());
}
diff --git a/templates/changelog.xml b/templates/changelog.xml
index b20d32a..ad073ac 100644
--- a/templates/changelog.xml
+++ b/templates/changelog.xml
@@ -1,4 +1,9 @@
+
+ Fixed Layout
+ Updated dependencies
+
Updated dependency