From 41de6d91419248d1adac70208659f489d0690ed5 Mon Sep 17 00:00:00 2001 From: Francesco Mangiacrapa Date: Fri, 30 Sep 2016 10:50:48 +0000 Subject: [PATCH] Fixed Bug #5218 Added Workspace root to the Breadcrumb git-svn-id: http://svn.d4science-ii.research-infrastructures.eu/gcube/trunk/portlets/user/workspace-tree-widget@132173 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../portlets/user/workspace/client/model/FileModel.java | 3 +-- .../user/workspace/client/view/windows/DialogGetInfo.java | 5 ++--- .../user/workspace/server/GWTWorkspaceServiceImpl.java | 2 +- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/model/FileModel.java b/src/main/java/org/gcube/portlets/user/workspace/client/model/FileModel.java index 342a914..05761f2 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/client/model/FileModel.java +++ b/src/main/java/org/gcube/portlets/user/workspace/client/model/FileModel.java @@ -9,7 +9,6 @@ import org.gcube.portlets.user.workspace.client.interfaces.GXTFolderItemTypeEnum import org.gcube.portlets.user.workspace.client.resources.Resources; import com.extjs.gxt.ui.client.data.BaseModelData; -import com.google.gwt.core.shared.GWT; import com.google.gwt.user.client.ui.AbstractImagePrototype; import com.google.gwt.user.client.ui.Image; @@ -294,7 +293,7 @@ public class FileModel extends BaseModelData implements Serializable { }else if(this.isShared()){ //IS A SHARED FOLDER? - GWT.log("setting icon "+this.getName()+" is shared: "+this.isShared() + ", this.isVreFolder() "+this.isVreFolder() +", this.isShareable() "+this.isShareable()); + //GWT.log("setting icon "+this.getName()+" is shared: "+this.isShared() + ", this.isVreFolder() "+this.isVreFolder() +", this.isShareable() "+this.isShareable()); if(this.isVreFolder()) absImgPr = Resources.getIconVREFolder(); diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/view/windows/DialogGetInfo.java b/src/main/java/org/gcube/portlets/user/workspace/client/view/windows/DialogGetInfo.java index 5702401..49abc58 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/client/view/windows/DialogGetInfo.java +++ b/src/main/java/org/gcube/portlets/user/workspace/client/view/windows/DialogGetInfo.java @@ -455,11 +455,10 @@ public class DialogGetInfo extends Dialog { public void onSuccess(List result) { String location=""; - if(result!=null){ - for (FileModel fileModel : result) { - location+="/"+fileModel.getName(); + if(fileModel!=null) + location+="/"+fileModel.getName(); } } if(location.isEmpty()) diff --git a/src/main/java/org/gcube/portlets/user/workspace/server/GWTWorkspaceServiceImpl.java b/src/main/java/org/gcube/portlets/user/workspace/server/GWTWorkspaceServiceImpl.java index b82c651..721473a 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/server/GWTWorkspaceServiceImpl.java +++ b/src/main/java/org/gcube/portlets/user/workspace/server/GWTWorkspaceServiceImpl.java @@ -1988,7 +1988,7 @@ public class GWTWorkspaceServiceImpl extends RemoteServiceServlet implements GWT FolderModel parent = null; if(includeItemAsParent){ WorkspaceFolder wsFolder1 =(WorkspaceFolder) workspace.getItem(itemIdentifier); //root - parent =builder.buildGXTFolderModelItemHandleSpecialFolder(wsFolder1, null, nameSpecialFolder); + parent = builder.buildGXTFolderModelItemHandleSpecialFolder(wsFolder1, null, nameSpecialFolder); } listParents.add(root); if(parent!=null)