diff --git a/pom.xml b/pom.xml index c943e82..ab8f58c 100644 --- a/pom.xml +++ b/pom.xml @@ -111,6 +111,19 @@ [1.1.0-SNAPSHOT, 2.0.0-SNAPSHOT) provided + + + + + + + + + + + + + org.gcube.portlets.user home-library diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/AppController.java b/src/main/java/org/gcube/portlets/user/workspace/client/AppController.java index 92f0d03..fe686e9 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/client/AppController.java +++ b/src/main/java/org/gcube/portlets/user/workspace/client/AppController.java @@ -6,8 +6,8 @@ import java.util.HashMap; import java.util.List; import org.gcube.portlets.user.workspace.client.ConstantsExplorer.ViewSwitchType; +import org.gcube.portlets.user.workspace.client.ConstantsExplorer.WsPortletInitOperation; import org.gcube.portlets.user.workspace.client.ConstantsPortlet.ViewSwitchTypeInResult; -import org.gcube.portlets.user.workspace.client.ConstantsPortlet.WsPortletInitOperation; import org.gcube.portlets.user.workspace.client.event.AccountingHistoryEvent; import org.gcube.portlets.user.workspace.client.event.AccountingHistoryEventHandler; import org.gcube.portlets.user.workspace.client.event.AccountingReadersEvent; diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/ConstantsPortlet.java b/src/main/java/org/gcube/portlets/user/workspace/client/ConstantsPortlet.java index 7d07550..8696d00 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/client/ConstantsPortlet.java +++ b/src/main/java/org/gcube/portlets/user/workspace/client/ConstantsPortlet.java @@ -19,7 +19,6 @@ public class ConstantsPortlet { public static final String GET_SEARCH_PARAMETER ="search"; public static final String GET_ITEMID_PARAMETER ="itemid"; public static final String GET_OPEARATION_PARAMETER ="operation"; - public static enum WsPortletInitOperation {sharelink, gotofolder}; //DEFAULT OPERATION IS GOTOFOLDER // Div Gwt @@ -54,5 +53,7 @@ public class ConstantsPortlet { public static final String GCUBE_COOKIE_WORKSPACE_GRID_VIEW_SETTING = "GCUBE-Cookie-WorkspaceGridViewSetting"; public static final int COOKIE_EXPIRE_DAYS = 30; public static final long MILLISECS_PER_DAY = 1000L * 60L * 60L * 24L; + + } diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/event/SearchItemByIdEvent.java b/src/main/java/org/gcube/portlets/user/workspace/client/event/SearchItemByIdEvent.java index b8628fb..6cfccf8 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/client/event/SearchItemByIdEvent.java +++ b/src/main/java/org/gcube/portlets/user/workspace/client/event/SearchItemByIdEvent.java @@ -1,6 +1,7 @@ package org.gcube.portlets.user.workspace.client.event; -import org.gcube.portlets.user.workspace.client.ConstantsPortlet.WsPortletInitOperation; +import org.gcube.portlets.user.workspace.client.ConstantsExplorer; +import org.gcube.portlets.user.workspace.client.ConstantsExplorer.WsPortletInitOperation; import com.google.gwt.event.shared.GwtEvent; @@ -16,7 +17,8 @@ public class SearchItemByIdEvent extends GwtEvent { private String itemId; private WsPortletInitOperation operationParameter = null; - + + public SearchItemByIdEvent(String itemId, String op) { this.itemId = itemId; @@ -27,12 +29,13 @@ public class SearchItemByIdEvent extends GwtEvent { else if(op.compareToIgnoreCase(WsPortletInitOperation.gotofolder.toString())==0) operationParameter = WsPortletInitOperation.gotofolder; - + else + operationParameter = ConstantsExplorer.DEFAULT_OPERATION; //DEFAULT OPERATION }else if(operationParameter==null) - operationParameter = WsPortletInitOperation.gotofolder; //DEFAULT OPERATION + operationParameter = ConstantsExplorer.DEFAULT_OPERATION; //DEFAULT OPERATION }