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:
parent
6a61757cda
commit
10f24eaeae
|
@ -542,21 +542,18 @@ public class GWTWorkspaceServiceImpl extends RemoteServiceServlet implements GWT
|
|||
if(sourceItemIsShared)
|
||||
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);
|
||||
|
||||
workspace.moveItem(itemId, destinationId); //move item
|
||||
|
||||
WorkspaceItem destinationItem = workspace.moveItem(itemId, destinationId); //move item
|
||||
WorkspaceItem folderDestinationItem = workspace.getItem(destinationId); //retrieve folder destination
|
||||
|
||||
//System.out.println("sourceItem.isShared() "+sourceItemIsShared );
|
||||
//System.out.println("folderDestinationItem item: "+destinationId+" folderDestinationItem name "+folderDestinationItem.getName() + " folderDestinationItem shared: "+folderDestinationItem.isShared());
|
||||
|
||||
workspaceLogger.trace("sourceItem.isShared() "+sourceItemIsShared);
|
||||
workspaceLogger.trace("folderDestinationItem item: "+destinationId+" folderDestinationItem name "+folderDestinationItem.getName() + " folderDestinationItem shared: "+folderDestinationItem.isShared());
|
||||
|
||||
if(folderDestinationItem!=null){
|
||||
|
||||
try{
|
||||
checkNotifyAddItemToShare(sourceItem, sourceSharedId, folderDestinationItem);
|
||||
|
||||
checkNotifyAddItemToShare(destinationItem, sourceSharedId, folderDestinationItem);
|
||||
checkNotifyMoveItemFromShare(sourceItemIsShared, sourceItem, sourceSharedId, folderDestinationItem);
|
||||
|
||||
}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");
|
||||
|
||||
|
@ -664,7 +661,7 @@ public class GWTWorkspaceServiceImpl extends RemoteServiceServlet implements GWT
|
|||
//if folder destination is shared folder
|
||||
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
|
||||
boolean shareChangeCondition = (sourceSharedId==null) || (sourceSharedId.compareTo(folderDestinationItem.getIdSharedFolder())!=0);
|
||||
|
@ -688,11 +685,11 @@ public class GWTWorkspaceServiceImpl extends RemoteServiceServlet implements GWT
|
|||
NotificationsProducer np = getNotificationProducer();
|
||||
|
||||
if(destinationSharedFolder instanceof WorkspaceSharedFolder){
|
||||
np.notifyAddedItemToSharing(listContacts, sourceItem, (WorkspaceSharedFolder) destinationSharedFolder);
|
||||
np.notifyAddedItemToSharing(listContacts, destinationItem, (WorkspaceSharedFolder) destinationSharedFolder);
|
||||
workspaceLogger.trace("The notifies sent correctly");
|
||||
}
|
||||
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);
|
||||
}
|
||||
}
|
||||
|
@ -1848,13 +1845,13 @@ public class GWTWorkspaceServiceImpl extends RemoteServiceServlet implements GWT
|
|||
|
||||
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);
|
||||
|
||||
checkNotifyAddItemToShare(item, sourceSharedId, folderDestinationItem);
|
||||
checkNotifyAddItemToShare(destinationItem, sourceSharedId, folderDestinationItem);
|
||||
|
||||
if(item!=null)
|
||||
if(destinationItem!=null)
|
||||
return true;
|
||||
|
||||
return false;
|
||||
|
@ -1891,13 +1888,13 @@ public class GWTWorkspaceServiceImpl extends RemoteServiceServlet implements GWT
|
|||
|
||||
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);
|
||||
|
||||
checkNotifyAddItemToShare(item, sourceSharedId, folderDestinationItem);
|
||||
checkNotifyAddItemToShare(destinationItem, sourceSharedId, folderDestinationItem);
|
||||
|
||||
if(item==null){
|
||||
if(destinationItem==null){
|
||||
error = true;
|
||||
break;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue