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

fixed https://support.d4science.research-infrastructures.eu/ticket/940 

git-svn-id: http://svn.d4science-ii.research-infrastructures.eu/gcube/trunk/portlets/user/workspace-tree-widget@98615 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Francesco Mangiacrapa 2014-07-14 15:21:43 +00:00
parent 6a61757cda
commit 10f24eaeae
1 changed files with 16 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -542,21 +542,18 @@ public class GWTWorkspaceServiceImpl extends RemoteServiceServlet implements GWT
if(sourceItemIsShared) if(sourceItemIsShared)
sourceSharedId = sourceItem.getIdSharedFolder(); //GET SHARED ID BEFORE OF MOVE sourceSharedId = sourceItem.getIdSharedFolder(); //GET SHARED ID BEFORE OF MOVE
workspaceLogger.trace("moveItem item: "+itemId+" sourceItem name "+sourceItem.getName() + " shared: "+sourceItemIsShared+ " destination: "+destinationId);
//System.out.println("moveItem item: "+itemId+" sourceItem name "+sourceItem.getName() + " shared: "+sourceItemIsShared+ " destination: "+destinationId); WorkspaceItem destinationItem = workspace.moveItem(itemId, destinationId); //move item
workspace.moveItem(itemId, destinationId); //move item
WorkspaceItem folderDestinationItem = workspace.getItem(destinationId); //retrieve folder destination WorkspaceItem folderDestinationItem = workspace.getItem(destinationId); //retrieve folder destination
//System.out.println("sourceItem.isShared() "+sourceItemIsShared ); workspaceLogger.trace("sourceItem.isShared() "+sourceItemIsShared);
//System.out.println("folderDestinationItem item: "+destinationId+" folderDestinationItem name "+folderDestinationItem.getName() + " folderDestinationItem shared: "+folderDestinationItem.isShared()); workspaceLogger.trace("folderDestinationItem item: "+destinationId+" folderDestinationItem name "+folderDestinationItem.getName() + " folderDestinationItem shared: "+folderDestinationItem.isShared());
if(folderDestinationItem!=null){ if(folderDestinationItem!=null){
try{ try{
checkNotifyAddItemToShare(sourceItem, sourceSharedId, folderDestinationItem); checkNotifyAddItemToShare(destinationItem, sourceSharedId, folderDestinationItem);
checkNotifyMoveItemFromShare(sourceItemIsShared, sourceItem, sourceSharedId, folderDestinationItem); checkNotifyMoveItemFromShare(sourceItemIsShared, sourceItem, sourceSharedId, folderDestinationItem);
}catch (Exception e) { }catch (Exception e) {
@ -654,7 +651,7 @@ public class GWTWorkspaceServiceImpl extends RemoteServiceServlet implements GWT
} }
private void checkNotifyAddItemToShare(final WorkspaceItem sourceItem, final String sourceSharedId, final WorkspaceItem folderDestinationItem) { private void checkNotifyAddItemToShare(final WorkspaceItem destinationItem, final String sourceSharedId, final WorkspaceItem folderDestinationItem) {
workspaceLogger.trace("checkNotifyAddItemToShare"); workspaceLogger.trace("checkNotifyAddItemToShare");
@ -664,7 +661,7 @@ public class GWTWorkspaceServiceImpl extends RemoteServiceServlet implements GWT
//if folder destination is shared folder //if folder destination is shared folder
if(folderDestinationItem.isShared()){ //Notify Added Item To Sharing? if(folderDestinationItem.isShared()){ //Notify Added Item To Sharing?
workspaceLogger.trace("checkNotifyAddItemToShare source item: "+sourceItem.getName()+" sourceSharedId: "+sourceSharedId + " folder destination: "+folderDestinationItem.getName()); workspaceLogger.trace("checkNotifyAddItemToShare destination item: "+destinationItem.getName()+" sourceSharedId: "+sourceSharedId + " folder destination: "+folderDestinationItem.getName());
//share condition is true if source shared folder is null or not equal to destination shared folder //share condition is true if source shared folder is null or not equal to destination shared folder
boolean shareChangeCondition = (sourceSharedId==null) || (sourceSharedId.compareTo(folderDestinationItem.getIdSharedFolder())!=0); boolean shareChangeCondition = (sourceSharedId==null) || (sourceSharedId.compareTo(folderDestinationItem.getIdSharedFolder())!=0);
@ -688,11 +685,11 @@ public class GWTWorkspaceServiceImpl extends RemoteServiceServlet implements GWT
NotificationsProducer np = getNotificationProducer(); NotificationsProducer np = getNotificationProducer();
if(destinationSharedFolder instanceof WorkspaceSharedFolder){ if(destinationSharedFolder instanceof WorkspaceSharedFolder){
np.notifyAddedItemToSharing(listContacts, sourceItem, (WorkspaceSharedFolder) destinationSharedFolder); np.notifyAddedItemToSharing(listContacts, destinationItem, (WorkspaceSharedFolder) destinationSharedFolder);
workspaceLogger.trace("The notifies sent correctly"); workspaceLogger.trace("The notifies sent correctly");
} }
else else
workspaceLogger.warn("Notifies added item: "+sourceItem+ "to share doesn't sent because "+destinationSharedFolder+" is not istance of WorkspaceSharedFolder"); workspaceLogger.warn("Notifies added item: "+destinationItem+ "to share doesn't sent because "+destinationSharedFolder+" is not istance of WorkspaceSharedFolder");
// np.notifyAddedItemToSharing(listContacts, (WorkspaceFolder) folderDestinationItem); // np.notifyAddedItemToSharing(listContacts, (WorkspaceFolder) folderDestinationItem);
} }
} }
@ -1848,13 +1845,13 @@ public class GWTWorkspaceServiceImpl extends RemoteServiceServlet implements GWT
workspaceLogger.trace("copyItem by id: " + itemId); workspaceLogger.trace("copyItem by id: " + itemId);
WorkspaceItem item = workspace.copy(itemId, destinationFolderId); //copy item WorkspaceItem destinationItem = workspace.copy(itemId, destinationFolderId); //copy item
WorkspaceItem folderDestinationItem = workspace.getItem(destinationFolderId); WorkspaceItem folderDestinationItem = workspace.getItem(destinationFolderId);
checkNotifyAddItemToShare(item, sourceSharedId, folderDestinationItem); checkNotifyAddItemToShare(destinationItem, sourceSharedId, folderDestinationItem);
if(item!=null) if(destinationItem!=null)
return true; return true;
return false; return false;
@ -1891,13 +1888,13 @@ public class GWTWorkspaceServiceImpl extends RemoteServiceServlet implements GWT
workspaceLogger.trace("copyItem by id: " + itemId); workspaceLogger.trace("copyItem by id: " + itemId);
WorkspaceItem item = workspace.copy(itemId, destinationFolderId); //copy item WorkspaceItem destinationItem = workspace.copy(itemId, destinationFolderId); //copy item
WorkspaceItem folderDestinationItem = workspace.getItem(destinationFolderId); WorkspaceItem folderDestinationItem = workspace.getItem(destinationFolderId);
checkNotifyAddItemToShare(item, sourceSharedId, folderDestinationItem); checkNotifyAddItemToShare(destinationItem, sourceSharedId, folderDestinationItem);
if(item==null){ if(destinationItem==null){
error = true; error = true;
break; break;
} }