From ec135ae7eeb436cc5b9048fc4fe566fb85a4323f Mon Sep 17 00:00:00 2001 From: Francesco Mangiacrapa Date: Thu, 10 Nov 2016 11:31:25 +0000 Subject: [PATCH] Updated pom Updated changelog Fixed Incident #5722 git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/portlets/user/workspace-explorer-app@134031 82a268e6-3cf1-43bd-a215-b396298e98cf --- distro/changelog.xml | 4 ++++ pom.xml | 10 +++++++++- .../server/WorkspaceExplorerAppServiceImpl.java | 17 ++++++----------- 3 files changed, 19 insertions(+), 12 deletions(-) diff --git a/distro/changelog.xml b/distro/changelog.xml index 84f1d73..010da27 100644 --- a/distro/changelog.xml +++ b/distro/changelog.xml @@ -1,4 +1,8 @@ + + Bug Fix + first release diff --git a/pom.xml b/pom.xml index 73b5861..21e8d97 100644 --- a/pom.xml +++ b/pom.xml @@ -63,6 +63,14 @@ + + + xerces + xercesImpl + 2.9.1 + provided + + com.google.gwt gwt-user @@ -204,7 +212,7 @@ log4j log4j 1.2.16 - provided + compile 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 c4930a8..24ad893 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 @@ -392,25 +392,20 @@ public class WorkspaceExplorerAppServiceImpl extends RemoteServiceServlet implem parentLimit = parentLimit!=null?parentLimit:""; switch (parents.size()) { - case 0: //an error? - logger.debug("There was an error? parents are 0"); - return new ArrayList(1); - case 1: //itemIdentifier is ROOT - Parents include the ROOT - case 2: //itemIdentifier is first level from ROOT - logger.debug("itemIdentifier isRoot or a Folder of first level: "); - if (includeItemAsParent) { //ADDIND ROOT OR FOLDER OF FIRST LEVEL - WorkspaceFolder wsFolder =(WorkspaceFolder) workspace.getItem(itemIdentifier); + case 0: // itemIdentifier is ROOT + logger.trace("itemIdentifier isRoot..."); + if (includeItemAsParent) { //ADDIND ROOT + WorkspaceFolder wsFolder =(WorkspaceFolder) wsItem; Item root = ItemBuilder.buildFolderForBreadcrumbs(wsFolder, null); List listParents = new ArrayList(1); listParents.add(root); + // workspaceLogger.trace("returning: "+listParents.toString()); return listParents; } else{ - logger.debug("returning empty list"); + logger.trace("returning empty list"); return new ArrayList(); // empty list } - default: - break; } WorkspaceItem lastItem = parents.get(parents.size()-1);