From d7aabc10982ccb83ad214848535ee2d5c97abea7 Mon Sep 17 00:00:00 2001 From: Francesco Mangiacrapa Date: Mon, 5 Oct 2015 14:55:30 +0000 Subject: [PATCH] Fixed shared folder name git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/widgets/workspace-explorer@119383 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../wsexplorer/server/ItemBuilder.java | 24 ++++++++++++------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/src/main/java/org/gcube/portlets/widgets/wsexplorer/server/ItemBuilder.java b/src/main/java/org/gcube/portlets/widgets/wsexplorer/server/ItemBuilder.java index f801752..7c1069b 100644 --- a/src/main/java/org/gcube/portlets/widgets/wsexplorer/server/ItemBuilder.java +++ b/src/main/java/org/gcube/portlets/widgets/wsexplorer/server/ItemBuilder.java @@ -83,26 +83,32 @@ public class ItemBuilder { if (!showableTypes.contains(type)) return null; if (!filterItem(type, workspaceItem, filterCriteria)) return null; - String itemName = workspaceItem.getName(); - _log.info("Building Item for: "+itemName); - // //TODO ADD CONTROL ON THE PATH WHEN WILL BE MORE FAST // if (itemName.equals(WorkspaceExplorerConstants.SPECIAL_FOLDERS_LABEL)) // itemName = WorkspaceExplorerConstants.VRE_FOLDERS_LABEL; - boolean isFolder = false; - if(type.equals(ItemType.FOLDER)) - isFolder = true; + boolean isFolder = type.equals(ItemType.FOLDER)?true:false; + boolean isSharedFolder = workspaceItem.getType().equals(WorkspaceItemType.SHARED_FOLDER)?true:false; + + String itemName = workspaceItem.getName(); + + if(isSharedFolder){ + _log.debug("Is shared folder"); + WorkspaceSharedFolder shared = (WorkspaceSharedFolder) workspaceItem; + itemName = shared.isVreFolder()?shared.getDisplayName():workspaceItem.getName(); + } + + _log.debug("Building Item for: "+itemName); //TODO ADD GET PATH WHEN WILL BE MORE FAST Item item = new Item(parent, workspaceItem.getId(), itemName, type, "", UserUtil.getUserFullName(workspaceItem.getOwner().getPortalLogin()), isFolder, false); - item.setSharedFolder(workspaceItem.getType().equals(WorkspaceItemType.SHARED_FOLDER)); + item.setSharedFolder(isSharedFolder); if(loadChildren){ for (WorkspaceItem child: workspaceItem.getChildren()){ - _log.info("Converting child item: "+itemName); + _log.trace("Converting child item: "+itemName); Item itemChild = getItem(item, child, showableTypes, filterCriteria, false); - _log.info("Item: "+itemName +" converted!!!"); + _log.trace("Item: "+itemName +" converted!!!"); if (itemChild!=null){ item.addChild(itemChild); }