From 2c87dc7333f1ffedd7a1f4403784d3eff98bc8f5 Mon Sep 17 00:00:00 2001 From: "massimiliano.assante" Date: Mon, 22 Oct 2018 10:54:05 +0000 Subject: [PATCH] removed shared folder paths from notifications git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/application-support-layer/applicationSupportLayerSocial@173742 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../social/ApplicationNotificationsManager.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/org/gcube/applicationsupportlayer/social/ApplicationNotificationsManager.java b/src/main/java/org/gcube/applicationsupportlayer/social/ApplicationNotificationsManager.java index 75eb939..170be3c 100644 --- a/src/main/java/org/gcube/applicationsupportlayer/social/ApplicationNotificationsManager.java +++ b/src/main/java/org/gcube/applicationsupportlayer/social/ApplicationNotificationsManager.java @@ -592,7 +592,7 @@ public class ApplicationNotificationsManager extends SocialPortalBridge implemen public boolean notifyAddedItem(String userIdToNotify, SocialFileItem item, SocialSharedFolder sharedFolder) throws InternalErrorException { String notifyText = sharedFolder.isVreFolder() ? "added "+ item.getTitle() +" to the workspace group folder " + sharedFolder.getDisplayName() : - "added "+ item.getTitle() +" to your workspace shared folder "+ item.getPath().substring(0,item.getPath().lastIndexOf('/')); + "added "+ item.getTitle() +" to your workspace shared folder "+ sharedFolder.getTitle(); Notification not = new Notification( UUID.randomUUID().toString(), @@ -737,8 +737,8 @@ public class ApplicationNotificationsManager extends SocialPortalBridge implemen */ @Override public boolean notifyUpdatedItem(String userIdToNotify, SocialFileItem item, SocialSharedFolder sharedFolder) throws InternalErrorException { - String notifyText = sharedFolder.isVreFolder() ? " updated \""+ item.getName() +"\" from the workspace group folder \"" + sharedFolder.getDisplayName()+"\"": - " updated \""+ item.getName() +"\" to your workspace shared folder \""+ item.getPath().substring(0,item.getPath().lastIndexOf('/'))+"\""; + String notifyText = sharedFolder.isVreFolder() ? " updated \""+ item.getName() +"\" from the workspace VRE folder \"" + sharedFolder.getDisplayName()+"\"": + " updated \""+ item.getName() +"\" to your workspace shared folder \""+ sharedFolder.getTitle() +"\""; Notification not = new Notification( UUID.randomUUID().toString(), @@ -786,8 +786,8 @@ public class ApplicationNotificationsManager extends SocialPortalBridge implemen */ @Override public boolean notifyItemRenaming(String userIdToNotify, String previousName, SocialFileItem renamedItem, SocialSharedFolder rootSharedFolder) throws InternalErrorException { - String notifyText = rootSharedFolder.isVreFolder() ? "renamed \""+ previousName +"\" as \"" + renamedItem.getName() +"\" in the workspace group folder " + rootSharedFolder.getDisplayName(): - "renamed \"" + previousName +"\" as \"" + renamedItem.getName() +"\" in your shared folder \"" + renamedItem.getPath().substring(0, renamedItem.getPath().lastIndexOf('/'))+"\""; + String notifyText = rootSharedFolder.isVreFolder() ? "renamed \""+ previousName +"\" as \"" + renamedItem.getName() +"\" in the workspace VRE folder " + rootSharedFolder.getDisplayName(): + "renamed \"" + previousName +"\" as \"" + renamedItem.getName() +"\" in your shared folder \"" + rootSharedFolder.getTitle()+"\""; Notification not = new Notification( UUID.randomUUID().toString(),