From ac791197d17a5e599f9c493f2f0becf4d5af2faf Mon Sep 17 00:00:00 2001 From: Francesco Mangiacrapa Date: Wed, 10 Jun 2015 10:20:22 +0000 Subject: [PATCH] removed: WORKFLOW_REPORT, WORKFLOW_TEMPLATE, EXTERNAL_RESOURCE_LINK according to HL 2.0 git-svn-id: http://svn.d4science-ii.research-infrastructures.eu/gcube/trunk/portlets/user/workspace-tree-widget@115284 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../workspace/server/GWTWorkspaceBuilder.java | 135 ++---------------- .../server/GWTWorkspaceServiceImpl.java | 7 +- 2 files changed, 17 insertions(+), 125 deletions(-) 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 9266a60..920bfa9 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 @@ -1195,10 +1195,6 @@ public class GWTWorkspaceBuilder { fileModel.setFolderItemType(GXTFolderItemTypeEnum.TIME_SERIES); fileModel.setShortcutCategory(GXTCategoryItemInterface.SMF_TIMESERIES); break; -// case AQUAMAPS_ITEM: -// fileModel.setFolderItemType(GXTFolderItemTypeEnum.AQUAMAPS_ITEM); -// fileModel.setShortcutCategory(GXTCategoryItemInterface.BIODIVERSITY); -// break; case PDF_DOCUMENT: fileModel.setFolderItemType(GXTFolderItemTypeEnum.PDF_DOCUMENT); fileModel.setShortcutCategory(GXTCategoryItemInterface.SMF_DOCUMENTS); @@ -1221,19 +1217,6 @@ public class GWTWorkspaceBuilder { fileModel.setFolderItemType(GXTFolderItemTypeEnum.METADATA); fileModel.setShortcutCategory(GXTCategoryItemInterface.SMF_DOCUMENTS); break; - case WORKFLOW_REPORT: - fileModel.setFolderItemType(GXTFolderItemTypeEnum.WORKFLOW_REPORT); - fileModel.setShortcutCategory(GXTCategoryItemInterface.SMF_DOCUMENTS); - break; - case WORKFLOW_TEMPLATE: - fileModel.setFolderItemType(GXTFolderItemTypeEnum.WORKFLOW_TEMPLATE); - fileModel.setShortcutCategory(GXTCategoryItemInterface.SMF_DOCUMENTS); -// logger.trace("**************************************DOCUMENTS******* filemodel "+ fileModel.getName()); - break; - case EXTERNAL_RESOURCE_LINK: - fileModel.setFolderItemType(GXTFolderItemTypeEnum.EXTERNAL_RESOURCE_LINK); - fileModel.setShortcutCategory(GXTCategoryItemInterface.SMF_LINKS); - break; default: fileModel.setFolderItemType(GXTFolderItemTypeEnum.UNKNOWN_TYPE); fileModel.setShortcutCategory(GXTCategoryItemInterface.SMF_UNKNOWN); @@ -1292,10 +1275,6 @@ public class GWTWorkspaceBuilder { fileModel.setFolderItemType(GXTFolderItemTypeEnum.TIME_SERIES); fileModel.setShortcutCategory(GXTCategoryItemInterface.SMF_TIMESERIES); break; -// case AQUAMAPS_ITEM: -// fileModel.setFolderItemType(GXTFolderItemTypeEnum.AQUAMAPS_ITEM); -// fileModel.setShortcutCategory(GXTCategoryItemInterface.BIODIVERSITY); -// break; case PDF_DOCUMENT: fileModel.setFolderItemType(GXTFolderItemTypeEnum.PDF_DOCUMENT); fileModel.setShortcutCategory(GXTCategoryItemInterface.SMF_DOCUMENTS); @@ -1332,19 +1311,20 @@ public class GWTWorkspaceBuilder { fileModel.setFolderItemType(GXTFolderItemTypeEnum.METADATA); fileModel.setShortcutCategory(GXTCategoryItemInterface.SMF_DOCUMENTS); break; - case WORKFLOW_REPORT: - fileModel.setFolderItemType(GXTFolderItemTypeEnum.WORKFLOW_REPORT); - fileModel.setShortcutCategory(GXTCategoryItemInterface.SMF_DOCUMENTS); - break; - case WORKFLOW_TEMPLATE: - fileModel.setFolderItemType(GXTFolderItemTypeEnum.WORKFLOW_TEMPLATE); - fileModel.setShortcutCategory(GXTCategoryItemInterface.SMF_DOCUMENTS); -// logger.trace("**************************************DOCUMENTS******* filemodel "+ fileModel.getName()); - break; - case EXTERNAL_RESOURCE_LINK: - fileModel.setFolderItemType(GXTFolderItemTypeEnum.EXTERNAL_RESOURCE_LINK); - fileModel.setShortcutCategory(GXTCategoryItemInterface.SMF_LINKS); - break; + //REMOVED BY HL 2.0 +// case WORKFLOW_REPORT: +// fileModel.setFolderItemType(GXTFolderItemTypeEnum.WORKFLOW_REPORT); +// fileModel.setShortcutCategory(GXTCategoryItemInterface.SMF_DOCUMENTS); +// break; +// case WORKFLOW_TEMPLATE: +// fileModel.setFolderItemType(GXTFolderItemTypeEnum.WORKFLOW_TEMPLATE); +// fileModel.setShortcutCategory(GXTCategoryItemInterface.SMF_DOCUMENTS); +//// logger.trace("**************************************DOCUMENTS******* filemodel "+ fileModel.getName()); +// break; +// case EXTERNAL_RESOURCE_LINK: +// fileModel.setFolderItemType(GXTFolderItemTypeEnum.EXTERNAL_RESOURCE_LINK); +// fileModel.setShortcutCategory(GXTCategoryItemInterface.SMF_LINKS); +// break; default: fileModel.setFolderItemType(GXTFolderItemTypeEnum.UNKNOWN_TYPE); fileModel.setShortcutCategory(GXTCategoryItemInterface.SMF_UNKNOWN); @@ -1381,26 +1361,17 @@ public class GWTWorkspaceBuilder { break; case TIME_SERIES: break; - // case AQUAMAPS_ITEM: - // break; case PDF_DOCUMENT: break; case IMAGE_DOCUMENT: GCubeItem imgDoc = (GCubeItem) worspaceFolderItem; //Cast GCubeItem return imgDoc.getPublicLink(false); -// return ((ImageDocument) worspaceFolderItem).getPublicLink(); case DOCUMENT: break; case URL_DOCUMENT: break; case METADATA: break; - case WORKFLOW_REPORT: - break; - case WORKFLOW_TEMPLATE: - break; - case EXTERNAL_RESOURCE_LINK: - break; default: return ""; } @@ -1514,31 +1485,6 @@ public class GWTWorkspaceBuilder { return fileDetailsModel; } -// public List filterListByCategory(List listFileGridModel, String category) { -// -// List filteredList = new ArrayList(); -// -// logger.trace("Category :" + category); -// -// for(FileGridModel fileGridModel: listFileGridModel){ -// -// if(fileGridModel.getShortcutCategory()!=null){ -// -//// logger.trace("file GridModel category:" + fileGridModel.getShortcutCategory()); -// -// if(fileGridModel.getShortcutCategory().compareTo(category)==0){ -// filteredList.add(fileGridModel); -// } -// -// }else -// logger.trace("file GridModel category null"); -// } -// -// return filteredList; -// } - - - protected String getFolderItemTypeCategory(SearchItem item) throws InternalErrorException{ switch (item.getType()) { @@ -1567,9 +1513,7 @@ public class GWTWorkspaceBuilder { case QUERY: return GXTCategoryItemInterface.SMF_DOCUMENTS; case TIME_SERIES: - return GXTCategoryItemInterface.SMF_TIMESERIES; - case AQUAMAPS_ITEM: - return GXTCategoryItemInterface.SMF_BIODIVERSITY; + return GXTCategoryItemInterface.SMF_TIMESERIES; case PDF_DOCUMENT: return GXTCategoryItemInterface.SMF_DOCUMENTS; case IMAGE_DOCUMENT: @@ -1580,12 +1524,6 @@ public class GWTWorkspaceBuilder { return GXTCategoryItemInterface.SMF_DOCUMENTS; case METADATA: return GXTCategoryItemInterface.SMF_DOCUMENTS; - case WORKFLOW_REPORT: - return GXTCategoryItemInterface.SMF_DOCUMENTS; - case WORKFLOW_TEMPLATE: - return GXTCategoryItemInterface.SMF_DOCUMENTS; - case EXTERNAL_RESOURCE_LINK: - return GXTCategoryItemInterface.SMF_LINKS; default: return GXTCategoryItemInterface.SMF_UNKNOWN; } @@ -1809,9 +1747,6 @@ public class GWTWorkspaceBuilder { return new InfoContactModel(); } - -// private static float counter = 0; - public List buildGXTListBulkCreatorModel(List listFBC) throws InternalErrorException { List listBulkCreatorModel = new ArrayList(); @@ -1840,37 +1775,6 @@ public class GWTWorkspaceBuilder { listBulkCreatorModel.add(bulk); } -// //TODO EXAMPLES -// -// if(counter < 0.4){ -// listBulkCreatorModel.add(new BulkCreatorModel("1", "Test 1", counter, BulkCreatorModel.ONGOING, 5, 0)); -// listBulkCreatorModel.add(new BulkCreatorModel("2", "Test 2", counter, BulkCreatorModel.ONGOING, 5, 0)); -// listBulkCreatorModel.add(new BulkCreatorModel("3", "Test 3", counter, BulkCreatorModel.ONGOING, 5, 0)); -// listBulkCreatorModel.add(new BulkCreatorModel("4", "Test 4", counter, BulkCreatorModel.ONGOING, 5, 0)); -// listBulkCreatorModel.add(new BulkCreatorModel("5", "Test 5", counter, BulkCreatorModel.ONGOING, 5, 0)); -// listBulkCreatorModel.add(new BulkCreatorModel("6", "Test 6", counter, BulkCreatorModel.ONGOING, 5, 0)); -// } -// -// else{ -// -//// float perc = (float) 0.8; -// -// listBulkCreatorModel.add(new BulkCreatorModel("1", "Test 1", (float) 1, BulkCreatorModel.FAILED, 5, 3)); -// listBulkCreatorModel.add(new BulkCreatorModel("2", "Test 2", (float) 1, BulkCreatorModel.FAILED, 5, 4)); -// listBulkCreatorModel.add(new BulkCreatorModel("3", "Test 3", counter, BulkCreatorModel.COMPLETED, 5, 0)); -// listBulkCreatorModel.add(new BulkCreatorModel("4", "Test 4", counter, BulkCreatorModel.ONGOING, 5, 0)); -// listBulkCreatorModel.add(new BulkCreatorModel("5", "Test 5", counter, BulkCreatorModel.ONGOING, 5, 0)); -// listBulkCreatorModel.add(new BulkCreatorModel("6", "Test 6", counter, BulkCreatorModel.ONGOING, 5, 0)); -// } -// -// -// -// -// counter+=0.2; -// -// if(counter>1) -// counter=0; - return listBulkCreatorModel; } @@ -1896,7 +1800,6 @@ public class GWTWorkspaceBuilder { switch (accountingEntry.getEntryType()) { - case CREATE: if(gxtEntryType==null || gxtEntryType.equals(GxtAccountingEntryType.ALL) || gxtEntryType.equals(GxtAccountingEntryType.ALLWITHOUTREAD) || gxtEntryType.equals(GxtAccountingEntryType.CREATE)){ @@ -2064,14 +1967,6 @@ public class GWTWorkspaceBuilder { AccountingEntryShare acc = (AccountingEntryShare) accountingEntry; -// List listContacts = new ArrayList(); - -// if(acc.getMembers()!=null && acc.getMembers().size()>0){ -// -// listContacts = acc.getMembers(); -// } - - String msg = ""; if(acc.getItemName()==null || acc.getItemName().isEmpty()) msg = user.getName() + " "+GxtAccountingEntryType.SHARE.getName()+ " workspace folder"; 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 ef421f8..096cb25 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 @@ -1125,7 +1125,7 @@ public class GWTWorkspaceServiceImpl extends RemoteServiceServlet implements GWT //Category BIODIVERSITY }else if(category.equals(GXTCategoryItemInterface.SMF_BIODIVERSITY.toString())){ - listWorkspaceItems = workspace.getFolderItems(FolderItemType.AQUAMAPS_ITEM); +// listWorkspaceItems = workspace.getFolderItems(FolderItemType.AQUAMAPS_ITEM); //Category DOCUMENTS }else if(category.equals(GXTCategoryItemInterface.SMF_DOCUMENTS.toString())){ @@ -1136,16 +1136,13 @@ public class GWTWorkspaceServiceImpl extends RemoteServiceServlet implements GWT FolderItemType.QUERY, FolderItemType.PDF_DOCUMENT, FolderItemType.METADATA, - FolderItemType.WORKFLOW_REPORT, - FolderItemType.WORKFLOW_TEMPLATE, -// FolderItemType.URL_DOCUMENT, FolderItemType.DOCUMENT ); //Category LINKS }else if(category.equals(GXTCategoryItemInterface.SMF_LINKS.toString())){ - listWorkspaceItems = workspace.getFolderItems(FolderItemType.EXTERNAL_URL, FolderItemType.URL_DOCUMENT, FolderItemType.EXTERNAL_RESOURCE_LINK); +// listWorkspaceItems = workspace.getFolderItems(FolderItemType.EXTERNAL_URL, FolderItemType.URL_DOCUMENT, FolderItemType.EXTERNAL_RESOURCE_LINK); //Category REPORTS }else if(category.equals(GXTCategoryItemInterface.SMF_REPORTS.toString())){