From e213b445af18f0e9c084dbb4573555f2afd1279b Mon Sep 17 00:00:00 2001 From: Massimiliano Assante Date: Tue, 19 Mar 2013 16:52:32 +0000 Subject: [PATCH] new light tree support for shared folders git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/portlets/user/reports@71564 82a268e6-3cf1-43bd-a215-b396298e98cf --- pom.xml | 2 +- .../reportgenerator/client/Presenter/CommonCommands.java | 2 +- .../user/reportgenerator/client/ReportGenerator.java | 9 --------- .../reportgenerator/client/uibinder/ExportOptions.java | 2 +- 4 files changed, 3 insertions(+), 12 deletions(-) diff --git a/pom.xml b/pom.xml index e39ca06..46a3ca6 100644 --- a/pom.xml +++ b/pom.xml @@ -121,7 +121,7 @@ org.gcube.portlets.user workspace-light-tree - [2.9.0-SNAPSHOT, 2.9.3-SNAPSHOT) + [2.9.0-SNAPSHOT, 3.0.0-SNAPSHOT) ${setScope} diff --git a/src/main/java/org/gcube/portlets/user/reportgenerator/client/Presenter/CommonCommands.java b/src/main/java/org/gcube/portlets/user/reportgenerator/client/Presenter/CommonCommands.java index 807fa34..231a307 100644 --- a/src/main/java/org/gcube/portlets/user/reportgenerator/client/Presenter/CommonCommands.java +++ b/src/main/java/org/gcube/portlets/user/reportgenerator/client/Presenter/CommonCommands.java @@ -216,7 +216,7 @@ public class CommonCommands { GWT.runAsync(WorkspaceLightTreeSavePopup.class, new RunAsyncCallback() { public void onSuccess() { WorkspaceLightTreeSavePopup wpTreepopup = new WorkspaceLightTreeSavePopup("Save Template, choose folder please:", true); - wpTreepopup.setSelectableTypes( ItemType.FOLDER, ItemType.ROOT); + wpTreepopup.setSelectableTypes( ItemType.FOLDER, ItemType.ROOT, ItemType.SHARED_FOLDER); wpTreepopup.setShowEmptyFolders(true); wpTreepopup.addPopupHandler(new PopupHandler() { diff --git a/src/main/java/org/gcube/portlets/user/reportgenerator/client/ReportGenerator.java b/src/main/java/org/gcube/portlets/user/reportgenerator/client/ReportGenerator.java index 1dcfbda..9b6b994 100644 --- a/src/main/java/org/gcube/portlets/user/reportgenerator/client/ReportGenerator.java +++ b/src/main/java/org/gcube/portlets/user/reportgenerator/client/ReportGenerator.java @@ -1,30 +1,21 @@ package org.gcube.portlets.user.reportgenerator.client; -import org.gcube.portlets.user.exporter.shared.TypeExporter; import org.gcube.portlets.user.guidedtour.client.GCUBEGuidedTour; import org.gcube.portlets.user.guidedtour.client.steps.GCUBETemplate1Text1Image; import org.gcube.portlets.user.guidedtour.client.steps.GCUBETemplate2Text2Image; import org.gcube.portlets.user.guidedtour.client.steps.TourStep; -import org.gcube.portlets.user.guidedtour.client.types.ThemeColor; import org.gcube.portlets.user.guidedtour.client.types.VerticalAlignment; import org.gcube.portlets.user.reportgenerator.client.Presenter.Presenter; import org.gcube.portlets.user.reportgenerator.client.toursteps.Intro; import org.gcube.portlets.user.workspace.client.AppControllerExplorer; import org.gcube.portlets.user.workspace.client.rpc.GWTWorkspaceServiceAsync; -import org.gcube.portlets.user.workspace.lighttree.client.ItemType; -import org.gcube.portlets.user.workspace.lighttree.client.event.PopupEvent; -import org.gcube.portlets.user.workspace.lighttree.client.event.PopupHandler; -import org.gcube.portlets.user.workspace.lighttree.client.load.WorkspaceLightTreeLoadPopup; import com.google.gwt.core.client.EntryPoint; import com.google.gwt.core.client.GWT; import com.google.gwt.core.client.RunAsyncCallback; -import com.google.gwt.event.dom.client.ClickEvent; -import com.google.gwt.event.dom.client.ClickHandler; import com.google.gwt.event.logical.shared.ResizeEvent; import com.google.gwt.event.logical.shared.ResizeHandler; import com.google.gwt.user.client.Window; -import com.google.gwt.user.client.ui.Button; import com.google.gwt.user.client.ui.CellPanel; import com.google.gwt.user.client.ui.HTML; import com.google.gwt.user.client.ui.HorizontalPanel; diff --git a/src/main/java/org/gcube/portlets/user/reportgenerator/client/uibinder/ExportOptions.java b/src/main/java/org/gcube/portlets/user/reportgenerator/client/uibinder/ExportOptions.java index 7fdbdd0..6478daa 100644 --- a/src/main/java/org/gcube/portlets/user/reportgenerator/client/uibinder/ExportOptions.java +++ b/src/main/java/org/gcube/portlets/user/reportgenerator/client/uibinder/ExportOptions.java @@ -90,7 +90,7 @@ public class ExportOptions extends Composite { break; case SAVE_AS: WorkspaceLightTreeSavePopup wpTree = new WorkspaceLightTreeSavePopup("Save Report, select the folder:", true); - wpTree.setSelectableTypes(ItemType.FOLDER, ItemType.ROOT); + wpTree.setSelectableTypes(ItemType.FOLDER, ItemType.ROOT, ItemType.SHARED_FOLDER); wpTree.setShowEmptyFolders(true); wpTree.addPopupHandler(new PopupHandler(){