diff --git a/pom.xml b/pom.xml
index 6234d80..312a003 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
org.gcube.portlets.widgets
workspace-sharing-widget
jar
- 1.3.0-SNAPSHOT
+ 1.4.0-SNAPSHOT
gCube Workspace Sharing Widget
gCube Workspace Sharing Widget
@@ -132,13 +132,13 @@
org.gcube.common
home-library-jcr
- [1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT)
+ [2.0.0-SNAPSHOT, 3.0.0-SNAPSHOT)
provided
org.gcube.common
home-library
- [1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT)
+ [2.0.0-SNAPSHOT, 3.0.0-SNAPSHOT)
provided
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 92c1693..479ae3d 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
@@ -17,8 +17,7 @@ import org.gcube.common.homelibrary.home.workspace.folder.FolderItem;
import org.gcube.common.homelibrary.home.workspace.folder.items.ExternalFile;
import org.gcube.common.homelibrary.home.workspace.folder.items.ExternalImage;
import org.gcube.common.homelibrary.home.workspace.folder.items.ExternalPDFFile;
-import org.gcube.common.homelibrary.home.workspace.folder.items.gcube.Document;
-import org.gcube.common.homelibrary.home.workspace.folder.items.gcube.ImageDocument;
+import org.gcube.common.homelibrary.home.workspace.folder.items.GCubeItem;
import org.gcube.common.homelibrary.home.workspace.usermanager.GCubeGroup;
import org.gcube.portlets.widgets.workspacesharingwidget.client.ConstantsSharing;
import org.gcube.portlets.widgets.workspacesharingwidget.server.util.UserUtil;
@@ -42,11 +41,6 @@ import org.slf4j.LoggerFactory;
*/
public class GWTWorkspaceSharingBuilder {
- /**
- *
- */
-
-
protected Logger logger = LoggerFactory.getLogger(GWTWorkspaceSharingBuilder.class);
private InfoContactModel userLogged;
@@ -413,13 +407,28 @@ public class GWTWorkspaceSharingBuilder {
break;
case IMAGE_DOCUMENT:
fileModel.setFolderItemType(GXTFolderItemTypeEnum.IMAGE_DOCUMENT);
- ImageDocument imgDoc = (ImageDocument) worspaceFolderItem;
- fileModel.setType(imgDoc.getMimeType());
+// 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());
+// 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;
case URL_DOCUMENT:
fileModel.setFolderItemType(GXTFolderItemTypeEnum.URL_DOCUMENT);
diff --git a/src/main/java/org/gcube/portlets/widgets/workspacesharingwidget/server/WorkspaceSharingServiceImpl.java b/src/main/java/org/gcube/portlets/widgets/workspacesharingwidget/server/WorkspaceSharingServiceImpl.java
index 83a585a..e99a38a 100644
--- a/src/main/java/org/gcube/portlets/widgets/workspacesharingwidget/server/WorkspaceSharingServiceImpl.java
+++ b/src/main/java/org/gcube/portlets/widgets/workspacesharingwidget/server/WorkspaceSharingServiceImpl.java
@@ -5,13 +5,13 @@ import java.util.Arrays;
import java.util.List;
import org.gcube.application.framework.core.session.ASLSession;
+import org.gcube.common.homelibary.model.items.type.WorkspaceItemType;
import org.gcube.common.homelibrary.home.HomeLibrary;
import org.gcube.common.homelibrary.home.exceptions.HomeNotFoundException;
import org.gcube.common.homelibrary.home.exceptions.InternalErrorException;
import org.gcube.common.homelibrary.home.workspace.Workspace;
import org.gcube.common.homelibrary.home.workspace.WorkspaceFolder;
import org.gcube.common.homelibrary.home.workspace.WorkspaceItem;
-import org.gcube.common.homelibrary.home.workspace.WorkspaceItemType;
import org.gcube.common.homelibrary.home.workspace.WorkspaceSharedFolder;
import org.gcube.common.homelibrary.home.workspace.accessmanager.ACLType;
import org.gcube.common.homelibrary.home.workspace.exceptions.InsufficientPrivilegesException;
diff --git a/src/main/java/org/gcube/portlets/widgets/workspacesharingwidget/server/notifications/NotificationsUtil.java b/src/main/java/org/gcube/portlets/widgets/workspacesharingwidget/server/notifications/NotificationsUtil.java
index 860a315..ae94b6a 100644
--- a/src/main/java/org/gcube/portlets/widgets/workspacesharingwidget/server/notifications/NotificationsUtil.java
+++ b/src/main/java/org/gcube/portlets/widgets/workspacesharingwidget/server/notifications/NotificationsUtil.java
@@ -8,9 +8,9 @@ import java.util.List;
import javax.servlet.http.HttpSession;
+import org.gcube.common.homelibary.model.items.type.WorkspaceItemType;
import org.gcube.common.homelibrary.home.workspace.Workspace;
import org.gcube.common.homelibrary.home.workspace.WorkspaceItem;
-import org.gcube.common.homelibrary.home.workspace.WorkspaceItemType;
import org.gcube.common.homelibrary.home.workspace.WorkspaceSharedFolder;
import org.gcube.portlets.widgets.workspacesharingwidget.server.GWTWorkspaceSharingBuilder;
import org.gcube.portlets.widgets.workspacesharingwidget.server.util.WsUtil;
diff --git a/src/main/java/org/gcube/portlets/widgets/workspacesharingwidget/server/util/DiffereceBeetweenInfoContactModel.java b/src/main/java/org/gcube/portlets/widgets/workspacesharingwidget/server/util/DiffereceBeetweenInfoContactModel.java
index 317a2b4..27e64af 100644
--- a/src/main/java/org/gcube/portlets/widgets/workspacesharingwidget/server/util/DiffereceBeetweenInfoContactModel.java
+++ b/src/main/java/org/gcube/portlets/widgets/workspacesharingwidget/server/util/DiffereceBeetweenInfoContactModel.java
@@ -87,7 +87,7 @@ public class DiffereceBeetweenInfoContactModel {
* test
* @param args
*/
- public static void main(String[] args) {
+ /*public static void main(String[] args) {
List listA = new ArrayList();
listA.add(new InfoContactModel("federico.defaveri", "federico.defaveri", "Federico de Faveri", false));
@@ -108,7 +108,5 @@ public class DiffereceBeetweenInfoContactModel {
System.out.println("the differce is: "+diff.getDifferentsContacts());
- }
-
-
+ }*/
}