diff --git a/pom.xml b/pom.xml
index e78aaa2..3d2392a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -42,13 +42,13 @@
templates
distro
config
-
+
2.6.1
3.3.2
- 3.1.1
-
-
+ 3.1.1
+
+
${env.KEYS}
UTF-8
@@ -71,7 +71,7 @@
runtime
-
+
@@ -111,7 +111,7 @@
[1.0.0-SNAPSHOT,2.0.0-SNAPSHOT)
provided
-
+
org.gcube.portlets.user
@@ -131,10 +131,11 @@
org.gcube.portlets.widgets
- workspace-light-tree
- [2.13.0-SNAPSHOT, 3.0.0-SNAPSHOT)
+ workspace-explorer
+ [1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT)
provided
+
org.gcube.common
home-library
diff --git a/src/main/java/org/gcube/portlets/user/td/csvexportwidget/client/CSVExportWizardTD.java b/src/main/java/org/gcube/portlets/user/td/csvexportwidget/client/CSVExportWizardTD.java
index 9318d29..d1b91bd 100644
--- a/src/main/java/org/gcube/portlets/user/td/csvexportwidget/client/CSVExportWizardTD.java
+++ b/src/main/java/org/gcube/portlets/user/td/csvexportwidget/client/CSVExportWizardTD.java
@@ -11,16 +11,19 @@ import com.google.web.bindery.event.shared.EventBus;
public class CSVExportWizardTD extends WizardWindow {
protected CSVExportSession exportSession;
-
+ protected String WIZARDWIDTH = "844px";
+
+
/**
- * The id of the {@link CSVTarget} to use.
*
- * @param targetId
+ * @param title
+ * @param eventBus
*/
-
public CSVExportWizardTD(String title, EventBus eventBus) {
super(title, eventBus);
-
+ setWidth(WIZARDWIDTH);
+
+
exportSession = new CSVExportSession();
CSVExportConfigCard csvExportConfigCard = new CSVExportConfigCard(
diff --git a/src/main/java/org/gcube/portlets/user/td/csvexportwidget/client/CSVWorkSpaceSelectionCard.java b/src/main/java/org/gcube/portlets/user/td/csvexportwidget/client/CSVWorkSpaceSelectionCard.java
index 82afd01..14c08ba 100644
--- a/src/main/java/org/gcube/portlets/user/td/csvexportwidget/client/CSVWorkSpaceSelectionCard.java
+++ b/src/main/java/org/gcube/portlets/user/td/csvexportwidget/client/CSVWorkSpaceSelectionCard.java
@@ -6,13 +6,12 @@ package org.gcube.portlets.user.td.csvexportwidget.client;
import java.util.ArrayList;
import java.util.List;
-import org.gcube.portlets.user.td.csvexportwidget.client.workspace.WorkspacePanel;
import org.gcube.portlets.user.td.gwtservice.shared.csv.CSVExportSession;
import org.gcube.portlets.user.td.wizardwidget.client.WizardCard;
-import org.gcube.portlets.widgets.lighttree.client.Item;
-import org.gcube.portlets.widgets.lighttree.client.ItemType;
-import org.gcube.portlets.widgets.lighttree.client.event.ItemSelectionEvent;
-import org.gcube.portlets.widgets.lighttree.client.event.ItemSelectionHandler;
+import org.gcube.portlets.widgets.wsexplorer.client.notification.WorkspaceExplorerSelectNotification.WorskpaceExplorerSelectNotificationListener;
+import org.gcube.portlets.widgets.wsexplorer.client.select.WorkspaceExplorerSelectPanel;
+import org.gcube.portlets.widgets.wsexplorer.shared.Item;
+import org.gcube.portlets.widgets.wsexplorer.shared.ItemType;
import com.allen_sauer.gwt.log.client.Log;
import com.google.gwt.user.client.Command;
@@ -34,15 +33,14 @@ import com.sencha.gxt.widget.core.client.form.validator.EmptyValidator;
*/
public class CSVWorkSpaceSelectionCard extends WizardCard {
- protected CSVExportSession exportSession;
- protected CSVWorkSpaceSelectionCard thisCard;
- protected TextField fileName;
- protected TextField fileDescription;
-
- protected Item item;
- protected VerticalLayoutContainer p;
- protected WorkspacePanel wpanel;
-
+ private CSVExportSession exportSession;
+ private CSVWorkSpaceSelectionCard thisCard;
+ private TextField fileName;
+ private TextField fileDescription;
+
+ private VerticalLayoutContainer p;
+ private WorkspaceExplorerSelectPanel wpanel;
+
public CSVWorkSpaceSelectionCard(final CSVExportSession exportSession) {
super("CSV Export in Workspace", "");
@@ -67,7 +65,7 @@ public class CSVWorkSpaceSelectionCard extends WizardCard {
fileName.setAllowBlank(false);
fileName.setWidth("410px");
fileName.setValue(fileN);
- p.add(new FieldLabel(fileName, "Name"), new VerticalLayoutData(-1,
+ p.add(new FieldLabel(fileName, "Name"), new VerticalLayoutData(1,
-1));
fileDescription = new TextField();
@@ -76,33 +74,52 @@ public class CSVWorkSpaceSelectionCard extends WizardCard {
fileDescription.setWidth("410px");
fileDescription.setValue("csv");
p.add(new FieldLabel(fileDescription, "Description"),
- new VerticalLayoutData(-1, -1));
+ new VerticalLayoutData(1, -1));
+
+ ///
Log.debug("Set Workspace Panel");
- wpanel = new WorkspacePanel();
- wpanel.setSpWidth("410px");
- wpanel.setSpHeight("330px");
- List lItemType = new ArrayList();
- lItemType.add(ItemType.ROOT);
- lItemType.add(ItemType.FOLDER);
- wpanel.setShowableTypes(lItemType);
- wpanel.setSelectableTypes(lItemType);
- wpanel.addSelectionHandler(new ItemSelectionHandler() {
+ List selectableTypes = new ArrayList();
+ selectableTypes.add(ItemType.FOLDER);
+ List showableTypes = new ArrayList();
+ showableTypes.add(ItemType.FOLDER);
+
+ wpanel = new WorkspaceExplorerSelectPanel(new String(
+ "Workspace Selection"),selectableTypes, showableTypes);
- public void onSelection(ItemSelectionEvent event) {
- item = event.getSelectedItem();
+ WorskpaceExplorerSelectNotificationListener handler = new WorskpaceExplorerSelectNotificationListener() {
+
+ @Override
+ public void onSelectedItem(Item item) {
Log.debug("Selected Item:" + item);
- if (item.getType() == ItemType.FOLDER
- || item.getType() == ItemType.ROOT) {
+ if (item.getType() == ItemType.FOLDER) {
thisCard.exportSession.setItemId(item.getId());
} else {
thisCard.exportSession.setItemId(null);
Log.debug("Item type:" + item.getType());
}
}
- });
- p.add(new FieldLabel(wpanel, "Folder"), new VerticalLayoutData(-1, -1));
- wpanel.loadTree();
+
+ @Override
+ public void onFailed(Throwable throwable) {
+ Log.error("Error in workspaceExplorer: "
+ + throwable.getLocalizedMessage());
+ throwable.printStackTrace();
+ }
+
+ @Override
+ public void onAborted() {
+ Log.debug("WorkspaceExplorer Aborted");
+
+ }
+ };
+
+ wpanel.addWorkspaceExplorerSelectNotificationListener(handler);
+
+
+
+ ///
+ p.add(new FieldLabel(wpanel, "Folder"), new VerticalLayoutData(1, 1));
setContent(formPanel);
}
@@ -110,7 +127,6 @@ public class CSVWorkSpaceSelectionCard extends WizardCard {
protected void checkExportData() {
Log.debug("File Name:" + fileName.getCurrentValue() + " Item id: "
+ exportSession.getItemId());
- wpanel.disable();
fileName.disable();
getWizardWindow().setEnableNextButton(false);
getWizardWindow().setEnableBackButton(false);
@@ -118,7 +134,6 @@ public class CSVWorkSpaceSelectionCard extends WizardCard {
HideHandler hideHandler = new HideHandler() {
public void onHide(HideEvent event) {
- wpanel.enable();
getWizardWindow().setEnableNextButton(true);
getWizardWindow().setEnableBackButton(true);
fileName.enable();
diff --git a/src/main/java/org/gcube/portlets/user/td/csvexportwidget/client/workspace/WorkspacePanel.java b/src/main/java/org/gcube/portlets/user/td/csvexportwidget/client/workspace/WorkspacePanel.java
deleted file mode 100644
index 09b619c..0000000
--- a/src/main/java/org/gcube/portlets/user/td/csvexportwidget/client/workspace/WorkspacePanel.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package org.gcube.portlets.user.td.csvexportwidget.client.workspace;
-
-import org.gcube.portlets.widgets.lighttree.client.WorkspaceLightTreePanel;
-
-import com.allen_sauer.gwt.log.client.Log;
-import com.sencha.gxt.widget.core.client.box.AutoProgressMessageBox;
-import com.sencha.gxt.widget.core.client.event.DisableEvent;
-import com.sencha.gxt.widget.core.client.event.EnableEvent;
-
-public class WorkspacePanel extends WorkspaceLightTreePanel {
-
- AutoProgressMessageBox box;
-
- public void setSpWidth(String w) {
- sp.setWidth(w);
-
- }
-
- public void setSpHeight(String h) {
- sp.setHeight(h);
- }
-
- public void disable() {
- Log.debug("WorkspacePanel Disable");
- fireEvent(new DisableEvent());
- }
-
- public void enable() {
- Log.debug("WorkspacePanel Enable");
- fireEvent(new EnableEvent());
- }
-
- public void startWaiting() {
- box= new AutoProgressMessageBox("Loading",
- "Retriving data from workspace, please wait...");
- box.setProgressText("Loading...");
- box.setModal(false);
- box.auto();
- box.show();
-
- }
-
- public void endWaiting() {
- box.hide();
- }
-
-}
diff --git a/src/main/resources/org/gcube/portlets/user/td/csvexportwidget/CSVExportWizardTD.gwt.xml b/src/main/resources/org/gcube/portlets/user/td/csvexportwidget/CSVExportWizardTD.gwt.xml
index 8ba4bcf..7d3502e 100644
--- a/src/main/resources/org/gcube/portlets/user/td/csvexportwidget/CSVExportWizardTD.gwt.xml
+++ b/src/main/resources/org/gcube/portlets/user/td/csvexportwidget/CSVExportWizardTD.gwt.xml
@@ -21,6 +21,7 @@
+
diff --git a/src/main/webapp/CSVImportWizardTD.css b/src/main/webapp/CSVExportWizardTD.css
similarity index 100%
rename from src/main/webapp/CSVImportWizardTD.css
rename to src/main/webapp/CSVExportWizardTD.css
diff --git a/src/main/webapp/CSVImportWizardTD.html b/src/main/webapp/CSVExportWizardTD.html
similarity index 92%
rename from src/main/webapp/CSVImportWizardTD.html
rename to src/main/webapp/CSVExportWizardTD.html
index 5057b47..c0c0429 100644
--- a/src/main/webapp/CSVImportWizardTD.html
+++ b/src/main/webapp/CSVExportWizardTD.html
@@ -12,7 +12,7 @@
-
+
@@ -24,7 +24,7 @@
-
+
diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml
index 5c2073d..6cee26f 100644
--- a/src/main/webapp/WEB-INF/web.xml
+++ b/src/main/webapp/WEB-INF/web.xml
@@ -15,20 +15,33 @@
jUnitHostImpl
com.google.gwt.junit.server.JUnitHostImpl
+
+
+ workspaceExplorer
+ org.gcube.portlets.widgets.wsexplorer.server.WorkspaceExplorerServiceImpl
+
+
TDGWTService
- tdgwtservice/TDGWTService
+ /CSVExportWizardTD/TDGWTService
jUnitHostImpl
- CSVImportWizardTDManagerWidgets/junithost/*
+ /CSVExportWizardTD/junithost/*
+
+
+ workspaceExplorer
+ /CSVExportWizardTD/WorkspaceExplorerService
+
+
+
- CSVImportWizardTD.html
+ CSVExportWizardTD.html