gCubeSystem
/
workspace-tree-widget
15
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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
This commit is contained in:
Francesco Mangiacrapa 2015-06-10 10:20:22 +00:00
parent ad90f99c6b
commit ac791197d1
2 changed files with 17 additions and 125 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

135
src/main/java/org/gcube/portlets/user/workspace/server/GWTWorkspaceBuilder.java
View File

@ -1195,10 +1195,6 @@ public class GWTWorkspaceBuilder {
fileModel.setFolderItemType(GXTFolderItemTypeEnum.TIME_SERIES); fileModel.setFolderItemType(GXTFolderItemTypeEnum.TIME_SERIES);
fileModel.setShortcutCategory(GXTCategoryItemInterface.SMF_TIMESERIES); fileModel.setShortcutCategory(GXTCategoryItemInterface.SMF_TIMESERIES);
break; break;
// case AQUAMAPS_ITEM:
// fileModel.setFolderItemType(GXTFolderItemTypeEnum.AQUAMAPS_ITEM);
// fileModel.setShortcutCategory(GXTCategoryItemInterface.BIODIVERSITY);
// break;
case PDF_DOCUMENT: case PDF_DOCUMENT:
fileModel.setFolderItemType(GXTFolderItemTypeEnum.PDF_DOCUMENT); fileModel.setFolderItemType(GXTFolderItemTypeEnum.PDF_DOCUMENT);
fileModel.setShortcutCategory(GXTCategoryItemInterface.SMF_DOCUMENTS); fileModel.setShortcutCategory(GXTCategoryItemInterface.SMF_DOCUMENTS);
@ -1221,19 +1217,6 @@ public class GWTWorkspaceBuilder {
fileModel.setFolderItemType(GXTFolderItemTypeEnum.METADATA); fileModel.setFolderItemType(GXTFolderItemTypeEnum.METADATA);
fileModel.setShortcutCategory(GXTCategoryItemInterface.SMF_DOCUMENTS); fileModel.setShortcutCategory(GXTCategoryItemInterface.SMF_DOCUMENTS);
break; 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: default:
fileModel.setFolderItemType(GXTFolderItemTypeEnum.UNKNOWN_TYPE); fileModel.setFolderItemType(GXTFolderItemTypeEnum.UNKNOWN_TYPE);
fileModel.setShortcutCategory(GXTCategoryItemInterface.SMF_UNKNOWN); fileModel.setShortcutCategory(GXTCategoryItemInterface.SMF_UNKNOWN);
@ -1292,10 +1275,6 @@ public class GWTWorkspaceBuilder {
fileModel.setFolderItemType(GXTFolderItemTypeEnum.TIME_SERIES); fileModel.setFolderItemType(GXTFolderItemTypeEnum.TIME_SERIES);
fileModel.setShortcutCategory(GXTCategoryItemInterface.SMF_TIMESERIES); fileModel.setShortcutCategory(GXTCategoryItemInterface.SMF_TIMESERIES);
break; break;
// case AQUAMAPS_ITEM:
// fileModel.setFolderItemType(GXTFolderItemTypeEnum.AQUAMAPS_ITEM);
// fileModel.setShortcutCategory(GXTCategoryItemInterface.BIODIVERSITY);
// break;
case PDF_DOCUMENT: case PDF_DOCUMENT:
fileModel.setFolderItemType(GXTFolderItemTypeEnum.PDF_DOCUMENT); fileModel.setFolderItemType(GXTFolderItemTypeEnum.PDF_DOCUMENT);
fileModel.setShortcutCategory(GXTCategoryItemInterface.SMF_DOCUMENTS); fileModel.setShortcutCategory(GXTCategoryItemInterface.SMF_DOCUMENTS);
@ -1332,19 +1311,20 @@ public class GWTWorkspaceBuilder {
fileModel.setFolderItemType(GXTFolderItemTypeEnum.METADATA); fileModel.setFolderItemType(GXTFolderItemTypeEnum.METADATA);
fileModel.setShortcutCategory(GXTCategoryItemInterface.SMF_DOCUMENTS); fileModel.setShortcutCategory(GXTCategoryItemInterface.SMF_DOCUMENTS);
break; break;
case WORKFLOW_REPORT: //REMOVED BY HL 2.0
fileModel.setFolderItemType(GXTFolderItemTypeEnum.WORKFLOW_REPORT); // case WORKFLOW_REPORT:
fileModel.setShortcutCategory(GXTCategoryItemInterface.SMF_DOCUMENTS); // fileModel.setFolderItemType(GXTFolderItemTypeEnum.WORKFLOW_REPORT);
break; // fileModel.setShortcutCategory(GXTCategoryItemInterface.SMF_DOCUMENTS);
case WORKFLOW_TEMPLATE: // break;
fileModel.setFolderItemType(GXTFolderItemTypeEnum.WORKFLOW_TEMPLATE); // case WORKFLOW_TEMPLATE:
fileModel.setShortcutCategory(GXTCategoryItemInterface.SMF_DOCUMENTS); // fileModel.setFolderItemType(GXTFolderItemTypeEnum.WORKFLOW_TEMPLATE);
// logger.trace("**************************************DOCUMENTS******* filemodel "+ fileModel.getName()); // fileModel.setShortcutCategory(GXTCategoryItemInterface.SMF_DOCUMENTS);
break; //// logger.trace("**************************************DOCUMENTS******* filemodel "+ fileModel.getName());
case EXTERNAL_RESOURCE_LINK: // break;
fileModel.setFolderItemType(GXTFolderItemTypeEnum.EXTERNAL_RESOURCE_LINK); // case EXTERNAL_RESOURCE_LINK:
fileModel.setShortcutCategory(GXTCategoryItemInterface.SMF_LINKS); // fileModel.setFolderItemType(GXTFolderItemTypeEnum.EXTERNAL_RESOURCE_LINK);
break; // fileModel.setShortcutCategory(GXTCategoryItemInterface.SMF_LINKS);
// break;
default: default:
fileModel.setFolderItemType(GXTFolderItemTypeEnum.UNKNOWN_TYPE); fileModel.setFolderItemType(GXTFolderItemTypeEnum.UNKNOWN_TYPE);
fileModel.setShortcutCategory(GXTCategoryItemInterface.SMF_UNKNOWN); fileModel.setShortcutCategory(GXTCategoryItemInterface.SMF_UNKNOWN);
@ -1381,26 +1361,17 @@ public class GWTWorkspaceBuilder {
break; break;
case TIME_SERIES: case TIME_SERIES:
break; break;
// case AQUAMAPS_ITEM:
// break;
case PDF_DOCUMENT: case PDF_DOCUMENT:
break; break;
case IMAGE_DOCUMENT: case IMAGE_DOCUMENT:
GCubeItem imgDoc = (GCubeItem) worspaceFolderItem; //Cast GCubeItem GCubeItem imgDoc = (GCubeItem) worspaceFolderItem; //Cast GCubeItem
return imgDoc.getPublicLink(false); return imgDoc.getPublicLink(false);
// return ((ImageDocument) worspaceFolderItem).getPublicLink();
case DOCUMENT: case DOCUMENT:
break; break;
case URL_DOCUMENT: case URL_DOCUMENT:
break; break;
case METADATA: case METADATA:
break; break;
case WORKFLOW_REPORT:
break;
case WORKFLOW_TEMPLATE:
break;
case EXTERNAL_RESOURCE_LINK:
break;
default: default:
return ""; return "";
} }
@ -1514,31 +1485,6 @@ public class GWTWorkspaceBuilder {
return fileDetailsModel; return fileDetailsModel;
} }
// public List<FileGridModel> filterListByCategory(List<FileGridModel> listFileGridModel, String category) {
//
// List<FileGridModel> filteredList = new ArrayList<FileGridModel>();
//
// 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{ protected String getFolderItemTypeCategory(SearchItem item) throws InternalErrorException{
switch (item.getType()) { switch (item.getType()) {
@ -1567,9 +1513,7 @@ public class GWTWorkspaceBuilder {
case QUERY: case QUERY:
return GXTCategoryItemInterface.SMF_DOCUMENTS; return GXTCategoryItemInterface.SMF_DOCUMENTS;
case TIME_SERIES: case TIME_SERIES:
return GXTCategoryItemInterface.SMF_TIMESERIES; return GXTCategoryItemInterface.SMF_TIMESERIES;
case AQUAMAPS_ITEM:
return GXTCategoryItemInterface.SMF_BIODIVERSITY;
case PDF_DOCUMENT: case PDF_DOCUMENT:
return GXTCategoryItemInterface.SMF_DOCUMENTS; return GXTCategoryItemInterface.SMF_DOCUMENTS;
case IMAGE_DOCUMENT: case IMAGE_DOCUMENT:
@ -1580,12 +1524,6 @@ public class GWTWorkspaceBuilder {
return GXTCategoryItemInterface.SMF_DOCUMENTS; return GXTCategoryItemInterface.SMF_DOCUMENTS;
case METADATA: case METADATA:
return GXTCategoryItemInterface.SMF_DOCUMENTS; 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: default:
return GXTCategoryItemInterface.SMF_UNKNOWN; return GXTCategoryItemInterface.SMF_UNKNOWN;
} }
@ -1809,9 +1747,6 @@ public class GWTWorkspaceBuilder {
return new InfoContactModel(); return new InfoContactModel();
} }
// private static float counter = 0;
public List<BulkCreatorModel> buildGXTListBulkCreatorModel(List<FolderBulkCreator> listFBC) throws InternalErrorException { public List<BulkCreatorModel> buildGXTListBulkCreatorModel(List<FolderBulkCreator> listFBC) throws InternalErrorException {
List<BulkCreatorModel> listBulkCreatorModel = new ArrayList<BulkCreatorModel>(); List<BulkCreatorModel> listBulkCreatorModel = new ArrayList<BulkCreatorModel>();
@ -1840,37 +1775,6 @@ public class GWTWorkspaceBuilder {
listBulkCreatorModel.add(bulk); 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; return listBulkCreatorModel;
} }
@ -1896,7 +1800,6 @@ public class GWTWorkspaceBuilder {
switch (accountingEntry.getEntryType()) { switch (accountingEntry.getEntryType()) {
case CREATE: case CREATE:
if(gxtEntryType==null || gxtEntryType.equals(GxtAccountingEntryType.ALL) || gxtEntryType.equals(GxtAccountingEntryType.ALLWITHOUTREAD) || gxtEntryType.equals(GxtAccountingEntryType.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; AccountingEntryShare acc = (AccountingEntryShare) accountingEntry;
// List<String> listContacts = new ArrayList<String>();
// if(acc.getMembers()!=null && acc.getMembers().size()>0){
//
// listContacts = acc.getMembers();
// }
String msg = ""; String msg = "";
if(acc.getItemName()==null || acc.getItemName().isEmpty()) if(acc.getItemName()==null || acc.getItemName().isEmpty())
msg = user.getName() + " "+GxtAccountingEntryType.SHARE.getName()+ " workspace folder"; msg = user.getName() + " "+GxtAccountingEntryType.SHARE.getName()+ " workspace folder";

7
src/main/java/org/gcube/portlets/user/workspace/server/GWTWorkspaceServiceImpl.java
View File

@ -1125,7 +1125,7 @@ public class GWTWorkspaceServiceImpl extends RemoteServiceServlet implements GWT
//Category BIODIVERSITY //Category BIODIVERSITY
}else if(category.equals(GXTCategoryItemInterface.SMF_BIODIVERSITY.toString())){ }else if(category.equals(GXTCategoryItemInterface.SMF_BIODIVERSITY.toString())){
listWorkspaceItems = workspace.getFolderItems(FolderItemType.AQUAMAPS_ITEM); // listWorkspaceItems = workspace.getFolderItems(FolderItemType.AQUAMAPS_ITEM);
//Category DOCUMENTS //Category DOCUMENTS
}else if(category.equals(GXTCategoryItemInterface.SMF_DOCUMENTS.toString())){ }else if(category.equals(GXTCategoryItemInterface.SMF_DOCUMENTS.toString())){
@ -1136,16 +1136,13 @@ public class GWTWorkspaceServiceImpl extends RemoteServiceServlet implements GWT
FolderItemType.QUERY, FolderItemType.QUERY,
FolderItemType.PDF_DOCUMENT, FolderItemType.PDF_DOCUMENT,
FolderItemType.METADATA, FolderItemType.METADATA,
FolderItemType.WORKFLOW_REPORT,
FolderItemType.WORKFLOW_TEMPLATE,
// FolderItemType.URL_DOCUMENT,
FolderItemType.DOCUMENT FolderItemType.DOCUMENT
); );
//Category LINKS //Category LINKS
}else if(category.equals(GXTCategoryItemInterface.SMF_LINKS.toString())){ }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 //Category REPORTS
}else if(category.equals(GXTCategoryItemInterface.SMF_REPORTS.toString())){ }else if(category.equals(GXTCategoryItemInterface.SMF_REPORTS.toString())){