diff --git a/src/main/java/org/gcube/portlets/user/workspaceexplorerapp/client/rpc/WorkspaceExplorerAppService.java b/src/main/java/org/gcube/portlets/user/workspaceexplorerapp/client/rpc/WorkspaceExplorerAppService.java index fd3e7c2..2438e4d 100644 --- a/src/main/java/org/gcube/portlets/user/workspaceexplorerapp/client/rpc/WorkspaceExplorerAppService.java +++ b/src/main/java/org/gcube/portlets/user/workspaceexplorerapp/client/rpc/WorkspaceExplorerAppService.java @@ -76,7 +76,7 @@ public interface WorkspaceExplorerAppService extends RemoteService { * @return the breadcrumbs by item identifier * @throws Exception the exception */ - List getBreadcrumbsByItemIdentifier(String itemIdentifier, boolean includeItemAsParent) throws Exception; + //List getBreadcrumbsByItemIdentifier(String itemIdentifier, boolean includeItemAsParent) throws Exception; /** * Gets the public link for item id. diff --git a/src/main/java/org/gcube/portlets/user/workspaceexplorerapp/client/rpc/WorkspaceExplorerAppServiceAsync.java b/src/main/java/org/gcube/portlets/user/workspaceexplorerapp/client/rpc/WorkspaceExplorerAppServiceAsync.java index cbff90c..47c860f 100644 --- a/src/main/java/org/gcube/portlets/user/workspaceexplorerapp/client/rpc/WorkspaceExplorerAppServiceAsync.java +++ b/src/main/java/org/gcube/portlets/user/workspaceexplorerapp/client/rpc/WorkspaceExplorerAppServiceAsync.java @@ -69,8 +69,7 @@ public interface WorkspaceExplorerAppServiceAsync { * @param asyncCallback the async callback * @return the breadcrumbs by item identifier */ - public void getBreadcrumbsByItemIdentifier(String itemIdentifier, boolean includeItemAsParent, - AsyncCallback> asyncCallback); + //public void getBreadcrumbsByItemIdentifier(String itemIdentifier, boolean includeItemAsParent, AsyncCallback> asyncCallback); /** * Gets the my special folder. diff --git a/src/main/java/org/gcube/portlets/user/workspaceexplorerapp/server/WorkspaceExplorerAppServiceImpl.java b/src/main/java/org/gcube/portlets/user/workspaceexplorerapp/server/WorkspaceExplorerAppServiceImpl.java index 4d3fbb3..5959209 100644 --- a/src/main/java/org/gcube/portlets/user/workspaceexplorerapp/server/WorkspaceExplorerAppServiceImpl.java +++ b/src/main/java/org/gcube/portlets/user/workspaceexplorerapp/server/WorkspaceExplorerAppServiceImpl.java @@ -2,7 +2,6 @@ package org.gcube.portlets.user.workspaceexplorerapp.server; import java.net.URL; import java.util.ArrayList; -import java.util.Arrays; import java.util.Collections; import java.util.List; import java.util.concurrent.TimeUnit; @@ -73,7 +72,7 @@ public class WorkspaceExplorerAppServiceImpl extends RemoteServiceServlet implem */ @Override public Item getRoot(List showableTypes, boolean purgeEmpyFolders, FilterCriteria filterCriteria) throws WorkspaceNavigatorServiceException { - logger.debug("getRoot showableTypes: "+showableTypes+" purgeEmpyFolders: "+purgeEmpyFolders+" filterCriteria: "+ filterCriteria); + logger.info("getRoot showableTypes: "+showableTypes+" purgeEmpyFolders: "+purgeEmpyFolders+" filterCriteria: "+ filterCriteria); try { @@ -106,7 +105,7 @@ public class WorkspaceExplorerAppServiceImpl extends RemoteServiceServlet implem logger.trace("Returning:"); Long endTime = System.currentTimeMillis() - startTime; String time = String.format("%d msc %d sec", endTime, TimeUnit.MILLISECONDS.toSeconds(endTime)); - logger.info("end time - " + time); + logger.info("getRoot end time - " + time); Collections.sort(rootItem.getChildren(), new ItemComparator()); logger.info("Returning children size: "+rootItem.getChildren().size()); @@ -132,7 +131,7 @@ public class WorkspaceExplorerAppServiceImpl extends RemoteServiceServlet implem */ @Override public Item getFolder(Item item, List showableTypes, boolean purgeEmpyFolders, FilterCriteria filterCriteria) throws WorkspaceNavigatorServiceException { - logger.debug("getFolder item: "+item+" showableTypes: "+showableTypes+" purgeEmpyFolders: "+purgeEmpyFolders+" filterCriteria: "+filterCriteria); + logger.info("called getFolder item: "+item+" showableTypes: "+showableTypes+" purgeEmpyFolders: "+purgeEmpyFolders+" filterCriteria: "+filterCriteria); WorkspaceItem workspaceItem = null; Workspace workspace = null; @@ -173,7 +172,7 @@ public class WorkspaceExplorerAppServiceImpl extends RemoteServiceServlet implem logger.trace("Returning:"); Long endTime = System.currentTimeMillis() - startTime; String time = String.format("%d msc %d sec", endTime, TimeUnit.MILLISECONDS.toSeconds(endTime)); - logger.info("end time - " + time); + logger.info("getFolder end time - " + time); Collections.sort(itemFolder.getChildren(), new ItemComparator()); @@ -197,7 +196,7 @@ public class WorkspaceExplorerAppServiceImpl extends RemoteServiceServlet implem */ @Override public Item getMySpecialFolder(List showableTypes, boolean purgeEmpyFolders, FilterCriteria filterCriteria) throws WorkspaceNavigatorServiceException { - logger.trace("GetMySpecialFolder showableTypes: "+showableTypes+" purgeEmpyFolders: "+purgeEmpyFolders+" filterCriteria: "+filterCriteria); + logger.info("called getMySpecialFolder showableTypes: "+showableTypes+" purgeEmpyFolders: "+purgeEmpyFolders+" filterCriteria: "+filterCriteria); try { @@ -223,7 +222,7 @@ public class WorkspaceExplorerAppServiceImpl extends RemoteServiceServlet implem logger.trace("Returning:"); Long endTime = System.currentTimeMillis() - startTime; String time = String.format("%d msc %d sec", endTime, TimeUnit.MILLISECONDS.toSeconds(endTime)); - logger.trace("end time - " + time); + logger.info("getMySpecialFolder end time - " + time); Collections.sort(itemFolder.getChildren(), new ItemComparator()); return itemFolder; @@ -241,8 +240,8 @@ public class WorkspaceExplorerAppServiceImpl extends RemoteServiceServlet implem * @return the list parents by item identifier * @throws Exception the exception */ - @Override - public List getBreadcrumbsByItemIdentifier(String itemIdentifier, boolean includeItemAsParent) throws Exception { + //@Override + /*public List getBreadcrumbsByItemIdentifier(String itemIdentifier, boolean includeItemAsParent) throws Exception { logger.trace("ListParents By Item Identifier "+ itemIdentifier); try { @@ -303,9 +302,8 @@ public class WorkspaceExplorerAppServiceImpl extends RemoteServiceServlet implem }else arrayParents = new Item[parents.size()-1]; - /** HANDLE MY_SPECIAL_FOLDER TO AVOID COMPLETE PATH WORKSPACE/MY_SPECIAL_FOLDER - * BUT RETURNING ONLY /MY_SPECIAL_FOLDER - */ + // HANDLE MY_SPECIAL_FOLDER TO AVOID COMPLETE PATH WORKSPACE/MY_SPECIAL_FOLDER BUT RETURNING ONLY /MY_SPECIAL_FOLDER + if(wsItem.isFolder()){ if(ItemBuilder.isSpecialFolder((WorkspaceFolder) wsItem, lastItem.isRoot())){ return new ArrayList(Arrays.asList(arrayParents)); @@ -348,7 +346,7 @@ public class WorkspaceExplorerAppServiceImpl extends RemoteServiceServlet implem logger.error("Error in get List Parents By Item Identifier ", e); throw new Exception("Sorry, an error occurred during path retrieving!"); } - } + }*/ /** * Gets the parents by item identifier to limit. @@ -361,7 +359,7 @@ public class WorkspaceExplorerAppServiceImpl extends RemoteServiceServlet implem */ @Override public List getBreadcrumbsByItemIdentifierToParentLimit(String itemIdentifier, String parentLimit, boolean includeItemAsParent) throws Exception { - logger.trace("getBreadcrumbsByItemIdentifierToParentLimit by Item Identifier " + itemIdentifier +" and limit: "+parentLimit + " and includeItemAsParent: "+includeItemAsParent); + logger.info("called getBreadcrumbsByItemIdentifierToParentLimit by Item Identifier " + itemIdentifier +" and limit: "+parentLimit + " and includeItemAsParent: "+includeItemAsParent); try { Workspace workspace = getWorkspace(); @@ -371,7 +369,7 @@ public class WorkspaceExplorerAppServiceImpl extends RemoteServiceServlet implem try{ parents = workspace.getParentsById(itemIdentifier); }catch(Exception e){ - logger.error("Error on getting list of parents from HL for id: "+itemIdentifier, e); + logger.error("Error on getting list of parents from SHUB for id: "+itemIdentifier, e); parents = new ArrayList(); } @@ -513,8 +511,8 @@ public class WorkspaceExplorerAppServiceImpl extends RemoteServiceServlet implem */ @Override public String getPublicLinkForItemId(String itemId) throws Exception{ - - logger.trace("get Public Link For ItemId: "+ itemId); + logger.info("calle getPublicLinkForItemId: "+ itemId); + try{ if(itemId==null) diff --git a/src/main/java/org/gcube/portlets/user/workspaceexplorerapp/server/workspace/WsUtil.java b/src/main/java/org/gcube/portlets/user/workspaceexplorerapp/server/workspace/WsUtil.java index 633ca8f..7557aa4 100644 --- a/src/main/java/org/gcube/portlets/user/workspaceexplorerapp/server/workspace/WsUtil.java +++ b/src/main/java/org/gcube/portlets/user/workspaceexplorerapp/server/workspace/WsUtil.java @@ -49,7 +49,7 @@ public class WsUtil { } - return new StorageHubWrapper(scope, applicationToken, false, false, true); + return new StorageHubWrapper(scope, applicationToken, false, false, false); } catch (Exception e) { logger.error("Error when instancing the storageHub wrapper", e); throw new Exception("Error on inizializing the StorageHub wrapper. Please contact the support!"); diff --git a/src/main/java/org/gcube/portlets/user/workspaceexplorerapp/shared/Item.java b/src/main/java/org/gcube/portlets/user/workspaceexplorerapp/shared/Item.java index cd52c23..4bc00fe 100644 --- a/src/main/java/org/gcube/portlets/user/workspaceexplorerapp/shared/Item.java +++ b/src/main/java/org/gcube/portlets/user/workspaceexplorerapp/shared/Item.java @@ -3,11 +3,10 @@ */ package org.gcube.portlets.user.workspaceexplorerapp.shared; +import java.io.Serializable; import java.util.ArrayList; import java.util.Date; -import com.google.gwt.user.client.rpc.IsSerializable; - /** * The Class Item. @@ -15,13 +14,17 @@ import com.google.gwt.user.client.rpc.IsSerializable; * @author Francesco Mangiacrapa francesco.mangiacrapa@isti.cnr.it * Dec 2, 2015 */ -public class Item implements IsSerializable, ItemInterface { +public class Item implements ItemInterface, Serializable { + /** + * + */ + private static final long serialVersionUID = 95739933872495958L; protected Item parent; protected String id; protected String name; - protected ItemType type; + public ItemType type; protected String path; protected ArrayList children; private String owner; diff --git a/src/main/java/org/gcube/portlets/user/workspaceexplorerapp/shared/ItemType.java b/src/main/java/org/gcube/portlets/user/workspaceexplorerapp/shared/ItemType.java index d1617d1..d970421 100644 --- a/src/main/java/org/gcube/portlets/user/workspaceexplorerapp/shared/ItemType.java +++ b/src/main/java/org/gcube/portlets/user/workspaceexplorerapp/shared/ItemType.java @@ -13,32 +13,13 @@ package org.gcube.portlets.user.workspaceexplorerapp.shared; public enum ItemType { FOLDER, - - // KINDS OF FILES - /** - * Document. - */ + DOCUMENT, - /** - * Image document. - */ IMAGE_DOCUMENT, - /** - * PDF document. - */ PDF_DOCUMENT, - /** - * Url document. - */ URL_DOCUMENT, - /** - * Metadata. - */ METADATA, - /** - * A gCube item. - */ GCUBE_ITEM, - + UNKNOWN_TYPE }