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>
<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"
date="${buildDate}">
<Change>[Incident #77436] Fixing class cast Exception for FolderItem

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

@ -64,7 +64,7 @@ public class ItemBuilder {
}
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)
isFolder = true;
@ -138,7 +138,7 @@ public class ItemBuilder {
return null;
}
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();
@ -407,7 +407,7 @@ public class ItemBuilder {
*/
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;
}
@ -440,8 +440,8 @@ public class ItemBuilder {
protected static Map<String,String> getGcubePropertiesForItem(Item item) {
Map<String, String> itemMap = new HashMap<String, String>();
try {
Metadata metadata = item.getPropertyMap();
Map<String, Object> metadataMap = metadata.getValues();
Metadata metadata = item.getMetadata();
Map<String, Object> metadataMap = metadata.getMap();
for (String key : metadataMap.keySet()) {
String s = String.valueOf(metadataMap.get(key));
itemMap.put(key, s);
@ -483,7 +483,7 @@ public class ItemBuilder {
name = shared.isVreFolder() ? shared.getDisplayName() : shared.getTitle();
}
else {
FolderItem shared = (FolderItem) wsFolder;
FolderItem shared = wsFolder;
name = shared.getTitle();
}
//MANAGEMENT SPECIAL FOLDER
@ -508,7 +508,7 @@ public class ItemBuilder {
* @return true, if is special folder
*/
public static boolean isSpecialFolder(FolderItem wsFolder){
return (wsFolder.getName().compareTo(WorkspaceExplorerConstants.SPECIAL_FOLDERS_NAME) == 0);
return wsFolder.getName().compareTo(WorkspaceExplorerConstants.SPECIAL_FOLDERS_NAME) == 0;
}