From 6aac8193a3aba7c4baba9ccf209db1344f8e8506 Mon Sep 17 00:00:00 2001 From: Francesco Mangiacrapa Date: Fri, 19 Jun 2015 10:36:16 +0000 Subject: [PATCH] Updated switch on folderitemtype, added GCUBE_ITEM git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/widgets/workspace-sharing-widget@115442 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../server/GWTWorkspaceSharingBuilder.java | 16 ++----- .../shared/GXTFolderItemTypeEnum.java | 42 +++++++++---------- 2 files changed, 25 insertions(+), 33 deletions(-) diff --git a/src/main/java/org/gcube/portlets/widgets/workspacesharingwidget/server/GWTWorkspaceSharingBuilder.java b/src/main/java/org/gcube/portlets/widgets/workspacesharingwidget/server/GWTWorkspaceSharingBuilder.java index 3065fa5..03af8a9 100644 --- a/src/main/java/org/gcube/portlets/widgets/workspacesharingwidget/server/GWTWorkspaceSharingBuilder.java +++ b/src/main/java/org/gcube/portlets/widgets/workspacesharingwidget/server/GWTWorkspaceSharingBuilder.java @@ -377,13 +377,11 @@ public class GWTWorkspaceSharingBuilder { break; case EXTERNAL_FILE: fileModel.setFolderItemType(GXTFolderItemTypeEnum.EXTERNAL_FILE); - ExternalFile extFile = (ExternalFile) worspaceFolderItem; fileModel.setType(extFile.getMimeType()); break; case EXTERNAL_PDF_FILE: - fileModel - .setFolderItemType(GXTFolderItemTypeEnum.EXTERNAL_PDF_FILE); + fileModel.setFolderItemType(GXTFolderItemTypeEnum.EXTERNAL_PDF_FILE); ExternalPDFFile pdfExt = (ExternalPDFFile) worspaceFolderItem; fileModel.setType(pdfExt.getMimeType()); break; @@ -407,26 +405,19 @@ public class GWTWorkspaceSharingBuilder { break; case IMAGE_DOCUMENT: fileModel.setFolderItemType(GXTFolderItemTypeEnum.IMAGE_DOCUMENT); -// ImageDocument imgDoc = (ImageDocument) worspaceFolderItem; -// fileModel.setType(imgDoc.getMimeType()); - GCubeItem imgDoc = (GCubeItem) worspaceFolderItem; //Cast GCubeItem try { fileModel.setType(imgDoc.getMimeType()); } catch (InternalErrorException e) { - // TODO Auto-generated catch block logger.error("IMAGE_DOCUMENT InternalErrorException when getting MimeType on "+fileModel.getIdentifier()); } break; case DOCUMENT: fileModel.setFolderItemType(GXTFolderItemTypeEnum.DOCUMENT); -// Document doc = (Document) worspaceFolderItem; -// fileModel.setType(doc.getMimeType()); GCubeItem doc = (GCubeItem) worspaceFolderItem; //Cast GCubeItem try { fileModel.setType(doc.getMimeType()); } catch (InternalErrorException e) { - // TODO Auto-generated catch block logger.error("DOCUMENT InternalErrorException when getting MimeType on "+fileModel.getIdentifier()); } break; @@ -436,11 +427,12 @@ public class GWTWorkspaceSharingBuilder { case METADATA: fileModel.setFolderItemType(GXTFolderItemTypeEnum.METADATA); break; + case GCUBE_ITEM: + fileModel.setFolderItemType(GXTFolderItemTypeEnum.GCUBE_ITEM); + break; default: fileModel.setFolderItemType(GXTFolderItemTypeEnum.UNKNOWN_TYPE); fileModel.setType(GXTFolderItemTypeEnum.UNKNOWN_TYPE.toString()); - // logger.info("**************************************UNKNOWN******* filemodel "+ - // fileModel.getName()); break; } diff --git a/src/main/java/org/gcube/portlets/widgets/workspacesharingwidget/shared/GXTFolderItemTypeEnum.java b/src/main/java/org/gcube/portlets/widgets/workspacesharingwidget/shared/GXTFolderItemTypeEnum.java index 131dfa1..1e2d6b3 100644 --- a/src/main/java/org/gcube/portlets/widgets/workspacesharingwidget/shared/GXTFolderItemTypeEnum.java +++ b/src/main/java/org/gcube/portlets/widgets/workspacesharingwidget/shared/GXTFolderItemTypeEnum.java @@ -2,12 +2,14 @@ package org.gcube.portlets.widgets.workspacesharingwidget.shared; import java.io.Serializable; + /** - * @author Francesco Mangiacrapa francesco.mangiacrapa@isti.cnr.it + * The Enum GXTFolderItemTypeEnum. * + * @author Francesco Mangiacrapa francesco.mangiacrapa@isti.cnr.it + * Jun 19, 2015 */ public enum GXTFolderItemTypeEnum implements Serializable { -// AQUAMAPS_ITEM("AquaMaps Item"), EXTERNAL_FILE("External File"), EXTERNAL_IMAGE("External Image"), EXTERNAL_PDF_FILE("External PDF File"), @@ -27,34 +29,32 @@ public enum GXTFolderItemTypeEnum implements Serializable { UNKNOWN_TYPE("Unknow Type"), ANNOTATION("Annotation"), FOLDER("Folder"), - SHARED_FOLDER("Shared Folder"); -// EXTERNAL_IMAGE, -// EXTERNAL_FILE, -// EXTERNAL_PDF_FILE, -// EXTERNAL_URL, -// QUERY, -// REPORT_TEMPLATE, -// REPORT, -// DOCUMENT, -// METADATA, -// PDF_DOCUMENT, -// IMAGE_DOCUMENT, -// URL_DOCUMENT, -// TIME_SERIES, -// AQUAMAPS_ITEM, -// WORKFLOW_REPORT, -// WORKFLOW_TEMPLATE, -// UNKNOWN_TYPE; - + SHARED_FOLDER("Shared Folder"), + GCUBE_ITEM("Gcube Item"); + protected String label; + /** + * Instantiates a new GXT folder item type enum. + */ GXTFolderItemTypeEnum(){} + /** + * Instantiates a new GXT folder item type enum. + * + * @param label the label + */ GXTFolderItemTypeEnum(String label) { this.label = label; } + + /** + * Gets the label. + * + * @return the label + */ public String getLabel() { return label;