diff --git a/pom.xml b/pom.xml index c40d83b..42af76a 100644 --- a/pom.xml +++ b/pom.xml @@ -55,6 +55,13 @@ + + + + + + + com.google.gwt @@ -173,25 +180,25 @@ test-jar - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + 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 1d0319e..e461806 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 @@ -3,7 +3,6 @@ */ package org.gcube.portlets.widgets.wsexplorer.client; -import java.util.ArrayList; import java.util.List; import org.gcube.portlets.widgets.wsexplorer.client.event.BreadcrumbClickEvent; @@ -55,8 +54,6 @@ public class WorkspaceExplorerController implements EventHandler { private WorkspaceExplorer wsExplorer; private Breadcrumbs breadcrumbs = new Breadcrumbs(); private Navigation navigation = new Navigation(); - protected List selectableTypes = new ArrayList(); - protected List showableTypes = new ArrayList(); public static final WorkspaceExplorerServiceAsync workspaceNavigatorService = GWT.create(WorkspaceExplorerService.class); @@ -327,8 +324,6 @@ public class WorkspaceExplorerController implements EventHandler { * @param selectableTypes the new selectable types */ public void setSelectableTypes(ItemType[] selectableTypes) { - this.selectableTypes.clear(); - if (selectableTypes!=null) for (ItemType type:selectableTypes) this.selectableTypes.add(type); wsExplorer.setSelectableTypes(selectableTypes); } @@ -356,8 +351,6 @@ public class WorkspaceExplorerController implements EventHandler { * @param showableTypes the new showable types */ public void setShowableTypes(ItemType[] showableTypes) { - this.showableTypes.clear(); - if (showableTypes!=null) for (ItemType type:showableTypes) this.showableTypes.add(type); wsExplorer.setShowableTypes(showableTypes); } @@ -368,9 +361,10 @@ public class WorkspaceExplorerController implements EventHandler { * @return true, if successful */ public boolean itemIsSelectable(Item item){ - + GWT.log("Selectable type: "+wsExplorer.getSelectableTypes()); + GWT.log("item: "+item); if (item!=null){ - boolean selectable = selectableTypes.contains(item.getType()); + boolean selectable = wsExplorer.getSelectableTypes().contains(item.getType()); return (selectable)?true:false; } return false; diff --git a/src/main/java/org/gcube/portlets/widgets/wsexplorer/client/select/WorkspaceExplorerSelectDialog.java b/src/main/java/org/gcube/portlets/widgets/wsexplorer/client/select/WorkspaceExplorerSelectDialog.java index be37d5e..c3090ce 100644 --- a/src/main/java/org/gcube/portlets/widgets/wsexplorer/client/select/WorkspaceExplorerSelectDialog.java +++ b/src/main/java/org/gcube/portlets/widgets/wsexplorer/client/select/WorkspaceExplorerSelectDialog.java @@ -177,7 +177,7 @@ public class WorkspaceExplorerSelectDialog extends Modal implements HasWorskpace isSelect = false; Item item = controller.getWsExplorer().getItemSelected(); boolean isSelectable = controller.itemIsSelectable(item); - + GWT.log("Item is selectable? "+isSelectable); if(item!=null && isSelectable){ isSelect = true; INSTANCE.hide();