diff --git a/.classpath b/.classpath
index 544b85d..f7d0aa7 100644
--- a/.classpath
+++ b/.classpath
@@ -11,11 +11,13 @@
+
+
diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs
index 443e085..8db228c 100644
--- a/.settings/org.eclipse.jdt.core.prefs
+++ b/.settings/org.eclipse.jdt.core.prefs
@@ -5,4 +5,5 @@ org.eclipse.jdt.core.compiler.compliance=1.7
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.release=disabled
org.eclipse.jdt.core.compiler.source=1.7
diff --git a/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml b/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml
new file mode 100644
index 0000000..cc81385
--- /dev/null
+++ b/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml
@@ -0,0 +1,7 @@
+
+
+
+
+
+
+
diff --git a/.settings/org.eclipse.wst.common.project.facet.core.xml b/.settings/org.eclipse.wst.common.project.facet.core.xml
index bc0de8f..c222f09 100644
--- a/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ b/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -5,4 +5,5 @@
+
diff --git a/distro/changelog.xml b/distro/changelog.xml
index f2b0919..63967a9 100644
--- a/distro/changelog.xml
+++ b/distro/changelog.xml
@@ -1,10 +1,18 @@
-
+ [Incident #16285] Bug fixing
+
+
+
[Bug #13232] Fixing it
-
[Feature #11722] Workspace Uploader - Update to StorageHUB
@@ -15,7 +23,8 @@
drag and drop facility on Windows Operating System
-
[Task #7820] DaD and Browse: create new version of existing
items added
@@ -25,40 +34,48 @@
completed
-
Removed currUserId parameter from client-side
[Feature #6153] Improve error messages
Integrated with file versioning
-
Feature #5901 Remove ASL Dependency from workspace-uploader
Widget
Bug #6096 Fixed
-
[Feature #4128] Migration to Liferay 6.2
-
[Feature #4055] DnD multiple instances
-
[Feature #3962] Sequential upload status
-
Bug Fixed #1333
-
Bug Fixed - https://support.d4science.org/issues/1824
-
first release
diff --git a/pom.xml b/pom.xml
index 5a6100f..29c3d1f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
org.gcube.portlets.widgets
workspace-uploader
jar
- 2.0.1-SNAPSHOT
+ 2.0.2-SNAPSHOT
Workspace Uploader Widget
Workspace Uploader Widget allows your application to upload file/s in the gCube Workspace
diff --git a/src/main/java/org/gcube/portlets/widgets/workspaceuploader/server/notification/NotificationsWorkspaceUploader.java b/src/main/java/org/gcube/portlets/widgets/workspaceuploader/server/notification/NotificationsWorkspaceUploader.java
index dab8b7d..447f8be 100644
--- a/src/main/java/org/gcube/portlets/widgets/workspaceuploader/server/notification/NotificationsWorkspaceUploader.java
+++ b/src/main/java/org/gcube/portlets/widgets/workspaceuploader/server/notification/NotificationsWorkspaceUploader.java
@@ -60,21 +60,15 @@ public class NotificationsWorkspaceUploader {
try{
if(folderDestinationItem.isShared()){ //Notify Added Item To Sharing?
-
- //TODO folderDestinationItem.getIdSharedFolder()
logger.trace("checkNotifyAddItemToShare source item: "+sourceItem.getName()+" sourceSharedId: "+sourceSharedId + " folder destination name: "+folderDestinationItem.getName() + " folder destination id: "+folderDestinationItem.getId());
-
//share condition is true if source shared folder is not null
boolean shareChangeCondition = sourceSharedId==null?false:true;
-
- //System.out.println("shareChangeCondition add item: "+ shareChangeCondition);
-
logger.trace("shareChangeCondition add item: "+shareChangeCondition);
//if shareChangeCondition is true.. notifies added item to sharing
if(shareChangeCondition){
- SharedFolder folderDest = (SharedFolder) folderDestinationItem;
+ FolderItem folderDest = (FolderItem) folderDestinationItem;
SharedFolder rootSharedFolder = null;
try{
FolderItem sharedFolder = storageWrapper.getStorageHubClientService().getRootSharedFolder(folderDest.getId());
diff --git a/src/main/java/org/gcube/portlets/widgets/workspaceuploader/server/notification/NotificationsWorkspaceUploaderProducer.java b/src/main/java/org/gcube/portlets/widgets/workspaceuploader/server/notification/NotificationsWorkspaceUploaderProducer.java
index b968d6e..8601cd3 100644
--- a/src/main/java/org/gcube/portlets/widgets/workspaceuploader/server/notification/NotificationsWorkspaceUploaderProducer.java
+++ b/src/main/java/org/gcube/portlets/widgets/workspaceuploader/server/notification/NotificationsWorkspaceUploaderProducer.java
@@ -126,11 +126,8 @@ public class NotificationsWorkspaceUploaderProducer {
try{
//NOTIFIES ONLY THE USERS THAT ARE DIFFERENT FROM CURRENT USER
if(infoContactModel.getLogin().compareTo(username)!=0){
-
logger.info("Sending notification to user "+infoContactModel.getLogin() +" added item "+socialItem.getName()+" in shared folder "+socialSharedFolder.getName());
-
boolean notify = notificationsMng.notifyAddedItem(infoContactModel.getLogin(), socialItem, socialSharedFolder);
-
if(!notify){
logger.error("An error occured when notify user: "+infoContactModel.getLogin());
}
@@ -165,11 +162,9 @@ public class NotificationsWorkspaceUploaderProducer {
try{
//NOTIFIES ONLY THE USERS THAT ARE DIFFERENT FROM CURRENT USER
if(infoContactModel.getLogin().compareTo(username)!=0){
-
//TODO notificationsMng.notifyUpdatedItem(infoContactModel.getLogin(), workspaceItem, sharedFolder);
logger.info("Sending notification to user "+infoContactModel.getLogin() +" updated item "+socialItem.getName()+" in shared folder "+socialSharedFolder.getName());
boolean notify = notificationsMng.notifyUpdatedItem(infoContactModel.getLogin(), socialItem, socialSharedFolder);
-
if(!notify){
logger.error("An error updated when notify user: "+infoContactModel.getLogin());
}