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

interacting with new getMetadata provided by StorageHub 

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/widgets/workspace-explorer@175998 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Francesco Mangiacrapa 2018-12-18 16:57:36 +00:00
parent b02d6670dd
commit 07e82fa1eb
2 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
distro/changelog.xml
View File

@ -1,4 +1,9 @@
<ReleaseNotes> <ReleaseNotes>
<Changeset component="portlets-widgets.workspace-explorer.2-1-0"
date="${buildDate}">
<Change>Changed ItemBuilder to read the new method getMetadata
</Change>
</Changeset>
<Changeset component="portlets-widgets.workspace-explorer.2-0-1" <Changeset component="portlets-widgets.workspace-explorer.2-0-1"
date="${buildDate}"> date="${buildDate}">
<Change>[Incident #77436] Fixing class cast Exception for FolderItem <Change>[Incident #77436] Fixing class cast Exception for FolderItem

30
src/main/java/org/gcube/portlets/widgets/wsexplorer/server/ItemBuilder.java
View File

@ -50,8 +50,8 @@ public class ItemBuilder {
* @return the item * @return the item
* @throws InternalErrorException the internal error exception * @throws InternalErrorException the internal error exception
*/ */
public static org.gcube.portlets.widgets.wsexplorer.shared.Item getItem(org.gcube.portlets.widgets.wsexplorer.shared.Item parent, Item workspaceItem, String workspaceItemPath, public static org.gcube.portlets.widgets.wsexplorer.shared.Item getItem(org.gcube.portlets.widgets.wsexplorer.shared.Item parent, Item workspaceItem, String workspaceItemPath,
List<ItemType> showableTypes, FilterCriteria filterCriteria, List<ItemType> showableTypes, FilterCriteria filterCriteria,
boolean loadChildren, boolean loadGcubeProperties) { boolean loadChildren, boolean loadGcubeProperties) {
ItemType type = getItemType(workspaceItem); ItemType type = getItemType(workspaceItem);
@ -64,7 +64,7 @@ public class ItemBuilder {
} }
boolean isFolder = type.equals(ItemType.PRIVATE_FOLDER)?true:false; boolean isFolder = type.equals(ItemType.PRIVATE_FOLDER)?true:false;
boolean isSharedFolder = (type.equals(ItemType.SHARED_FOLDER) || type.equals(ItemType.VRE_FOLDER )) ? true : false; boolean isSharedFolder = type.equals(ItemType.SHARED_FOLDER) || type.equals(ItemType.VRE_FOLDER ) ? true : false;
if (isSharedFolder) if (isSharedFolder)
isFolder = true; isFolder = true;
@ -125,8 +125,8 @@ public class ItemBuilder {
* @return the item * @return the item
* @throws InternalErrorException the internal error exception * @throws InternalErrorException the internal error exception
*/ */
public static org.gcube.portlets.widgets.wsexplorer.shared.Item getItem(org.gcube.portlets.widgets.wsexplorer.shared.Item parent, Item workspaceItem, String workspaceItemPath, public static org.gcube.portlets.widgets.wsexplorer.shared.Item getItem(org.gcube.portlets.widgets.wsexplorer.shared.Item parent, Item workspaceItem, String workspaceItemPath,
List<ItemType> showableTypes, FilterCriteria filterCriteria, List<ItemType> showableTypes, FilterCriteria filterCriteria,
boolean loadChildren, boolean loadGcubeProperties, int startIdx, int limit) { boolean loadChildren, boolean loadGcubeProperties, int startIdx, int limit) {
ItemType type = getItemType(workspaceItem); ItemType type = getItemType(workspaceItem);
@ -138,7 +138,7 @@ public class ItemBuilder {
return null; return null;
} }
boolean isFolder = type.equals(ItemType.PRIVATE_FOLDER)?true:false; boolean isFolder = type.equals(ItemType.PRIVATE_FOLDER)?true:false;
boolean isSharedFolder = (type.equals(ItemType.SHARED_FOLDER) || type.equals(ItemType.VRE_FOLDER )) ? true : false; boolean isSharedFolder = type.equals(ItemType.SHARED_FOLDER) || type.equals(ItemType.VRE_FOLDER ) ? true : false;
String itemName = workspaceItem.getName(); String itemName = workspaceItem.getName();
@ -153,7 +153,7 @@ public class ItemBuilder {
org.gcube.portlets.widgets.wsexplorer.shared.Item item = null; org.gcube.portlets.widgets.wsexplorer.shared.Item item = null;
try{ try{
item = new org.gcube.portlets.widgets.wsexplorer.shared.Item( item = new org.gcube.portlets.widgets.wsexplorer.shared.Item(
parent, workspaceItem.getId(), itemName, type, workspaceItemPath, parent, workspaceItem.getId(), itemName, type, workspaceItemPath,
UserUtil.getUserFullName(workspaceItem.getOwner()), toDate(workspaceItem.getCreationTime()), isFolder, false); UserUtil.getUserFullName(workspaceItem.getOwner()), toDate(workspaceItem.getCreationTime()), isFolder, false);
item.setSharedFolder(isSharedFolder); item.setSharedFolder(isSharedFolder);
@ -203,7 +203,7 @@ public class ItemBuilder {
} }
/** /**
* *
* @param item * @param item
* @return the item type based on the extension of the file * @return the item type based on the extension of the file
*/ */
@ -279,7 +279,7 @@ public class ItemBuilder {
protected static ItemType getFolderItemType(Item item){ protected static ItemType getFolderItemType(Item item){
if (item instanceof SharedFolder || item instanceof VreFolder) { if (item instanceof SharedFolder || item instanceof VreFolder) {
SharedFolder folder = (SharedFolder) item; SharedFolder folder = (SharedFolder) item;
if (folder.isVreFolder()) if (folder.isVreFolder())
return ItemType.VRE_FOLDER; return ItemType.VRE_FOLDER;
return ItemType.SHARED_FOLDER; return ItemType.SHARED_FOLDER;
} else if (item instanceof FolderItem) { } else if (item instanceof FolderItem) {
@ -407,7 +407,7 @@ public class ItemBuilder {
*/ */
protected static boolean checkProperties(Item item, Map<String, String> requestedProperties) protected static boolean checkProperties(Item item, Map<String, String> requestedProperties)
{ {
if (requestedProperties==null || requestedProperties.size()==0 || (item instanceof FolderItem)) { if (requestedProperties==null || requestedProperties.size()==0 || item instanceof FolderItem) {
return true; return true;
} }
@ -440,8 +440,8 @@ public class ItemBuilder {
protected static Map<String,String> getGcubePropertiesForItem(Item item) { protected static Map<String,String> getGcubePropertiesForItem(Item item) {
Map<String, String> itemMap = new HashMap<String, String>(); Map<String, String> itemMap = new HashMap<String, String>();
try { try {
Metadata metadata = item.getPropertyMap(); Metadata metadata = item.getMetadata();
Map<String, Object> metadataMap = metadata.getValues(); Map<String, Object> metadataMap = metadata.getMap();
for (String key : metadataMap.keySet()) { for (String key : metadataMap.keySet()) {
String s = String.valueOf(metadataMap.get(key)); String s = String.valueOf(metadataMap.get(key));
itemMap.put(key, s); itemMap.put(key, s);
@ -481,9 +481,9 @@ public class ItemBuilder {
if (wsFolder instanceof SharedFolder) { if (wsFolder instanceof SharedFolder) {
SharedFolder shared = (SharedFolder) wsFolder; SharedFolder shared = (SharedFolder) wsFolder;
name = shared.isVreFolder() ? shared.getDisplayName() : shared.getTitle(); name = shared.isVreFolder() ? shared.getDisplayName() : shared.getTitle();
} }
else { else {
FolderItem shared = (FolderItem) wsFolder; FolderItem shared = wsFolder;
name = shared.getTitle(); name = shared.getTitle();
} }
//MANAGEMENT SPECIAL FOLDER //MANAGEMENT SPECIAL FOLDER
@ -508,7 +508,7 @@ public class ItemBuilder {
* @return true, if is special folder * @return true, if is special folder
*/ */
public static boolean isSpecialFolder(FolderItem wsFolder){ public static boolean isSpecialFolder(FolderItem wsFolder){
return (wsFolder.getName().compareTo(WorkspaceExplorerConstants.SPECIAL_FOLDERS_NAME) == 0); return wsFolder.getName().compareTo(WorkspaceExplorerConstants.SPECIAL_FOLDERS_NAME) == 0;
} }