From 1123a92dad0fe60ea9e3c45aac685e254079ae93 Mon Sep 17 00:00:00 2001 From: Massimiliano Assante Date: Wed, 4 Jul 2018 14:34:36 +0000 Subject: [PATCH] removed file items in the tree only folder are shown git-svn-id: http://svn.d4science-ii.research-infrastructures.eu/gcube/trunk/portlets/user/workspace-tree-widget@169664 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../workspace/client/resources/Resources.java | 6 +- .../workspace/server/GWTWorkspaceBuilder.java | 1374 +++++++++-------- 2 files changed, 691 insertions(+), 689 deletions(-) diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/resources/Resources.java b/src/main/java/org/gcube/portlets/user/workspace/client/resources/Resources.java index 55ba7d6..3d01dad 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/client/resources/Resources.java +++ b/src/main/java/org/gcube/portlets/user/workspace/client/resources/Resources.java @@ -366,7 +366,7 @@ public class Resources { * @return the icon share user */ public static AbstractImagePrototype getIconShareUser(){ - return AbstractImagePrototype.create(StorageHubIconResources.INSTANCE.GROUP()); + return AbstractImagePrototype.create(StorageHubIconResources.INSTANCE.USER()); } /** @@ -1113,7 +1113,7 @@ public class Resources { * @return the icon un share folder */ public static AbstractImagePrototype getIconUnShareFolder() { - return AbstractImagePrototype.create(ICONS.unShareFolder()); + return AbstractImagePrototype.create(StorageHubIconResources.INSTANCE.UNSHARE()); } /** @@ -1122,7 +1122,7 @@ public class Resources { * @return the icon un share user */ public static AbstractImagePrototype getIconUnShareUser() { - return AbstractImagePrototype.create(ICONS.unShareUser()); + return AbstractImagePrototype.create(StorageHubIconResources.INSTANCE.UNSHARE()); } /** diff --git a/src/main/java/org/gcube/portlets/user/workspace/server/GWTWorkspaceBuilder.java b/src/main/java/org/gcube/portlets/user/workspace/server/GWTWorkspaceBuilder.java index 4b0eb64..3238a5e 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/server/GWTWorkspaceBuilder.java +++ b/src/main/java/org/gcube/portlets/user/workspace/server/GWTWorkspaceBuilder.java @@ -135,16 +135,16 @@ public class GWTWorkspaceBuilder { hashTestUser.put("francesco.mangiacrapa", new InfoContactModel("francesco.mangiacrapa", "francesco.mangiacrapa", "Francesco Mangiacrapa",false)); hashTestUser.put("massimiliano.assante", new InfoContactModel("massimiliano.assante", "massimiliano.assante", "Massimiliano Assante",false)); -// try{ -// logger.info("Sleeping for testing..."); -// Thread.sleep(30000); -// logger.info("Alive again"); -// }catch(Exception e){ -// -// } + // try{ + // logger.info("Sleeping for testing..."); + // Thread.sleep(30000); + // logger.info("Alive again"); + // }catch(Exception e){ + // + // } //GROUPS -// hashTestUser.put("/gcube/devsec/devVRE", new InfoContactModel("/gcube/devsec/devVRE", "/gcube/devsec/devVRE", "",true)); -// hashTestUser.put("/gcube/devsec/gcube-test-test", new InfoContactModel("/gcube/devsec/gcube-test-test", "/gcube/gcube-test-test", "",true)); + // hashTestUser.put("/gcube/devsec/devVRE", new InfoContactModel("/gcube/devsec/devVRE", "/gcube/devsec/devVRE", "",true)); + // hashTestUser.put("/gcube/devsec/gcube-test-test", new InfoContactModel("/gcube/devsec/gcube-test-test", "/gcube/gcube-test-test", "",true)); } return hashTestUser; @@ -186,7 +186,7 @@ public class GWTWorkspaceBuilder { protected Date toDateFormat(Calendar calendar) { SimpleDateFormat dateFormat = - new SimpleDateFormat("dd-MM, yyyy HH:mm:ss z"); + new SimpleDateFormat("dd-MM, yyyy HH:mm:ss z"); Date resultdate = getDate(calendar); try { resultdate = dateFormat.parse(dateFormat.format(resultdate)); @@ -228,7 +228,7 @@ public class GWTWorkspaceBuilder { protected GWTProperties buildGWTProperties(Properties metadata) throws InternalErrorException { //FIXME temp solution -// GWTProperties gwtProperties = new GWTProperties(metadata.getId(), metadata.getProperties()); + // GWTProperties gwtProperties = new GWTProperties(metadata.getId(), metadata.getProperties()); return new GWTProperties(); } @@ -280,8 +280,8 @@ public class GWTWorkspaceBuilder { sb.append(requestType.toString()); sb.append("&"+ConstantsExplorer.CURRENT_CONTEXT_ID+"="); sb.append(currentGroupId); -// sb.append("&"+ConstantsExplorer.CURRENT_USER_ID+"="); -// sb.append(currUserId); + // sb.append("&"+ConstantsExplorer.CURRENT_USER_ID+"="); + // sb.append(currUserId); sb.append("&random="); sb.append(UUID.randomUUID().toString()); return sb.toString(); @@ -305,7 +305,7 @@ public class GWTWorkspaceBuilder { GWTWorkspaceItem gwtImage; GWTProperties gwtProperties = buildGWTProperties(item.getProperties()); -// + // if(isInteralImage){ GCubeItem image = (GCubeItem) item; //Cast OLD Image Document @@ -431,31 +431,31 @@ public class GWTWorkspaceBuilder { if(isInternalUrl){ GCubeItem document = (GCubeItem) item; //Cast OLD UrlDocument -// UrlDocument document = (UrlDocument) item; //Cast + // UrlDocument document = (UrlDocument) item; //Cast List links = (List) new XStream().fromXML(document.getProperties().getPropertyValue(NodeProperty.ALTERNATIVES.toString())); List parts = (List) new XStream().fromXML(document.getProperties().getPropertyValue(NodeProperty.PARTS.toString())); Map metadatas = (Map) new XStream().fromXML(document.getProperties().getPropertyValue(NodeProperty.METADATA.toString())); Map gwtmetadatas = getMetadatas(metadatas, document.getId()); gwtUrl = new GWTUrlDocument( - toDate(document.getCreationTime()), - document.getId(), - gwtProperties, - document.getName(), - document.getOwner().getPortalLogin(), - document.getDescription(), - toDate(document.getLastModificationTime()), - GWTWorkspaceItemAction.valueOf(document.getLastAction().toString()), - null, - document.getLength(), - document.getProperties().getPropertyValue(NodeProperty.OID.toString()), - document.getMimeType(), - gwtmetadatas, - new LinkedHashMap(), - document.getProperties().getPropertyValue(NodeProperty.COLLECTION_NAME.toString()), - links.size(), - parts.size(), - document.getProperties().getPropertyValue(NodeProperty.URL.toString())); + toDate(document.getCreationTime()), + document.getId(), + gwtProperties, + document.getName(), + document.getOwner().getPortalLogin(), + document.getDescription(), + toDate(document.getLastModificationTime()), + GWTWorkspaceItemAction.valueOf(document.getLastAction().toString()), + null, + document.getLength(), + document.getProperties().getPropertyValue(NodeProperty.OID.toString()), + document.getMimeType(), + gwtmetadatas, + new LinkedHashMap(), + document.getProperties().getPropertyValue(NodeProperty.COLLECTION_NAME.toString()), + links.size(), + parts.size(), + document.getProperties().getPropertyValue(NodeProperty.URL.toString())); } else{ @@ -463,17 +463,17 @@ public class GWTWorkspaceBuilder { if(fullDetails){ gwtUrl = new GWTExternalUrl( - toDate(document.getCreationTime()), - document.getId(), - gwtProperties, - document.getName(), - document.getOwner().getPortalLogin(), - document.getDescription(), - toDate(document.getLastModificationTime()), - GWTWorkspaceItemAction.valueOf(document.getLastAction().toString()), - null, - document.getLength(), - document.getUrl()); + toDate(document.getCreationTime()), + document.getId(), + gwtProperties, + document.getName(), + document.getOwner().getPortalLogin(), + document.getDescription(), + toDate(document.getLastModificationTime()), + GWTWorkspaceItemAction.valueOf(document.getLastAction().toString()), + null, + document.getLength(), + document.getUrl()); } else gwtUrl = new GWTExternalUrl(document.getUrl()); @@ -541,36 +541,38 @@ public class GWTWorkspaceBuilder { * @return the list * @throws InternalErrorException the internal error exception */ - protected List buildGXTListFileModelItem(WorkspaceItem workspaceFolder, FileModel parentFolderModel) throws InternalErrorException - { + protected List buildGXTListFileModelItem(WorkspaceItem workspaceFolder, FileModel parentFolderModel) throws InternalErrorException { List listFileModel = new ArrayList(); + @SuppressWarnings("unchecked") List listItems = (List) workspaceFolder.getChildren(); if(listItems!=null) logger.trace("HL return "+listItems.size()+ " items, converting..."); //TEST TIME -// Long startTime = System.currentTimeMillis(); -// Long endTime = System.currentTimeMillis() - startTime; -// String time = String.format("%d msc %d sec", endTime, TimeUnit.MILLISECONDS.toSeconds(endTime)); -// logger.trace("tree getChildren() returning "+listItems.size()+" elements in " + time); -// startTime = System.currentTimeMillis(); + // Long startTime = System.currentTimeMillis(); + // Long endTime = System.currentTimeMillis() - startTime; + // String time = String.format("%d msc %d sec", endTime, TimeUnit.MILLISECONDS.toSeconds(endTime)); + // logger.trace("tree getChildren() returning "+listItems.size()+" elements in " + time); + // startTime = System.currentTimeMillis(); for (WorkspaceItem item : listItems){ - logger.debug("item: "+item.getName()+ "is root? " +item.isRoot()); - listFileModel.add(buildGXTFileModelItem(item,parentFolderModel)); + if (item.isFolder()) { + logger.debug("item: "+item.getName()+ "is root? " +item.isRoot()); + listFileModel.add(buildGXTFileModelItem(item,parentFolderModel)); + } } //TEST TIME -// endTime = System.currentTimeMillis() - startTime; -// time = String.format("%d msc %d sec", endTime, TimeUnit.MILLISECONDS.toSeconds(endTime)); -// logger.trace("tree gxt objects getChildren() returning "+listItems.size()+" elements in " + time); + // endTime = System.currentTimeMillis() - startTime; + // time = String.format("%d msc %d sec", endTime, TimeUnit.MILLISECONDS.toSeconds(endTime)); + // logger.trace("tree gxt objects getChildren() returning "+listItems.size()+" elements in " + time); return listFileModel; -// return buildGXTListFileModelItem((WorkspaceItem) workspaceFolder.getChildren(), parentFolderModel); + // return buildGXTListFileModelItem((WorkspaceItem) workspaceFolder.getChildren(), parentFolderModel); } @@ -592,29 +594,29 @@ public class GWTWorkspaceBuilder { switch (item.getType()) { - case FOLDER: fileModel = new FolderModel(item.getId(), item.getName(), true, false); - fileModel.setType(GXTFolderItemTypeEnum.FOLDER.getLabel()); - break; + case FOLDER: fileModel = new FolderModel(item.getId(), item.getName(), true, false); + fileModel.setType(GXTFolderItemTypeEnum.FOLDER.getLabel()); + break; - case FOLDER_ITEM: - fileModel = new FileModel(item.getId(), item.getName(), false); - FolderItem folderItem = (FolderItem) item; - fileModel = setFolderItemType(fileModel, folderItem); - break; + case FOLDER_ITEM: + fileModel = new FileModel(item.getId(), item.getName(), false); + FolderItem folderItem = (FolderItem) item; + fileModel = setFolderItemType(fileModel, folderItem); + break; - case SHARED_FOLDER: + case SHARED_FOLDER: - WorkspaceSharedFolder shared = (WorkspaceSharedFolder) item; - String name = shared.isVreFolder()?shared.getDisplayName():item.getName(); + WorkspaceSharedFolder shared = (WorkspaceSharedFolder) item; + String name = shared.isVreFolder()?shared.getDisplayName():item.getName(); - fileModel = new FolderModel(item.getId(), name, true, shared.isVreFolder()); - fileModel.setShared(true); - fileModel.setType(GXTFolderItemTypeEnum.FOLDER_SHARED.getLabel()); + fileModel = new FolderModel(item.getId(), name, true, shared.isVreFolder()); + fileModel.setShared(true); + fileModel.setType(GXTFolderItemTypeEnum.FOLDER_SHARED.getLabel()); - break; - default: - logger.error("gxt conversion return null for item "+item.getName()); - break; + break; + default: + logger.error("gxt conversion return null for item "+item.getName()); + break; } listFileModel.add(fileModel); @@ -685,7 +687,7 @@ public class GWTWorkspaceBuilder { */ protected FileModel buildGXTFileModelItem(WorkspaceItem item, FileModel parentFolderModel) throws InternalErrorException { -// logger.debug("buildGXTFileModelItem: "+item.getName()); + // logger.debug("buildGXTFileModelItem: "+item.getName()); FileModel fileModel = null; @@ -696,44 +698,44 @@ public class GWTWorkspaceBuilder { switch (item.getType()) { - case FOLDER: - boolean isPublic = ((WorkspaceFolder) item).isPublic(); - fileModel = new FolderModel(item.getId(), item.getName(), parentFolderModel, true, false, false, isPublic); - if(isPublic) - fileModel.setType(GXTFolderItemTypeEnum.FOLDER_PUBLIC.getLabel()); - else - fileModel.setType(GXTFolderItemTypeEnum.FOLDER.getLabel()); - + case FOLDER: + boolean isPublic = ((WorkspaceFolder) item).isPublic(); + fileModel = new FolderModel(item.getId(), item.getName(), parentFolderModel, true, false, false, isPublic); + if(isPublic) + fileModel.setType(GXTFolderItemTypeEnum.FOLDER_PUBLIC.getLabel()); + else fileModel.setType(GXTFolderItemTypeEnum.FOLDER.getLabel()); - fileModel.setShareable(true); - fileModel.setDescription(item.getDescription()); - break; - case FOLDER_ITEM: + fileModel.setType(GXTFolderItemTypeEnum.FOLDER.getLabel()); + fileModel.setShareable(true); + fileModel.setDescription(item.getDescription()); + break; - fileModel = new FileModel(item.getId(), item.getName(), parentFolderModel, false, false); - FolderItem folderItem = (FolderItem) item; - fileModel = setFolderItemType(fileModel, folderItem); - fileModel.setShareable(true); - break; + case FOLDER_ITEM: - case SHARED_FOLDER: - WorkspaceSharedFolder shared = (WorkspaceSharedFolder) item; - isPublic = ((WorkspaceFolder) shared).isPublic(); - String name = shared.isVreFolder()?shared.getDisplayName():item.getName(); - fileModel = new FolderModel(item.getId(), name, parentFolderModel, true, true, shared.isVreFolder(), isPublic); - if(isPublic) - fileModel.setType(GXTFolderItemTypeEnum.FOLDER_SHARED_PUBLIC.toString()); - else - fileModel.setType(GXTFolderItemTypeEnum.FOLDER_SHARED.toString()); + fileModel = new FileModel(item.getId(), item.getName(), parentFolderModel, false, false); + FolderItem folderItem = (FolderItem) item; + fileModel = setFolderItemType(fileModel, folderItem); + fileModel.setShareable(true); + break; - fileModel.setShareable(true); - fileModel.setDescription(item.getDescription()); - break; + case SHARED_FOLDER: + WorkspaceSharedFolder shared = (WorkspaceSharedFolder) item; + isPublic = ((WorkspaceFolder) shared).isPublic(); + String name = shared.isVreFolder()?shared.getDisplayName():item.getName(); + fileModel = new FolderModel(item.getId(), name, parentFolderModel, true, true, shared.isVreFolder(), isPublic); + if(isPublic) + fileModel.setType(GXTFolderItemTypeEnum.FOLDER_SHARED_PUBLIC.toString()); + else + fileModel.setType(GXTFolderItemTypeEnum.FOLDER_SHARED.toString()); - default: - logger.error("gxt conversion return null for item "+item.getName()); - break; + fileModel.setShareable(true); + fileModel.setDescription(item.getDescription()); + break; + + default: + logger.error("gxt conversion return null for item "+item.getName()); + break; } @@ -763,7 +765,7 @@ public class GWTWorkspaceBuilder { List listFileGridModel = new ArrayList(); FileModel parentFileModel = null; for (SearchItem item : listSearchItems) - listFileGridModel.add(buildGXTFileGridModelItemForSearch(item,parentFileModel)); + listFileGridModel.add(buildGXTFileGridModelItemForSearch(item,parentFileModel)); return listFileGridModel; } @@ -850,7 +852,7 @@ public class GWTWorkspaceBuilder { List listFileGridModel = new ArrayList(); for (WorkspaceItem item : listWorkspaceItems) - listFileGridModel.add(buildGXTFileGridModelItem(item,parentFileModel)); + listFileGridModel.add(buildGXTFileGridModelItem(item,parentFileModel)); Long endTime = System.currentTimeMillis() - startTime; String time = String.format("%d msc %d sec", endTime, TimeUnit.MILLISECONDS.toSeconds(endTime)); @@ -872,78 +874,78 @@ public class GWTWorkspaceBuilder { FileGridModel fileGridModel = null; - switch (item.getType()) { + switch (item.getType()) { - case FOLDER: - boolean isPublic = ((WorkspaceFolder)item).isPublic(); - fileGridModel = new FolderGridModel(item.getId(), item.getName(), toDate(item.getLastModificationTime()), parentFileModel, -1, true, false,false, isPublic); - if(isPublic) - fileGridModel.setType(GXTFolderItemTypeEnum.FOLDER_PUBLIC.getLabel().toString()); - else - fileGridModel.setType(GXTFolderItemTypeEnum.FOLDER.getLabel().toString()); + case FOLDER: + boolean isPublic = ((WorkspaceFolder)item).isPublic(); + fileGridModel = new FolderGridModel(item.getId(), item.getName(), toDate(item.getLastModificationTime()), parentFileModel, -1, true, false,false, isPublic); + if(isPublic) + fileGridModel.setType(GXTFolderItemTypeEnum.FOLDER_PUBLIC.getLabel().toString()); + else + fileGridModel.setType(GXTFolderItemTypeEnum.FOLDER.getLabel().toString()); - fileGridModel.setShortcutCategory(GXTCategorySmartFolder.SMF_FOLDERS); - fileGridModel.setShareable(true); - fileGridModel.setDescription(item.getDescription()); - break; + fileGridModel.setShortcutCategory(GXTCategorySmartFolder.SMF_FOLDERS); + fileGridModel.setShareable(true); + fileGridModel.setDescription(item.getDescription()); + break; - case FOLDER_ITEM: - FolderItem folderItem = (FolderItem) item; - fileGridModel = new FileGridModel(item.getId(), item.getName(), toDate(item.getLastModificationTime()), parentFileModel, folderItem.getLength(), false, false); - fileGridModel = (FileGridModel) setFolderItemType(fileGridModel, folderItem); + case FOLDER_ITEM: + FolderItem folderItem = (FolderItem) item; + fileGridModel = new FileGridModel(item.getId(), item.getName(), toDate(item.getLastModificationTime()), parentFileModel, folderItem.getLength(), false, false); + fileGridModel = (FileGridModel) setFolderItemType(fileGridModel, folderItem); - //ADDING VERSION NAME -// if (folderItem instanceof ExternalFile){ -// -// ExternalFile extFile = (ExternalFile) folderItem; -// WorkspaceVersion version = extFile.getCurrentVersion(); -// fileGridModel.setVersionName(version!=null?version.getName():null); -// } + //ADDING VERSION NAME + // if (folderItem instanceof ExternalFile){ + // + // ExternalFile extFile = (ExternalFile) folderItem; + // WorkspaceVersion version = extFile.getCurrentVersion(); + // fileGridModel.setVersionName(version!=null?version.getName():null); + // } - break; + break; - case SHARED_FOLDER: - WorkspaceSharedFolder shared = (WorkspaceSharedFolder) item; - isPublic = ((WorkspaceFolder)shared).isPublic(); - String name = shared.isVreFolder()?shared.getDisplayName():item.getName(); - fileGridModel = new FolderGridModel(item.getId(), name, toDate(item.getLastModificationTime()), parentFileModel, -1, true, true, shared.isVreFolder(), isPublic); + case SHARED_FOLDER: + WorkspaceSharedFolder shared = (WorkspaceSharedFolder) item; + isPublic = ((WorkspaceFolder)shared).isPublic(); + String name = shared.isVreFolder()?shared.getDisplayName():item.getName(); + fileGridModel = new FolderGridModel(item.getId(), name, toDate(item.getLastModificationTime()), parentFileModel, -1, true, true, shared.isVreFolder(), isPublic); - if(isPublic) - fileGridModel.setType(GXTFolderItemTypeEnum.FOLDER_SHARED_PUBLIC.getLabel().toString()); - else - fileGridModel.setType(GXTFolderItemTypeEnum.FOLDER_SHARED.getLabel().toString()); + if(isPublic) + fileGridModel.setType(GXTFolderItemTypeEnum.FOLDER_SHARED_PUBLIC.getLabel().toString()); + else + fileGridModel.setType(GXTFolderItemTypeEnum.FOLDER_SHARED.getLabel().toString()); - fileGridModel.setShortcutCategory(GXTCategorySmartFolder.SMF_SHARED_FOLDERS); - fileGridModel.setShareable(true); - fileGridModel.setDescription(item.getDescription()); - break; + fileGridModel.setShortcutCategory(GXTCategorySmartFolder.SMF_SHARED_FOLDERS); + fileGridModel.setShareable(true); + fileGridModel.setDescription(item.getDescription()); + break; - default: - logger.error("gxt conversion return null for item "+item.getName()); - break; + default: + logger.error("gxt conversion return null for item "+item.getName()); + break; + } + + if(parentFileModel!=null && parentFileModel.isShared()){ + fileGridModel.setShared(true); + fileGridModel.setShareable(false); //UPDATED TO CHANGE PERMISSIONS TO SHARED SUBFOLDERS + } + + //OWNER + if(item.isShared()){ //IS READ FROM HL ONLY IF THE ITEM IS SHARED + fileGridModel.setShared(true); //NOT REMOVE IT IS IMPORTAT SEE #1459 + User owner = item.getOwner(); + if(owner!=null){ + // System.out.println("++++reading owner"); + String portalLogin = owner.getPortalLogin(); + fileGridModel.setOwnerFullName(UserUtil.getUserFullName(portalLogin)); } - - if(parentFileModel!=null && parentFileModel.isShared()){ - fileGridModel.setShared(true); - fileGridModel.setShareable(false); //UPDATED TO CHANGE PERMISSIONS TO SHARED SUBFOLDERS - } - - //OWNER - if(item.isShared()){ //IS READ FROM HL ONLY IF THE ITEM IS SHARED - fileGridModel.setShared(true); //NOT REMOVE IT IS IMPORTAT SEE #1459 - User owner = item.getOwner(); - if(owner!=null){ -// System.out.println("++++reading owner"); - String portalLogin = owner.getPortalLogin(); - fileGridModel.setOwnerFullName(UserUtil.getUserFullName(portalLogin)); - } - } - else{ - if(userLogged!=null) -// fileGridModel.setOwner(new InfoContactModel(userLogged.getId(), userLogged.getLogin(), userLogged.getName())); - fileGridModel.setOwnerFullName(userLogged.getName()); - } + } + else{ + if(userLogged!=null) + // fileGridModel.setOwner(new InfoContactModel(userLogged.getId(), userLogged.getLogin(), userLogged.getName())); + fileGridModel.setOwnerFullName(userLogged.getName()); + } setSynchedThreddsStateFor(fileGridModel, scope, userLogged.getLogin()); return fileGridModel; @@ -961,78 +963,78 @@ public class GWTWorkspaceBuilder { if(searchFolderItem.getFolderItemType()==null){ logger.trace("Search folder item type is null for "+searchFolderItem.getId() + " name: "+searchFolderItem.getName()); //FOR DEBUG -// System.out.println("Search folder item type is null for "+searchFolderItem.getId() + " name: "+searchFolderItem.getName()); + // System.out.println("Search folder item type is null for "+searchFolderItem.getId() + " name: "+searchFolderItem.getName()); return fileModel; } switch(searchFolderItem.getFolderItemType()) { - case EXTERNAL_IMAGE: - fileModel.setFolderItemType(GXTFolderItemTypeEnum.EXTERNAL_IMAGE); - fileModel.setShortcutCategory(GXTCategorySmartFolder.SMF_IMAGES); - fileModel.setType(searchFolderItem.getMimeType()); - break; - case EXTERNAL_FILE: - fileModel.setFolderItemType(GXTFolderItemTypeEnum.EXTERNAL_FILE); - fileModel.setShortcutCategory(GXTCategorySmartFolder.SMF_DOCUMENTS); - fileModel.setType(searchFolderItem.getMimeType()); - break; - case EXTERNAL_PDF_FILE: - fileModel.setFolderItemType(GXTFolderItemTypeEnum.EXTERNAL_PDF_FILE); - fileModel.setShortcutCategory(GXTCategorySmartFolder.SMF_DOCUMENTS); - fileModel.setType(searchFolderItem.getMimeType()); - break; - case EXTERNAL_URL: - fileModel.setFolderItemType(GXTFolderItemTypeEnum.EXTERNAL_URL); - fileModel.setShortcutCategory(GXTCategorySmartFolder.SMF_LINKS); - break; - case REPORT_TEMPLATE: - fileModel.setFolderItemType(GXTFolderItemTypeEnum.REPORT_TEMPLATE); - fileModel.setShortcutCategory(GXTCategorySmartFolder.SMF_REPORTS); - break; - case REPORT: - fileModel.setFolderItemType(GXTFolderItemTypeEnum.REPORT); - fileModel.setShortcutCategory(GXTCategorySmartFolder.SMF_REPORTS); - break; - case QUERY: - fileModel.setFolderItemType(GXTFolderItemTypeEnum.QUERY); - fileModel.setShortcutCategory(GXTCategorySmartFolder.SMF_DOCUMENTS); - break; - case TIME_SERIES: - fileModel.setFolderItemType(GXTFolderItemTypeEnum.TIME_SERIES); - fileModel.setShortcutCategory(GXTCategorySmartFolder.SMF_TIMESERIES); - break; - case PDF_DOCUMENT: - fileModel.setFolderItemType(GXTFolderItemTypeEnum.PDF_DOCUMENT); - fileModel.setShortcutCategory(GXTCategorySmartFolder.SMF_DOCUMENTS); - break; - case IMAGE_DOCUMENT: - fileModel.setFolderItemType(GXTFolderItemTypeEnum.IMAGE_DOCUMENT); - fileModel.setShortcutCategory(GXTCategorySmartFolder.SMF_IMAGES); - fileModel.setType(searchFolderItem.getMimeType()); - break; - case DOCUMENT: - fileModel.setFolderItemType(GXTFolderItemTypeEnum.DOCUMENT); - fileModel.setShortcutCategory(GXTCategorySmartFolder.SMF_DOCUMENTS); - fileModel.setType(searchFolderItem.getMimeType()); - break; - case URL_DOCUMENT: - fileModel.setFolderItemType(GXTFolderItemTypeEnum.URL_DOCUMENT); - fileModel.setShortcutCategory(GXTCategorySmartFolder.SMF_DOCUMENTS); - break; - case METADATA: - fileModel.setFolderItemType(GXTFolderItemTypeEnum.METADATA); - fileModel.setShortcutCategory(GXTCategorySmartFolder.SMF_DOCUMENTS); - break; - case GCUBE_ITEM: - fileModel.setFolderItemType(GXTFolderItemTypeEnum.GCUBE_ITEM); - fileModel.setShortcutCategory(GXTCategorySmartFolder.SMF_GCUBE_ITEMS); - break; - default: - fileModel.setFolderItemType(GXTFolderItemTypeEnum.UNKNOWN_TYPE); - fileModel.setShortcutCategory(GXTCategorySmartFolder.SMF_UNKNOWN); - fileModel.setType(GXTFolderItemTypeEnum.UNKNOWN_TYPE.toString()); - break; + case EXTERNAL_IMAGE: + fileModel.setFolderItemType(GXTFolderItemTypeEnum.EXTERNAL_IMAGE); + fileModel.setShortcutCategory(GXTCategorySmartFolder.SMF_IMAGES); + fileModel.setType(searchFolderItem.getMimeType()); + break; + case EXTERNAL_FILE: + fileModel.setFolderItemType(GXTFolderItemTypeEnum.EXTERNAL_FILE); + fileModel.setShortcutCategory(GXTCategorySmartFolder.SMF_DOCUMENTS); + fileModel.setType(searchFolderItem.getMimeType()); + break; + case EXTERNAL_PDF_FILE: + fileModel.setFolderItemType(GXTFolderItemTypeEnum.EXTERNAL_PDF_FILE); + fileModel.setShortcutCategory(GXTCategorySmartFolder.SMF_DOCUMENTS); + fileModel.setType(searchFolderItem.getMimeType()); + break; + case EXTERNAL_URL: + fileModel.setFolderItemType(GXTFolderItemTypeEnum.EXTERNAL_URL); + fileModel.setShortcutCategory(GXTCategorySmartFolder.SMF_LINKS); + break; + case REPORT_TEMPLATE: + fileModel.setFolderItemType(GXTFolderItemTypeEnum.REPORT_TEMPLATE); + fileModel.setShortcutCategory(GXTCategorySmartFolder.SMF_REPORTS); + break; + case REPORT: + fileModel.setFolderItemType(GXTFolderItemTypeEnum.REPORT); + fileModel.setShortcutCategory(GXTCategorySmartFolder.SMF_REPORTS); + break; + case QUERY: + fileModel.setFolderItemType(GXTFolderItemTypeEnum.QUERY); + fileModel.setShortcutCategory(GXTCategorySmartFolder.SMF_DOCUMENTS); + break; + case TIME_SERIES: + fileModel.setFolderItemType(GXTFolderItemTypeEnum.TIME_SERIES); + fileModel.setShortcutCategory(GXTCategorySmartFolder.SMF_TIMESERIES); + break; + case PDF_DOCUMENT: + fileModel.setFolderItemType(GXTFolderItemTypeEnum.PDF_DOCUMENT); + fileModel.setShortcutCategory(GXTCategorySmartFolder.SMF_DOCUMENTS); + break; + case IMAGE_DOCUMENT: + fileModel.setFolderItemType(GXTFolderItemTypeEnum.IMAGE_DOCUMENT); + fileModel.setShortcutCategory(GXTCategorySmartFolder.SMF_IMAGES); + fileModel.setType(searchFolderItem.getMimeType()); + break; + case DOCUMENT: + fileModel.setFolderItemType(GXTFolderItemTypeEnum.DOCUMENT); + fileModel.setShortcutCategory(GXTCategorySmartFolder.SMF_DOCUMENTS); + fileModel.setType(searchFolderItem.getMimeType()); + break; + case URL_DOCUMENT: + fileModel.setFolderItemType(GXTFolderItemTypeEnum.URL_DOCUMENT); + fileModel.setShortcutCategory(GXTCategorySmartFolder.SMF_DOCUMENTS); + break; + case METADATA: + fileModel.setFolderItemType(GXTFolderItemTypeEnum.METADATA); + fileModel.setShortcutCategory(GXTCategorySmartFolder.SMF_DOCUMENTS); + break; + case GCUBE_ITEM: + fileModel.setFolderItemType(GXTFolderItemTypeEnum.GCUBE_ITEM); + fileModel.setShortcutCategory(GXTCategorySmartFolder.SMF_GCUBE_ITEMS); + break; + default: + fileModel.setFolderItemType(GXTFolderItemTypeEnum.UNKNOWN_TYPE); + fileModel.setShortcutCategory(GXTCategorySmartFolder.SMF_UNKNOWN); + fileModel.setType(GXTFolderItemTypeEnum.UNKNOWN_TYPE.toString()); + break; } return fileModel; @@ -1049,87 +1051,87 @@ public class GWTWorkspaceBuilder { switch(worspaceFolderItem.getFolderItemType()) { - case EXTERNAL_IMAGE: - fileModel.setFolderItemType(GXTFolderItemTypeEnum.EXTERNAL_IMAGE); - fileModel.setShortcutCategory(GXTCategorySmartFolder.SMF_IMAGES); - ExternalImage extImage = (ExternalImage) worspaceFolderItem; - fileModel.setType(extImage.getMimeType()); - break; - case EXTERNAL_FILE: - fileModel.setFolderItemType(GXTFolderItemTypeEnum.EXTERNAL_FILE); - fileModel.setShortcutCategory(GXTCategorySmartFolder.SMF_DOCUMENTS); - ExternalFile extFile = (ExternalFile) worspaceFolderItem; - fileModel.setType(extFile.getMimeType()); - break; - case EXTERNAL_PDF_FILE: - fileModel.setFolderItemType(GXTFolderItemTypeEnum.EXTERNAL_PDF_FILE); - fileModel.setShortcutCategory(GXTCategorySmartFolder.SMF_DOCUMENTS); - ExternalPDFFile pdfExt = (ExternalPDFFile) worspaceFolderItem; - fileModel.setType(pdfExt.getMimeType()); - break; - case EXTERNAL_URL: - fileModel.setFolderItemType(GXTFolderItemTypeEnum.EXTERNAL_URL); - fileModel.setShortcutCategory(GXTCategorySmartFolder.SMF_LINKS); - break; - case REPORT_TEMPLATE: - fileModel.setFolderItemType(GXTFolderItemTypeEnum.REPORT_TEMPLATE); - fileModel.setShortcutCategory(GXTCategorySmartFolder.SMF_REPORTS); - break; - case REPORT: - fileModel.setFolderItemType(GXTFolderItemTypeEnum.REPORT); - fileModel.setShortcutCategory(GXTCategorySmartFolder.SMF_REPORTS); - break; - case QUERY: - fileModel.setFolderItemType(GXTFolderItemTypeEnum.QUERY); - fileModel.setShortcutCategory(GXTCategorySmartFolder.SMF_DOCUMENTS); - break; - case TIME_SERIES: - fileModel.setFolderItemType(GXTFolderItemTypeEnum.TIME_SERIES); - fileModel.setShortcutCategory(GXTCategorySmartFolder.SMF_TIMESERIES); - break; - case PDF_DOCUMENT: - fileModel.setFolderItemType(GXTFolderItemTypeEnum.PDF_DOCUMENT); - fileModel.setShortcutCategory(GXTCategorySmartFolder.SMF_DOCUMENTS); - break; - case IMAGE_DOCUMENT: - fileModel.setFolderItemType(GXTFolderItemTypeEnum.IMAGE_DOCUMENT); - fileModel.setShortcutCategory(GXTCategorySmartFolder.SMF_IMAGES); -// ImageDocument imgDoc = (ImageDocument) worspaceFolderItem; - GCubeItem imgDoc = (GCubeItem) worspaceFolderItem; //Cast GCubeItem - try { - fileModel.setType(imgDoc.getMimeType()); - } catch (InternalErrorException e) { - logger.error("IMAGE_DOCUMENT InternalErrorException when getting MimeType on "+fileModel.getIdentifier()); - } - break; - case DOCUMENT: - fileModel.setFolderItemType(GXTFolderItemTypeEnum.DOCUMENT); - fileModel.setShortcutCategory(GXTCategorySmartFolder.SMF_DOCUMENTS); -// Document doc = (Document) worspaceFolderItem; - GCubeItem doc = (GCubeItem) worspaceFolderItem; //Cast GCubeItem - try { - fileModel.setType(doc.getMimeType()); - } catch (InternalErrorException e) { - logger.error("DOCUMENT InternalErrorException when getting MimeType on "+fileModel.getIdentifier()); - } - break; - case URL_DOCUMENT: - fileModel.setFolderItemType(GXTFolderItemTypeEnum.URL_DOCUMENT); - fileModel.setShortcutCategory(GXTCategorySmartFolder.SMF_DOCUMENTS); - break; - case METADATA: - fileModel.setFolderItemType(GXTFolderItemTypeEnum.METADATA); - fileModel.setShortcutCategory(GXTCategorySmartFolder.SMF_DOCUMENTS); - break; - case GCUBE_ITEM: - fileModel.setFolderItemType(GXTFolderItemTypeEnum.GCUBE_ITEM); - fileModel.setShortcutCategory(GXTCategorySmartFolder.SMF_GCUBE_ITEMS); - break; - default: - fileModel.setFolderItemType(GXTFolderItemTypeEnum.UNKNOWN_TYPE); - fileModel.setShortcutCategory(GXTCategorySmartFolder.SMF_UNKNOWN); - fileModel.setType(GXTFolderItemTypeEnum.UNKNOWN_TYPE.toString()); - break; + case EXTERNAL_IMAGE: + fileModel.setFolderItemType(GXTFolderItemTypeEnum.EXTERNAL_IMAGE); + fileModel.setShortcutCategory(GXTCategorySmartFolder.SMF_IMAGES); + ExternalImage extImage = (ExternalImage) worspaceFolderItem; + fileModel.setType(extImage.getMimeType()); + break; + case EXTERNAL_FILE: + fileModel.setFolderItemType(GXTFolderItemTypeEnum.EXTERNAL_FILE); + fileModel.setShortcutCategory(GXTCategorySmartFolder.SMF_DOCUMENTS); + ExternalFile extFile = (ExternalFile) worspaceFolderItem; + fileModel.setType(extFile.getMimeType()); + break; + case EXTERNAL_PDF_FILE: + fileModel.setFolderItemType(GXTFolderItemTypeEnum.EXTERNAL_PDF_FILE); + fileModel.setShortcutCategory(GXTCategorySmartFolder.SMF_DOCUMENTS); + ExternalPDFFile pdfExt = (ExternalPDFFile) worspaceFolderItem; + fileModel.setType(pdfExt.getMimeType()); + break; + case EXTERNAL_URL: + fileModel.setFolderItemType(GXTFolderItemTypeEnum.EXTERNAL_URL); + fileModel.setShortcutCategory(GXTCategorySmartFolder.SMF_LINKS); + break; + case REPORT_TEMPLATE: + fileModel.setFolderItemType(GXTFolderItemTypeEnum.REPORT_TEMPLATE); + fileModel.setShortcutCategory(GXTCategorySmartFolder.SMF_REPORTS); + break; + case REPORT: + fileModel.setFolderItemType(GXTFolderItemTypeEnum.REPORT); + fileModel.setShortcutCategory(GXTCategorySmartFolder.SMF_REPORTS); + break; + case QUERY: + fileModel.setFolderItemType(GXTFolderItemTypeEnum.QUERY); + fileModel.setShortcutCategory(GXTCategorySmartFolder.SMF_DOCUMENTS); + break; + case TIME_SERIES: + fileModel.setFolderItemType(GXTFolderItemTypeEnum.TIME_SERIES); + fileModel.setShortcutCategory(GXTCategorySmartFolder.SMF_TIMESERIES); + break; + case PDF_DOCUMENT: + fileModel.setFolderItemType(GXTFolderItemTypeEnum.PDF_DOCUMENT); + fileModel.setShortcutCategory(GXTCategorySmartFolder.SMF_DOCUMENTS); + break; + case IMAGE_DOCUMENT: + fileModel.setFolderItemType(GXTFolderItemTypeEnum.IMAGE_DOCUMENT); + fileModel.setShortcutCategory(GXTCategorySmartFolder.SMF_IMAGES); + // ImageDocument imgDoc = (ImageDocument) worspaceFolderItem; + GCubeItem imgDoc = (GCubeItem) worspaceFolderItem; //Cast GCubeItem + try { + fileModel.setType(imgDoc.getMimeType()); + } catch (InternalErrorException e) { + logger.error("IMAGE_DOCUMENT InternalErrorException when getting MimeType on "+fileModel.getIdentifier()); + } + break; + case DOCUMENT: + fileModel.setFolderItemType(GXTFolderItemTypeEnum.DOCUMENT); + fileModel.setShortcutCategory(GXTCategorySmartFolder.SMF_DOCUMENTS); + // Document doc = (Document) worspaceFolderItem; + GCubeItem doc = (GCubeItem) worspaceFolderItem; //Cast GCubeItem + try { + fileModel.setType(doc.getMimeType()); + } catch (InternalErrorException e) { + logger.error("DOCUMENT InternalErrorException when getting MimeType on "+fileModel.getIdentifier()); + } + break; + case URL_DOCUMENT: + fileModel.setFolderItemType(GXTFolderItemTypeEnum.URL_DOCUMENT); + fileModel.setShortcutCategory(GXTCategorySmartFolder.SMF_DOCUMENTS); + break; + case METADATA: + fileModel.setFolderItemType(GXTFolderItemTypeEnum.METADATA); + fileModel.setShortcutCategory(GXTCategorySmartFolder.SMF_DOCUMENTS); + break; + case GCUBE_ITEM: + fileModel.setFolderItemType(GXTFolderItemTypeEnum.GCUBE_ITEM); + fileModel.setShortcutCategory(GXTCategorySmartFolder.SMF_GCUBE_ITEMS); + break; + default: + fileModel.setFolderItemType(GXTFolderItemTypeEnum.UNKNOWN_TYPE); + fileModel.setShortcutCategory(GXTCategorySmartFolder.SMF_UNKNOWN); + fileModel.setType(GXTFolderItemTypeEnum.UNKNOWN_TYPE.toString()); + break; } return fileModel; @@ -1149,35 +1151,35 @@ public class GWTWorkspaceBuilder { try{ switch(worspaceFolderItem.getFolderItemType()){ - case EXTERNAL_IMAGE: - return ((ExternalImage) worspaceFolderItem).getPublicLink(); - case EXTERNAL_FILE: - return ((ExternalFile) worspaceFolderItem).getPublicLink(); - case EXTERNAL_PDF_FILE: - return ((ExternalPDFFile) worspaceFolderItem).getPublicLink(); - case EXTERNAL_URL: - break; - case REPORT_TEMPLATE: - break; - case REPORT: - break; - case QUERY: - break; - case TIME_SERIES: - break; - case PDF_DOCUMENT: - break; - case IMAGE_DOCUMENT: - GCubeItem imgDoc = (GCubeItem) worspaceFolderItem; //Cast GCubeItem - return imgDoc.getPublicLink(false); - case DOCUMENT: - break; - case URL_DOCUMENT: - break; - case METADATA: - break; - default: - return ""; + case EXTERNAL_IMAGE: + return ((ExternalImage) worspaceFolderItem).getPublicLink(); + case EXTERNAL_FILE: + return ((ExternalFile) worspaceFolderItem).getPublicLink(); + case EXTERNAL_PDF_FILE: + return ((ExternalPDFFile) worspaceFolderItem).getPublicLink(); + case EXTERNAL_URL: + break; + case REPORT_TEMPLATE: + break; + case REPORT: + break; + case QUERY: + break; + case TIME_SERIES: + break; + case PDF_DOCUMENT: + break; + case IMAGE_DOCUMENT: + GCubeItem imgDoc = (GCubeItem) worspaceFolderItem; //Cast GCubeItem + return imgDoc.getPublicLink(false); + case DOCUMENT: + break; + case URL_DOCUMENT: + break; + case METADATA: + break; + default: + return ""; } }catch (Exception e) { @@ -1204,35 +1206,35 @@ public class GWTWorkspaceBuilder { try{ switch(worspaceFolderItem.getFolderItemType()){ - case EXTERNAL_IMAGE: - return ((ExternalImage) worspaceFolderItem).getStorageID(); - case EXTERNAL_FILE: - return ((ExternalFile) worspaceFolderItem).getStorageID(); - case EXTERNAL_PDF_FILE: - return ((ExternalPDFFile) worspaceFolderItem).getStorageID(); - case EXTERNAL_URL: - break; - case REPORT_TEMPLATE: - break; - case REPORT: - break; - case QUERY: - break; - case TIME_SERIES: - break; - case PDF_DOCUMENT: - break; - case IMAGE_DOCUMENT: - GCubeItem imgDoc = (GCubeItem) worspaceFolderItem; //Cast GCubeItem - return imgDoc.getStorageID(); - case DOCUMENT: - break; - case URL_DOCUMENT: - break; - case METADATA: - break; - default: - return ""; + case EXTERNAL_IMAGE: + return ((ExternalImage) worspaceFolderItem).getStorageID(); + case EXTERNAL_FILE: + return ((ExternalFile) worspaceFolderItem).getStorageID(); + case EXTERNAL_PDF_FILE: + return ((ExternalPDFFile) worspaceFolderItem).getStorageID(); + case EXTERNAL_URL: + break; + case REPORT_TEMPLATE: + break; + case REPORT: + break; + case QUERY: + break; + case TIME_SERIES: + break; + case PDF_DOCUMENT: + break; + case IMAGE_DOCUMENT: + GCubeItem imgDoc = (GCubeItem) worspaceFolderItem; //Cast GCubeItem + return imgDoc.getStorageID(); + case DOCUMENT: + break; + case URL_DOCUMENT: + break; + case METADATA: + break; + default: + return ""; } }catch (Exception e) { @@ -1258,22 +1260,22 @@ public class GWTWorkspaceBuilder { //MANAGEMENT SHARED FOLDER NAME if(wsFolder.isShared() && wsFolder.getType().equals(WorkspaceItemType.SHARED_FOLDER)){ - WorkspaceSharedFolder shared = (WorkspaceSharedFolder) wsFolder; - name = shared.isVreFolder()?shared.getDisplayName():wsFolder.getName(); + WorkspaceSharedFolder shared = (WorkspaceSharedFolder) wsFolder; + name = shared.isVreFolder()?shared.getDisplayName():wsFolder.getName(); }else name = wsFolder.getName(); //MANAGEMENT SPECIAL FOLDER -// if(wsFolder.getName().compareTo("MySpecialFolders")==0 && wsFolder.getParent()!=null && wsFolder.getParent().isRoot()){ -// WorkspaceSharedFolder shared = (WorkspaceSharedFolder) wsFolder; -// name = shared.isVreFolder()?shared.getDisplayName():wsFolder.getName(); -// }else -// name = wsFolder.getName(); + // if(wsFolder.getName().compareTo("MySpecialFolders")==0 && wsFolder.getParent()!=null && wsFolder.getParent().isRoot()){ + // WorkspaceSharedFolder shared = (WorkspaceSharedFolder) wsFolder; + // name = shared.isVreFolder()?shared.getDisplayName():wsFolder.getName(); + // }else + // name = wsFolder.getName(); FolderModel folder = new FolderModel(wsFolder.getId(), name, parent, true, wsFolder.isShared(), false, wsFolder.isPublic()); folder.setShareable(true); folder.setDescription(wsFolder.getDescription()); -// folder.setOwner(wsFolder.getOwner()); + // folder.setOwner(wsFolder.getOwner()); if(parent != null && parent.isShared()){ folder.setShared(true); @@ -1301,15 +1303,15 @@ public class GWTWorkspaceBuilder { //MANAGEMENT SHARED FOLDER NAME if(wsFolder.isShared() && wsFolder.getType().equals(WorkspaceItemType.SHARED_FOLDER)){ logger.debug("MANAGEMENT SHARED Folder name.."); - WorkspaceSharedFolder shared = (WorkspaceSharedFolder) wsFolder; - logger.debug("shared.isVreFolder(): "+shared.isVreFolder()); - name = shared.isVreFolder()?shared.getDisplayName():wsFolder.getName(); + WorkspaceSharedFolder shared = (WorkspaceSharedFolder) wsFolder; + logger.debug("shared.isVreFolder(): "+shared.isVreFolder()); + name = shared.isVreFolder()?shared.getDisplayName():wsFolder.getName(); - /* + /* if(shared.isVreFolder()) logger.debug("shared.getDisplayName(): "+shared.getDisplayName()); - */ - //MANAGEMENT SPECIAL FOLDER + */ + //MANAGEMENT SPECIAL FOLDER }else if(wsFolder.getName().compareTo(ConstantsExplorer.MY_SPECIAL_FOLDERS)==0 && wsFolder.getParent()!=null && wsFolder.getParent().isRoot()){ //MANAGEMENT SPECIAL FOLDER logger.debug("MANAGEMENT SPECIAL FOLDER NAME REWRITING AS: "+specialFolderName); @@ -1328,7 +1330,7 @@ public class GWTWorkspaceBuilder { folder.setShareable(true); folder.setIsRoot(wsFolder.isRoot()); folder.setDescription(wsFolder.getDescription()); -// folder.setOwner(wsFolder.getOwner()); + // folder.setOwner(wsFolder.getOwner()); if(parent != null && parent.isShared()){ folder.setShared(true); @@ -1383,36 +1385,36 @@ public class GWTWorkspaceBuilder { SearchFolderItem folderItem = (SearchFolderItem) item; switch(folderItem.getFolderItemType()) { - case EXTERNAL_IMAGE: - return GXTCategorySmartFolder.SMF_IMAGES; - case EXTERNAL_FILE: - return GXTCategorySmartFolder.SMF_DOCUMENTS; - case EXTERNAL_PDF_FILE: - return GXTCategorySmartFolder.SMF_DOCUMENTS; - case EXTERNAL_URL: - return GXTCategorySmartFolder.SMF_LINKS; - case REPORT_TEMPLATE: - return GXTCategorySmartFolder.SMF_REPORTS; - case REPORT: - return GXTCategorySmartFolder.SMF_REPORTS; - case QUERY: - return GXTCategorySmartFolder.SMF_DOCUMENTS; - case TIME_SERIES: - return GXTCategorySmartFolder.SMF_TIMESERIES; - case PDF_DOCUMENT: - return GXTCategorySmartFolder.SMF_DOCUMENTS; - case IMAGE_DOCUMENT: - return GXTCategorySmartFolder.SMF_IMAGES; - case DOCUMENT: - return GXTCategorySmartFolder.SMF_DOCUMENTS; - case URL_DOCUMENT: - return GXTCategorySmartFolder.SMF_DOCUMENTS; - case METADATA: - return GXTCategorySmartFolder.SMF_DOCUMENTS; - case GCUBE_ITEM: - return GXTCategorySmartFolder.SMF_GCUBE_ITEMS; - default: - return GXTCategorySmartFolder.SMF_UNKNOWN; + case EXTERNAL_IMAGE: + return GXTCategorySmartFolder.SMF_IMAGES; + case EXTERNAL_FILE: + return GXTCategorySmartFolder.SMF_DOCUMENTS; + case EXTERNAL_PDF_FILE: + return GXTCategorySmartFolder.SMF_DOCUMENTS; + case EXTERNAL_URL: + return GXTCategorySmartFolder.SMF_LINKS; + case REPORT_TEMPLATE: + return GXTCategorySmartFolder.SMF_REPORTS; + case REPORT: + return GXTCategorySmartFolder.SMF_REPORTS; + case QUERY: + return GXTCategorySmartFolder.SMF_DOCUMENTS; + case TIME_SERIES: + return GXTCategorySmartFolder.SMF_TIMESERIES; + case PDF_DOCUMENT: + return GXTCategorySmartFolder.SMF_DOCUMENTS; + case IMAGE_DOCUMENT: + return GXTCategorySmartFolder.SMF_IMAGES; + case DOCUMENT: + return GXTCategorySmartFolder.SMF_DOCUMENTS; + case URL_DOCUMENT: + return GXTCategorySmartFolder.SMF_DOCUMENTS; + case METADATA: + return GXTCategorySmartFolder.SMF_DOCUMENTS; + case GCUBE_ITEM: + return GXTCategorySmartFolder.SMF_GCUBE_ITEMS; + default: + return GXTCategorySmartFolder.SMF_UNKNOWN; } default: @@ -1652,10 +1654,10 @@ public class GWTWorkspaceBuilder { */ public InfoContactModel buildGXTInfoContactModel(User user) throws InternalErrorException{ - if(user!=null) - return new InfoContactModel(user.getId(), user.getPortalLogin(), UserUtil.getUserFullName(user.getPortalLogin()), false); + if(user!=null) + return new InfoContactModel(user.getId(), user.getPortalLogin(), UserUtil.getUserFullName(user.getPortalLogin()), false); - return new InfoContactModel(); + return new InfoContactModel(); } /** @@ -1683,234 +1685,234 @@ public class GWTWorkspaceBuilder { switch (accountingEntry.getEntryType()) { - case CREATE: + case CREATE: - if(gxtEntryType==null || gxtEntryType.equals(GxtAccountingEntryType.ALL) || gxtEntryType.equals(GxtAccountingEntryType.ALLWITHOUTREAD) || gxtEntryType.equals(GxtAccountingEntryType.CREATE)){ - AccountingEntryCreate create = (AccountingEntryCreate) accountingEntry; - af.setOperation(GxtAccountingEntryType.CREATE); + if(gxtEntryType==null || gxtEntryType.equals(GxtAccountingEntryType.ALL) || gxtEntryType.equals(GxtAccountingEntryType.ALLWITHOUTREAD) || gxtEntryType.equals(GxtAccountingEntryType.CREATE)){ + AccountingEntryCreate create = (AccountingEntryCreate) accountingEntry; + af.setOperation(GxtAccountingEntryType.CREATE); -// af.setDescription(GxtAccountingEntryType.CREATE.getName() + " by "+user.getName()); - String msg = ""; - if(create.getItemName()==null || create.getItemName().isEmpty()) - msg = GxtAccountingEntryType.CREATE.getId() + " by "+user.getName(); - else{ + // af.setDescription(GxtAccountingEntryType.CREATE.getName() + " by "+user.getName()); + String msg = ""; + if(create.getItemName()==null || create.getItemName().isEmpty()) + msg = GxtAccountingEntryType.CREATE.getId() + " by "+user.getName(); + else{ - if(create.getVersion()==null) - msg = create.getItemName() + " " + GxtAccountingEntryType.CREATE.getName() + " by "+user.getName(); - else - msg = create.getItemName() + " v. "+create.getVersion()+" "+ GxtAccountingEntryType.CREATE.getName() + " by "+user.getName(); - } - - af.setDescription(msg); - } - - break; - - case READ: - - if(gxtEntryType==null || gxtEntryType.equals(GxtAccountingEntryType.ALL) || gxtEntryType.equals(GxtAccountingEntryType.READ)){ - - AccountingEntryRead read = (AccountingEntryRead) accountingEntry; - af.setOperation(GxtAccountingEntryType.READ); - af.setDescription(read.getItemName() + " " + GxtAccountingEntryType.READ.getName() + " by "+user.getName()); - - String msg = ""; - if(read.getItemName()==null || read.getItemName().isEmpty()) - msg = GxtAccountingEntryType.READ.getId() + " by "+user.getName(); - else{ - - if(read.getVersion()==null) - msg = read.getItemName() + " " + GxtAccountingEntryType.READ.getName() + " by "+user.getName(); - else - msg = read.getItemName() + " v."+read.getVersion() +" "+ GxtAccountingEntryType.READ.getName() + " by "+user.getName(); - } - - af.setDescription(msg); - } - - break; - - case CUT: - - if(gxtEntryType==null || gxtEntryType.equals(GxtAccountingEntryType.ALL) || gxtEntryType.equals(GxtAccountingEntryType.ALLWITHOUTREAD) || gxtEntryType.equals(GxtAccountingEntryType.CUT)){ - - af.setOperation(GxtAccountingEntryType.CUT); - AccountingEntryCut cut = (AccountingEntryCut) accountingEntry; - - String msg = ""; - if(cut.getItemName()==null || cut.getItemName().isEmpty()) - msg = GxtAccountingEntryType.CUT.getName() +" by "+user.getName(); - else{ - if(cut.getVersion()==null) - msg = cut.getItemName()+" "+GxtAccountingEntryType.CUT.getName() +" by "+user.getName(); - else - msg = cut.getItemName()+" v."+cut.getVersion()+" "+GxtAccountingEntryType.CUT.getName() +" by "+user.getName(); - } - - af.setDescription(msg); - } - - break; - - case PASTE: - - if(gxtEntryType==null || gxtEntryType.equals(GxtAccountingEntryType.ALL) || gxtEntryType.equals(GxtAccountingEntryType.ALLWITHOUTREAD) || gxtEntryType.equals(GxtAccountingEntryType.PASTE)){ - - af.setOperation(GxtAccountingEntryType.PASTE); - AccountingEntryPaste paste = (AccountingEntryPaste) accountingEntry; - - if(paste.getVersion()==null) - af.setDescription(GxtAccountingEntryType.PASTE.getName() + " from "+paste.getFromPath()+" by "+user.getName()); + if(create.getVersion()==null) + msg = create.getItemName() + " " + GxtAccountingEntryType.CREATE.getName() + " by "+user.getName(); else - af.setDescription(GxtAccountingEntryType.PASTE.getName() + " v. "+paste.getVersion()+" from "+paste.getFromPath()+" by "+user.getName()); + msg = create.getItemName() + " v. "+create.getVersion()+" "+ GxtAccountingEntryType.CREATE.getName() + " by "+user.getName(); } - break; + af.setDescription(msg); + } - case REMOVAL: + break; - if(gxtEntryType==null || gxtEntryType.equals(GxtAccountingEntryType.ALL) || gxtEntryType.equals(GxtAccountingEntryType.ALLWITHOUTREAD) || gxtEntryType.equals(GxtAccountingEntryType.REMOVE)){ + case READ: - af.setOperation(GxtAccountingEntryType.REMOVE); - AccountingEntryRemoval rem = (AccountingEntryRemoval) accountingEntry; - String msg = rem.getItemName()==null || rem.getItemName().isEmpty()?"":rem.getItemName()+" "; + if(gxtEntryType==null || gxtEntryType.equals(GxtAccountingEntryType.ALL) || gxtEntryType.equals(GxtAccountingEntryType.READ)){ - if(rem.getVersion()==null) - msg+= GxtAccountingEntryType.REMOVE.getName() +" by "+user.getName(); + AccountingEntryRead read = (AccountingEntryRead) accountingEntry; + af.setOperation(GxtAccountingEntryType.READ); + af.setDescription(read.getItemName() + " " + GxtAccountingEntryType.READ.getName() + " by "+user.getName()); + + String msg = ""; + if(read.getItemName()==null || read.getItemName().isEmpty()) + msg = GxtAccountingEntryType.READ.getId() + " by "+user.getName(); + else{ + + if(read.getVersion()==null) + msg = read.getItemName() + " " + GxtAccountingEntryType.READ.getName() + " by "+user.getName(); else - msg+= GxtAccountingEntryType.REMOVE.getName() +" v."+rem.getVersion()+" by "+user.getName(); - - af.setDescription(msg); + msg = read.getItemName() + " v."+read.getVersion() +" "+ GxtAccountingEntryType.READ.getName() + " by "+user.getName(); } - break; - case RENAMING: + af.setDescription(msg); + } - if(gxtEntryType==null || gxtEntryType.equals(GxtAccountingEntryType.ALL) || gxtEntryType.equals(GxtAccountingEntryType.ALLWITHOUTREAD) || gxtEntryType.equals(GxtAccountingEntryType.RENAME)){ + break; - af.setOperation(GxtAccountingEntryType.RENAME); - AccountingEntryRenaming ren = (AccountingEntryRenaming) accountingEntry; - String msg = ren.getOldItemName()==null || ren.getOldItemName().isEmpty()?"":ren.getOldItemName()+" "; - if(ren.getVersion()==null) - msg+= GxtAccountingEntryType.RENAME.getName() +" to "+ ren.getNewItemName()+ " by "+user.getName(); + case CUT: + + if(gxtEntryType==null || gxtEntryType.equals(GxtAccountingEntryType.ALL) || gxtEntryType.equals(GxtAccountingEntryType.ALLWITHOUTREAD) || gxtEntryType.equals(GxtAccountingEntryType.CUT)){ + + af.setOperation(GxtAccountingEntryType.CUT); + AccountingEntryCut cut = (AccountingEntryCut) accountingEntry; + + String msg = ""; + if(cut.getItemName()==null || cut.getItemName().isEmpty()) + msg = GxtAccountingEntryType.CUT.getName() +" by "+user.getName(); + else{ + if(cut.getVersion()==null) + msg = cut.getItemName()+" "+GxtAccountingEntryType.CUT.getName() +" by "+user.getName(); else - msg+= " v."+ren.getVersion() +" "+GxtAccountingEntryType.RENAME.getName() +" to "+ ren.getNewItemName()+ " by "+user.getName(); - - af.setDescription(msg); - } - break; - - case ADD: - - if(gxtEntryType==null || gxtEntryType.equals(GxtAccountingEntryType.ALL) || gxtEntryType.equals(GxtAccountingEntryType.ALLWITHOUTREAD) || gxtEntryType.equals(GxtAccountingEntryType.ADD)){ - - af.setOperation(GxtAccountingEntryType.ADD); - AccountingEntryAdd acc = (AccountingEntryAdd) accountingEntry; - String msg = acc.getItemName()==null || acc.getItemName().isEmpty()?"":acc.getItemName()+" "; - if(acc.getVersion()==null) - msg+=GxtAccountingEntryType.ADD.getName()+ " by "+user.getName(); - else - msg+=" v."+acc.getVersion()+ " "+GxtAccountingEntryType.ADD.getName()+ " by "+user.getName(); - - af.setDescription(msg); - } - break; - - case UPDATE: - - if(gxtEntryType==null || gxtEntryType.equals(GxtAccountingEntryType.ALL) || gxtEntryType.equals(GxtAccountingEntryType.ALLWITHOUTREAD) || gxtEntryType.equals(GxtAccountingEntryType.UPDATE)){ - - af.setOperation(GxtAccountingEntryType.UPDATE); - AccountingEntryUpdate upd = (AccountingEntryUpdate) accountingEntry; - String msg = upd.getItemName()==null || upd.getItemName().isEmpty()?"":upd.getItemName()+" "; - if(upd.getVersion()==null) - msg+=GxtAccountingEntryType.UPDATE.getName()+" by "+user.getName(); - else - msg+=" v."+upd.getVersion()+" "+GxtAccountingEntryType.UPDATE.getName()+" by "+user.getName(); - - af.setDescription(msg); - } - break; - - case SHARE: - - if(gxtEntryType==null || gxtEntryType.equals(GxtAccountingEntryType.ALL) || gxtEntryType.equals(GxtAccountingEntryType.ALLWITHOUTREAD) || gxtEntryType.equals(GxtAccountingEntryType.SHARE)){ - - af.setOperation(GxtAccountingEntryType.SHARE); - - AccountingEntryShare acc = (AccountingEntryShare) accountingEntry; - - String msg = ""; - if(acc.getItemName()==null || acc.getItemName().isEmpty()) - msg = user.getName() + " "+GxtAccountingEntryType.SHARE.getName()+ " workspace folder"; - else - msg = user.getName() + " "+GxtAccountingEntryType.SHARE.getName()+ " workspace folder "+acc.getItemName(); - - if(acc.getMembers()!=null && acc.getMembers().size()>0) - msg+=" with "+UserUtil.separateFullNameToCommaForPortalLogin(acc.getMembers()); - - af.setDescription(msg); - } - break; - - case UNSHARE: - - if(gxtEntryType==null || gxtEntryType.equals(GxtAccountingEntryType.ALL) || gxtEntryType.equals(GxtAccountingEntryType.ALLWITHOUTREAD) || gxtEntryType.equals(GxtAccountingEntryType.UNSHARE)){ - - af.setOperation(GxtAccountingEntryType.UNSHARE); - AccountingEntryUnshare uns = (AccountingEntryUnshare) accountingEntry; - String msg = uns.getItemName()==null || uns.getItemName().isEmpty()?"":uns.getItemName()+" "; - msg+=GxtAccountingEntryType.UNSHARE.getName()+" by "+user.getName(); - af.setDescription(msg); - } - break; - - case RESTORE: - - if(gxtEntryType==null || gxtEntryType.equals(GxtAccountingEntryType.ALL) || gxtEntryType.equals(GxtAccountingEntryType.ALLWITHOUTREAD) || gxtEntryType.equals(GxtAccountingEntryType.RESTORE)){ - - af.setOperation(GxtAccountingEntryType.RESTORE); - AccountingEntryRestore acc = (AccountingEntryRestore) accountingEntry; - String msg = acc.getItemName()==null || acc.getItemName().isEmpty()?"":acc.getItemName()+" "; - - if(acc.getVersion()==null) - msg+=GxtAccountingEntryType.RESTORE.getName()+" by "+user.getName(); - else - msg+=" v."+acc.getVersion()+" "+GxtAccountingEntryType.RESTORE.getName() +" by "+user.getName(); - - af.setDescription(msg); - } - break; - - case DISABLED_PUBLIC_ACCESS: - - if(gxtEntryType==null || gxtEntryType.equals(GxtAccountingEntryType.ALL) || gxtEntryType.equals(GxtAccountingEntryType.ALLWITHOUTREAD) || gxtEntryType.equals(GxtAccountingEntryType.DISABLED_PUBLIC_ACCESS)){ - - af.setOperation(GxtAccountingEntryType.DISABLED_PUBLIC_ACCESS); - AccountingEntryDisabledPublicAccess acc = (AccountingEntryDisabledPublicAccess) accountingEntry; - String msg = acc.getItemName()==null || acc.getItemName().isEmpty()?"":acc.getItemName()+" "; - msg+=GxtAccountingEntryType.DISABLED_PUBLIC_ACCESS.getName()+" by "+user.getName(); - af.setDescription(msg); + msg = cut.getItemName()+" v."+cut.getVersion()+" "+GxtAccountingEntryType.CUT.getName() +" by "+user.getName(); } - break; + af.setDescription(msg); + } - case ENABLED_PUBLIC_ACCESS: + break; - if(gxtEntryType==null || gxtEntryType.equals(GxtAccountingEntryType.ALL) || gxtEntryType.equals(GxtAccountingEntryType.ALLWITHOUTREAD) || gxtEntryType.equals(GxtAccountingEntryType.ENABLED_PUBLIC_ACCESS)){ + case PASTE: - af.setOperation(GxtAccountingEntryType.ENABLED_PUBLIC_ACCESS); - AccountingEntryEnabledPublicAccess acc = (AccountingEntryEnabledPublicAccess) accountingEntry; - String msg = acc.getItemName()==null || acc.getItemName().isEmpty()?"":acc.getItemName()+" "; - msg+=GxtAccountingEntryType.ENABLED_PUBLIC_ACCESS.getName()+" by "+user.getName(); - af.setDescription(msg); - } + if(gxtEntryType==null || gxtEntryType.equals(GxtAccountingEntryType.ALL) || gxtEntryType.equals(GxtAccountingEntryType.ALLWITHOUTREAD) || gxtEntryType.equals(GxtAccountingEntryType.PASTE)){ - break; + af.setOperation(GxtAccountingEntryType.PASTE); + AccountingEntryPaste paste = (AccountingEntryPaste) accountingEntry; - default: + if(paste.getVersion()==null) + af.setDescription(GxtAccountingEntryType.PASTE.getName() + " from "+paste.getFromPath()+" by "+user.getName()); + else + af.setDescription(GxtAccountingEntryType.PASTE.getName() + " v. "+paste.getVersion()+" from "+paste.getFromPath()+" by "+user.getName()); + } - break; + break; + + case REMOVAL: + + if(gxtEntryType==null || gxtEntryType.equals(GxtAccountingEntryType.ALL) || gxtEntryType.equals(GxtAccountingEntryType.ALLWITHOUTREAD) || gxtEntryType.equals(GxtAccountingEntryType.REMOVE)){ + + af.setOperation(GxtAccountingEntryType.REMOVE); + AccountingEntryRemoval rem = (AccountingEntryRemoval) accountingEntry; + String msg = rem.getItemName()==null || rem.getItemName().isEmpty()?"":rem.getItemName()+" "; + + if(rem.getVersion()==null) + msg+= GxtAccountingEntryType.REMOVE.getName() +" by "+user.getName(); + else + msg+= GxtAccountingEntryType.REMOVE.getName() +" v."+rem.getVersion()+" by "+user.getName(); + + af.setDescription(msg); + } + break; + + case RENAMING: + + if(gxtEntryType==null || gxtEntryType.equals(GxtAccountingEntryType.ALL) || gxtEntryType.equals(GxtAccountingEntryType.ALLWITHOUTREAD) || gxtEntryType.equals(GxtAccountingEntryType.RENAME)){ + + af.setOperation(GxtAccountingEntryType.RENAME); + AccountingEntryRenaming ren = (AccountingEntryRenaming) accountingEntry; + String msg = ren.getOldItemName()==null || ren.getOldItemName().isEmpty()?"":ren.getOldItemName()+" "; + if(ren.getVersion()==null) + msg+= GxtAccountingEntryType.RENAME.getName() +" to "+ ren.getNewItemName()+ " by "+user.getName(); + else + msg+= " v."+ren.getVersion() +" "+GxtAccountingEntryType.RENAME.getName() +" to "+ ren.getNewItemName()+ " by "+user.getName(); + + af.setDescription(msg); + } + break; + + case ADD: + + if(gxtEntryType==null || gxtEntryType.equals(GxtAccountingEntryType.ALL) || gxtEntryType.equals(GxtAccountingEntryType.ALLWITHOUTREAD) || gxtEntryType.equals(GxtAccountingEntryType.ADD)){ + + af.setOperation(GxtAccountingEntryType.ADD); + AccountingEntryAdd acc = (AccountingEntryAdd) accountingEntry; + String msg = acc.getItemName()==null || acc.getItemName().isEmpty()?"":acc.getItemName()+" "; + if(acc.getVersion()==null) + msg+=GxtAccountingEntryType.ADD.getName()+ " by "+user.getName(); + else + msg+=" v."+acc.getVersion()+ " "+GxtAccountingEntryType.ADD.getName()+ " by "+user.getName(); + + af.setDescription(msg); + } + break; + + case UPDATE: + + if(gxtEntryType==null || gxtEntryType.equals(GxtAccountingEntryType.ALL) || gxtEntryType.equals(GxtAccountingEntryType.ALLWITHOUTREAD) || gxtEntryType.equals(GxtAccountingEntryType.UPDATE)){ + + af.setOperation(GxtAccountingEntryType.UPDATE); + AccountingEntryUpdate upd = (AccountingEntryUpdate) accountingEntry; + String msg = upd.getItemName()==null || upd.getItemName().isEmpty()?"":upd.getItemName()+" "; + if(upd.getVersion()==null) + msg+=GxtAccountingEntryType.UPDATE.getName()+" by "+user.getName(); + else + msg+=" v."+upd.getVersion()+" "+GxtAccountingEntryType.UPDATE.getName()+" by "+user.getName(); + + af.setDescription(msg); + } + break; + + case SHARE: + + if(gxtEntryType==null || gxtEntryType.equals(GxtAccountingEntryType.ALL) || gxtEntryType.equals(GxtAccountingEntryType.ALLWITHOUTREAD) || gxtEntryType.equals(GxtAccountingEntryType.SHARE)){ + + af.setOperation(GxtAccountingEntryType.SHARE); + + AccountingEntryShare acc = (AccountingEntryShare) accountingEntry; + + String msg = ""; + if(acc.getItemName()==null || acc.getItemName().isEmpty()) + msg = user.getName() + " "+GxtAccountingEntryType.SHARE.getName()+ " workspace folder"; + else + msg = user.getName() + " "+GxtAccountingEntryType.SHARE.getName()+ " workspace folder "+acc.getItemName(); + + if(acc.getMembers()!=null && acc.getMembers().size()>0) + msg+=" with "+UserUtil.separateFullNameToCommaForPortalLogin(acc.getMembers()); + + af.setDescription(msg); + } + break; + + case UNSHARE: + + if(gxtEntryType==null || gxtEntryType.equals(GxtAccountingEntryType.ALL) || gxtEntryType.equals(GxtAccountingEntryType.ALLWITHOUTREAD) || gxtEntryType.equals(GxtAccountingEntryType.UNSHARE)){ + + af.setOperation(GxtAccountingEntryType.UNSHARE); + AccountingEntryUnshare uns = (AccountingEntryUnshare) accountingEntry; + String msg = uns.getItemName()==null || uns.getItemName().isEmpty()?"":uns.getItemName()+" "; + msg+=GxtAccountingEntryType.UNSHARE.getName()+" by "+user.getName(); + af.setDescription(msg); + } + break; + + case RESTORE: + + if(gxtEntryType==null || gxtEntryType.equals(GxtAccountingEntryType.ALL) || gxtEntryType.equals(GxtAccountingEntryType.ALLWITHOUTREAD) || gxtEntryType.equals(GxtAccountingEntryType.RESTORE)){ + + af.setOperation(GxtAccountingEntryType.RESTORE); + AccountingEntryRestore acc = (AccountingEntryRestore) accountingEntry; + String msg = acc.getItemName()==null || acc.getItemName().isEmpty()?"":acc.getItemName()+" "; + + if(acc.getVersion()==null) + msg+=GxtAccountingEntryType.RESTORE.getName()+" by "+user.getName(); + else + msg+=" v."+acc.getVersion()+" "+GxtAccountingEntryType.RESTORE.getName() +" by "+user.getName(); + + af.setDescription(msg); + } + break; + + case DISABLED_PUBLIC_ACCESS: + + if(gxtEntryType==null || gxtEntryType.equals(GxtAccountingEntryType.ALL) || gxtEntryType.equals(GxtAccountingEntryType.ALLWITHOUTREAD) || gxtEntryType.equals(GxtAccountingEntryType.DISABLED_PUBLIC_ACCESS)){ + + af.setOperation(GxtAccountingEntryType.DISABLED_PUBLIC_ACCESS); + AccountingEntryDisabledPublicAccess acc = (AccountingEntryDisabledPublicAccess) accountingEntry; + String msg = acc.getItemName()==null || acc.getItemName().isEmpty()?"":acc.getItemName()+" "; + msg+=GxtAccountingEntryType.DISABLED_PUBLIC_ACCESS.getName()+" by "+user.getName(); + af.setDescription(msg); + } + + break; + + case ENABLED_PUBLIC_ACCESS: + + if(gxtEntryType==null || gxtEntryType.equals(GxtAccountingEntryType.ALL) || gxtEntryType.equals(GxtAccountingEntryType.ALLWITHOUTREAD) || gxtEntryType.equals(GxtAccountingEntryType.ENABLED_PUBLIC_ACCESS)){ + + af.setOperation(GxtAccountingEntryType.ENABLED_PUBLIC_ACCESS); + AccountingEntryEnabledPublicAccess acc = (AccountingEntryEnabledPublicAccess) accountingEntry; + String msg = acc.getItemName()==null || acc.getItemName().isEmpty()?"":acc.getItemName()+" "; + msg+=GxtAccountingEntryType.ENABLED_PUBLIC_ACCESS.getName()+" by "+user.getName(); + af.setDescription(msg); + } + + break; + + default: + + break; } listAccFields.add(af); @@ -1958,8 +1960,8 @@ public class GWTWorkspaceBuilder { return listAccFields; } - - + + /** * Sets the contex info. * @@ -2001,8 +2003,8 @@ public class GWTWorkspaceBuilder { break; default: -// acls.add(new WorkspaceACL(acl.toString(), acl.toString(), false, USER_TYPE.OTHER, "")); -// break; + // acls.add(new WorkspaceACL(acl.toString(), acl.toString(), false, USER_TYPE.OTHER, "")); + // break; } } @@ -2124,11 +2126,11 @@ public class GWTWorkspaceBuilder { html+=""; for (String login : listLogins) { logger.trace("Adding login "+login); - String fullName = UserUtil.getUserFullName(login); - if(fullName!=null && !fullName.isEmpty()) - html+=fullName+"; "; - else - html+=login+"; "; + String fullName = UserUtil.getUserFullName(login); + if(fullName!=null && !fullName.isEmpty()) + html+=fullName+"; "; + else + html+=login+"; "; } html+="
"; } @@ -2145,29 +2147,29 @@ public class GWTWorkspaceBuilder { * @return the string */ public static String formatFileSize(long size) { - String formattedSize = null; + String formattedSize = null; - double b = size; - double k = size/1024.0; - double m = size/1024.0/1024.0; - double g = size/1024.0/1024.0/1024.0; - double t = size/1024.0/1024.0/1024.0/1024.0; + double b = size; + double k = size/1024.0; + double m = size/1024.0/1024.0; + double g = size/1024.0/1024.0/1024.0; + double t = size/1024.0/1024.0/1024.0/1024.0; - DecimalFormat dec = new DecimalFormat("0.00"); + DecimalFormat dec = new DecimalFormat("0.00"); - if ( t>1 ) { - formattedSize = dec.format(t).concat(" TB"); - } else if ( g>1 ) { - formattedSize = dec.format(g).concat(" GB"); - } else if ( m>1 ) { - formattedSize = dec.format(m).concat(" MB"); - } else if ( k>1 ) { - formattedSize = dec.format(k).concat(" KB"); - } else { - formattedSize = dec.format(b).concat(" Bytes"); - } + if ( t>1 ) { + formattedSize = dec.format(t).concat(" TB"); + } else if ( g>1 ) { + formattedSize = dec.format(g).concat(" GB"); + } else if ( m>1 ) { + formattedSize = dec.format(m).concat(" MB"); + } else if ( k>1 ) { + formattedSize = dec.format(k).concat(" KB"); + } else { + formattedSize = dec.format(b).concat(" Bytes"); + } - return formattedSize; + return formattedSize; } /** @@ -2188,33 +2190,33 @@ public class GWTWorkspaceBuilder { switch (item.getType()) { - case FOLDER:{ - WorkspaceFolder theFolder = (WorkspaceFolder) item; - return theFolder.getDescription(); - } - case SHARED_FOLDER:{ - WorkspaceSharedFolder theFolder = (WorkspaceSharedFolder) item; - return theFolder.getDescription(); - } + case FOLDER:{ + WorkspaceFolder theFolder = (WorkspaceFolder) item; + return theFolder.getDescription(); + } + case SHARED_FOLDER:{ + WorkspaceSharedFolder theFolder = (WorkspaceSharedFolder) item; + return theFolder.getDescription(); + } - case SMART_FOLDER:{ - WorkspaceSmartFolder theFolder = (WorkspaceSmartFolder) item; - return theFolder.getDescription(); - } + case SMART_FOLDER:{ + WorkspaceSmartFolder theFolder = (WorkspaceSmartFolder) item; + return theFolder.getDescription(); + } - case TRASH_FOLDER:{ - WorkspaceTrashFolder theFolder = (WorkspaceTrashFolder) item; - return ""; - } + case TRASH_FOLDER:{ + WorkspaceTrashFolder theFolder = (WorkspaceTrashFolder) item; + return ""; + } - case TRASH_ITEM:{ - WorkspaceTrashItem tItem = (WorkspaceTrashItem) item; - return tItem.getDescription(); - } + case TRASH_ITEM:{ + WorkspaceTrashItem tItem = (WorkspaceTrashItem) item; + return tItem.getDescription(); + } - default:{ //IS AN ITEM - return item.getDescription(); - } + default:{ //IS AN ITEM + return item.getDescription(); + } } } catch (Exception e) { @@ -2310,8 +2312,8 @@ public class GWTWorkspaceBuilder { } return listVersions; } - - + + /** * Sets the synched thredds state for. * @@ -2321,22 +2323,22 @@ public class GWTWorkspaceBuilder { * @return the file model */ protected FileModel setSynchedThreddsStateFor(FileModel fileModel, String scope, String username) { - + try { - + if(fileModel.isDirectory()) { ScopeProvider.instance.set(scope); Sync_Status status = WorkspaceThreddsSynchronize.getInstance().getSynchedStatusFromItemProperty(fileModel.getIdentifier(), username); fileModel.setSyncThreddsStatus(status); } - + } catch (ItemNotSynched e) { //silent logger.trace("Item: "+fileModel.getIdentifier() + " name: "+fileModel.getName() +" is not synched"); } catch (Exception e) { logger.warn("It is not possible to get synched status for item: "+fileModel.getIdentifier()); } - + return fileModel; }