gCubeSystem
/
workspace-explorer-app
15
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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
This commit is contained in:
Francesco Mangiacrapa 2016-11-10 11:31:25 +00:00
parent fab936d4f2
commit ec135ae7ee
3 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
distro/changelog.xml
View File

@ -1,4 +1,8 @@
<ReleaseNotes> <ReleaseNotes>
<Changeset component="org.gcube.portlets-user.workspace-explorer-app.1-0-0-1"
date="2016-11-10">
<Change>Bug Fix</Change>
</Changeset>
<Changeset component="org.gcube.portlets-user.workspace-explorer-app.1-0-0" <Changeset component="org.gcube.portlets-user.workspace-explorer-app.1-0-0"
date="2016-09-13"> date="2016-09-13">
<Change>first release</Change> <Change>first release</Change>

10
pom.xml
View File

@ -63,6 +63,14 @@
<dependencies> <dependencies>
<!-- TO RUN BY ECLIPSE SET THE FOLLOWING SCOPE AT COMPILE -->
<dependency>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
<version>2.9.1</version>
<scope>provided</scope>
</dependency>
<dependency> <dependency>
<groupId>com.google.gwt</groupId> <groupId>com.google.gwt</groupId>
<artifactId>gwt-user</artifactId> <artifactId>gwt-user</artifactId>
@ -204,7 +212,7 @@
<groupId>log4j</groupId> <groupId>log4j</groupId>
<artifactId>log4j</artifactId> <artifactId>log4j</artifactId>
<version>1.2.16</version> <version>1.2.16</version>
<scope>provided</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>

17
src/main/java/org/gcube/portlets/user/workspaceexplorerapp/server/WorkspaceExplorerAppServiceImpl.java
View File

@ -392,25 +392,20 @@ public class WorkspaceExplorerAppServiceImpl extends RemoteServiceServlet implem
parentLimit = parentLimit!=null?parentLimit:""; parentLimit = parentLimit!=null?parentLimit:"";
switch (parents.size()) { switch (parents.size()) {
case 0: //an error? case 0: // itemIdentifier is ROOT
logger.debug("There was an error? parents are 0"); logger.trace("itemIdentifier isRoot...");
return new ArrayList<Item>(1); if (includeItemAsParent) { //ADDIND ROOT
case 1: //itemIdentifier is ROOT - Parents include the ROOT WorkspaceFolder wsFolder =(WorkspaceFolder) wsItem;
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);
Item root = ItemBuilder.buildFolderForBreadcrumbs(wsFolder, null); Item root = ItemBuilder.buildFolderForBreadcrumbs(wsFolder, null);
List<Item> listParents = new ArrayList<Item>(1); List<Item> listParents = new ArrayList<Item>(1);
listParents.add(root); listParents.add(root);
// workspaceLogger.trace("returning: "+listParents.toString());
return listParents; return listParents;
} }
else{ else{
logger.debug("returning empty list"); logger.trace("returning empty list");
return new ArrayList<Item>(); // empty list return new ArrayList<Item>(); // empty list
} }
default:
break;
} }
WorkspaceItem lastItem = parents.get(parents.size()-1); WorkspaceItem lastItem = parents.get(parents.size()-1);