diff --git a/src/main/java/org/gcube/portlets/widgets/wsexplorer/client/WorkspaceExplorerConstants.java b/src/main/java/org/gcube/portlets/widgets/wsexplorer/client/WorkspaceExplorerConstants.java index abc1c09..3a1d92e 100644 --- a/src/main/java/org/gcube/portlets/widgets/wsexplorer/client/WorkspaceExplorerConstants.java +++ b/src/main/java/org/gcube/portlets/widgets/wsexplorer/client/WorkspaceExplorerConstants.java @@ -1,9 +1,15 @@ package org.gcube.portlets.widgets.wsexplorer.client; +import org.gcube.portlets.widgets.wsexplorer.client.rpc.WorkspaceExplorerService; +import org.gcube.portlets.widgets.wsexplorer.client.rpc.WorkspaceExplorerServiceAsync; + +import com.google.gwt.core.client.GWT; + /** * The Class WorkspaceExplorerConstants. * - * @author Francesco Mangiacrapa francesco.mangiacrapa@isti.cnr.it Jun 30, 2015 + * @author Francesco Mangiacrapa francesco.mangiacrapa@isti.cnr.it + * Dec 9, 2015 */ public class WorkspaceExplorerConstants { public static final String SPECIAL_FOLDERS_NAME = "MySpecialFolders"; @@ -26,4 +32,6 @@ public class WorkspaceExplorerConstants { public static final int WIDHT_DIALOG = 730; public static final String SELECT = "Select"; + + public static final WorkspaceExplorerServiceAsync workspaceNavigatorService = GWT.create(WorkspaceExplorerService.class); } diff --git a/src/main/java/org/gcube/portlets/widgets/wsexplorer/client/WorkspaceExplorerController.java b/src/main/java/org/gcube/portlets/widgets/wsexplorer/client/WorkspaceExplorerController.java index 3bdbe60..9822c18 100644 --- a/src/main/java/org/gcube/portlets/widgets/wsexplorer/client/WorkspaceExplorerController.java +++ b/src/main/java/org/gcube/portlets/widgets/wsexplorer/client/WorkspaceExplorerController.java @@ -18,8 +18,6 @@ import org.gcube.portlets.widgets.wsexplorer.client.event.LoadRootEventHandler; import org.gcube.portlets.widgets.wsexplorer.client.event.RootLoadedEvent; import org.gcube.portlets.widgets.wsexplorer.client.event.RootLoadedEventHandler; import org.gcube.portlets.widgets.wsexplorer.client.resources.WorkspaceExplorerResources; -import org.gcube.portlets.widgets.wsexplorer.client.rpc.WorkspaceExplorerService; -import org.gcube.portlets.widgets.wsexplorer.client.rpc.WorkspaceExplorerServiceAsync; import org.gcube.portlets.widgets.wsexplorer.client.view.Breadcrumbs; import org.gcube.portlets.widgets.wsexplorer.client.view.Navigation; import org.gcube.portlets.widgets.wsexplorer.client.view.WorkspaceExplorer; @@ -54,8 +52,6 @@ public class WorkspaceExplorerController implements EventHandler { private WorkspaceExplorer wsExplorer; private Breadcrumbs breadcrumbs = new Breadcrumbs(eventBus); private Navigation navigation = new Navigation(eventBus); - - public static final WorkspaceExplorerServiceAsync workspaceNavigatorService = GWT.create(WorkspaceExplorerService.class); /** * Instantiates a new workspace explorer controller. @@ -130,7 +126,7 @@ public class WorkspaceExplorerController implements EventHandler { public void onLoadRoot(LoadRootEvent loadRootEvent) { wsExplorer.loadRoot(); - workspaceNavigatorService.getItemByCategory(ItemCategory.HOME, new AsyncCallback() { + WorkspaceExplorerConstants.workspaceNavigatorService.getItemByCategory(ItemCategory.HOME, new AsyncCallback() { @Override public void onFailure(Throwable caught) { @@ -168,7 +164,7 @@ public class WorkspaceExplorerController implements EventHandler { public void onLoadMySpecialFolder(LoadMySpecialFolderEvent loadMySpecialFolderEvent) { wsExplorer.loadMySpecialFolder(); - workspaceNavigatorService.getItemByCategory(ItemCategory.VRE_FOLDER, new AsyncCallback() { + WorkspaceExplorerConstants.workspaceNavigatorService.getItemByCategory(ItemCategory.VRE_FOLDER, new AsyncCallback() { @Override public void onFailure(Throwable caught) { @@ -195,7 +191,7 @@ public class WorkspaceExplorerController implements EventHandler { GWT.log("Reload Parent Breadcrumb: [Item id: "+itemIdentifier+"]"); - workspaceNavigatorService.getBreadcrumbsByItemIdentifier(itemIdentifier, includeItemAsParent, new AsyncCallback>() { + WorkspaceExplorerConstants.workspaceNavigatorService.getBreadcrumbsByItemIdentifier(itemIdentifier, includeItemAsParent, new AsyncCallback>() { @Override public void onFailure(Throwable caught) { @@ -251,7 +247,7 @@ public class WorkspaceExplorerController implements EventHandler { if(!item.isFolder()) hp.add(labelMime); hp.add(labelACL); - workspaceNavigatorService.getReadableSizeByItemId(item.getId(), new AsyncCallback() { + WorkspaceExplorerConstants.workspaceNavigatorService.getReadableSizeByItemId(item.getId(), new AsyncCallback() { @Override public void onFailure(Throwable caught) { @@ -264,7 +260,7 @@ public class WorkspaceExplorerController implements EventHandler { }); if(!item.isFolder()){ - workspaceNavigatorService.getMimeType(item.getId(), new AsyncCallback() { + WorkspaceExplorerConstants.workspaceNavigatorService.getMimeType(item.getId(), new AsyncCallback() { @Override public void onFailure(Throwable caught) { @@ -278,7 +274,7 @@ public class WorkspaceExplorerController implements EventHandler { }); } - workspaceNavigatorService.getUserACLForFolderId(item.getId(), new AsyncCallback() { + WorkspaceExplorerConstants.workspaceNavigatorService.getUserACLForFolderId(item.getId(), new AsyncCallback() { @Override public void onFailure(Throwable caught) { diff --git a/src/main/java/org/gcube/portlets/widgets/wsexplorer/client/explore/WorkspaceResourcesExplorerPanel.java b/src/main/java/org/gcube/portlets/widgets/wsexplorer/client/explore/WorkspaceResourcesExplorerPanel.java index 3fd0f74..02dd1a4 100644 --- a/src/main/java/org/gcube/portlets/widgets/wsexplorer/client/explore/WorkspaceResourcesExplorerPanel.java +++ b/src/main/java/org/gcube/portlets/widgets/wsexplorer/client/explore/WorkspaceResourcesExplorerPanel.java @@ -6,7 +6,7 @@ package org.gcube.portlets.widgets.wsexplorer.client.explore; import java.util.ArrayList; import java.util.List; -import org.gcube.portlets.widgets.wsexplorer.client.WorkspaceExplorerController; +import org.gcube.portlets.widgets.wsexplorer.client.WorkspaceExplorerConstants; import org.gcube.portlets.widgets.wsexplorer.client.event.BreadcrumbClickEvent; import org.gcube.portlets.widgets.wsexplorer.client.event.BreadcrumbClickEventHandler; import org.gcube.portlets.widgets.wsexplorer.client.event.ClickItemEvent; @@ -56,7 +56,6 @@ public class WorkspaceResourcesExplorerPanel extends DockPanel implements HasWor private WorkspaceExplorer wsExplorer; private ScrollPanel centerScrollable = new ScrollPanel(); private ScrollPanel southPanel = new ScrollPanel(); - private String folderId; private String folderName; @@ -169,7 +168,7 @@ public class WorkspaceResourcesExplorerPanel extends DockPanel implements HasWor GWT.log("Reload Parent Breadcrumb: [Item id: "+itemIdentifier+"]"); - WorkspaceExplorerController.workspaceNavigatorService.getBreadcrumbsByItemIdentifierToParentLimit(itemIdentifier, folderId, includeItemAsParent, new AsyncCallback>() { + WorkspaceExplorerConstants.workspaceNavigatorService.getBreadcrumbsByItemIdentifierToParentLimit(itemIdentifier, folderId, includeItemAsParent, new AsyncCallback>() { @Override public void onFailure(Throwable caught) { diff --git a/src/main/java/org/gcube/portlets/widgets/wsexplorer/client/view/Navigation.java b/src/main/java/org/gcube/portlets/widgets/wsexplorer/client/view/Navigation.java index 9ab51b8..04b0a6f 100644 --- a/src/main/java/org/gcube/portlets/widgets/wsexplorer/client/view/Navigation.java +++ b/src/main/java/org/gcube/portlets/widgets/wsexplorer/client/view/Navigation.java @@ -4,7 +4,6 @@ package org.gcube.portlets.widgets.wsexplorer.client.view; import org.gcube.portlets.widgets.wsexplorer.client.WorkspaceExplorerConstants; -import org.gcube.portlets.widgets.wsexplorer.client.WorkspaceExplorerController; import org.gcube.portlets.widgets.wsexplorer.client.event.LoadMySpecialFolderEvent; import org.gcube.portlets.widgets.wsexplorer.client.event.LoadRootEvent; import org.gcube.portlets.widgets.wsexplorer.client.resources.WorkspaceExplorerResources; @@ -59,7 +58,7 @@ public class Navigation extends Composite{ getElement().getStyle().setMarginLeft(5.0, Unit.PX); home.setActive(true); - WorkspaceExplorerController.workspaceNavigatorService.getItemByCategory(ItemCategory.HOME, new AsyncCallback() { + WorkspaceExplorerConstants.workspaceNavigatorService.getItemByCategory(ItemCategory.HOME, new AsyncCallback() { @Override public void onSuccess(Item result) { @@ -87,7 +86,7 @@ public class Navigation extends Composite{ vre_folder.setActive(true); vre_folder.setBaseIcon(WorkspaceExplorerResources.CustomIconType.vre_folder); - WorkspaceExplorerController.workspaceNavigatorService.getItemByCategory(ItemCategory.VRE_FOLDER, new AsyncCallback() { + WorkspaceExplorerConstants.workspaceNavigatorService.getItemByCategory(ItemCategory.VRE_FOLDER, new AsyncCallback() { @Override public void onSuccess(Item result) { diff --git a/src/main/java/org/gcube/portlets/widgets/wsexplorer/client/view/WorkspaceExplorer.java b/src/main/java/org/gcube/portlets/widgets/wsexplorer/client/view/WorkspaceExplorer.java index c8adc47..27ef6fa 100644 --- a/src/main/java/org/gcube/portlets/widgets/wsexplorer/client/view/WorkspaceExplorer.java +++ b/src/main/java/org/gcube/portlets/widgets/wsexplorer/client/view/WorkspaceExplorer.java @@ -4,7 +4,7 @@ import java.util.ArrayList; import java.util.List; import org.gcube.portlets.widgets.wsexplorer.client.Util; -import org.gcube.portlets.widgets.wsexplorer.client.WorkspaceExplorerController; +import org.gcube.portlets.widgets.wsexplorer.client.WorkspaceExplorerConstants; import org.gcube.portlets.widgets.wsexplorer.client.event.RootLoadedEvent; import org.gcube.portlets.widgets.wsexplorer.client.resources.WorkspaceExplorerResources; import org.gcube.portlets.widgets.wsexplorer.client.view.grid.ItemsTable; @@ -131,7 +131,7 @@ public class WorkspaceExplorer implements ShowableTypes, SelectableTypes{ GWT.log("loading workspace tree from server"); - WorkspaceExplorerController.workspaceNavigatorService.getRoot(showableTypesParam, purgeEmpyFolders, filterCriteria, new AsyncCallback() { + WorkspaceExplorerConstants.workspaceNavigatorService.getRoot(showableTypesParam, purgeEmpyFolders, filterCriteria, new AsyncCallback() { public void onFailure(Throwable caught) { Window.alert(caught.getMessage()); @@ -176,7 +176,7 @@ public class WorkspaceExplorer implements ShowableTypes, SelectableTypes{ // FilterCriteria filterCriteria = new FilterCriteria(allowedMimeTypes,requiredProperties, allowedFileExtensions); GWT.log("loading workspace folder by item id from server: "+item.getId()); - WorkspaceExplorerController.workspaceNavigatorService.getFolder(item.getId(), showableTypesParam, purgeEmpyFolders, filterCriteria, new AsyncCallback() { + WorkspaceExplorerConstants.workspaceNavigatorService.getFolder(item.getId(), showableTypesParam, purgeEmpyFolders, filterCriteria, new AsyncCallback() { @Override public void onFailure(Throwable caught) { @@ -216,7 +216,7 @@ public class WorkspaceExplorer implements ShowableTypes, SelectableTypes{ // FilterCriteria filterCriteria = new FilterCriteria(allowedMimeTypes,requiredProperties, allowedFileExtensions); GWT.log("loading workspace tree from server"); - WorkspaceExplorerController.workspaceNavigatorService.getMySpecialFolder(showableTypesParam, purgeEmpyFolders, filterCriteria, new AsyncCallback() { + WorkspaceExplorerConstants.workspaceNavigatorService.getMySpecialFolder(showableTypesParam, purgeEmpyFolders, filterCriteria, new AsyncCallback() { @Override public void onFailure(Throwable caught) {