From 0cb675e8eb01db6d9855eef5ac9b55a29cf14ed3 Mon Sep 17 00:00:00 2001 From: Francesco Mangiacrapa Date: Fri, 18 Sep 2015 13:26:33 +0000 Subject: [PATCH] 718: Workspace: breadcrumb problem on VRE Folders after a two consecutive selection Task-Url: https://support.d4science.org/issues/show/718 Changed method getListsChildrenByParents to fix issue git-svn-id: http://svn.d4science-ii.research-infrastructures.eu/gcube/trunk/portlets/user/workspace-tree-widget@118950 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../client/AppControllerExplorer.java | 5 +- .../client/rpc/GWTWorkspaceService.java | 28 --- .../client/rpc/GWTWorkspaceServiceAsync.java | 24 --- .../workspace/server/GWTWorkspaceBuilder.java | 34 +++- .../server/GWTWorkspaceServiceImpl.java | 183 ++++-------------- 5 files changed, 62 insertions(+), 212 deletions(-) diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/AppControllerExplorer.java b/src/main/java/org/gcube/portlets/user/workspace/client/AppControllerExplorer.java index 7a7fd19..c3cb6c3 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/client/AppControllerExplorer.java +++ b/src/main/java/org/gcube/portlets/user/workspace/client/AppControllerExplorer.java @@ -578,6 +578,7 @@ public class AppControllerExplorer implements EventHandler, TreeAppControllerInt @Override public void onDeleteBulk(final DeleteBulkEvent deleteBulkEvent) { + /*NEVER USED rpcWorkspaceService.deleteBulk(deleteBulkEvent.getBulkId(), new AsyncCallback() { @Override @@ -590,11 +591,9 @@ public class AppControllerExplorer implements EventHandler, TreeAppControllerInt public void onSuccess(Boolean result) { if(result) BulkCreatorWindow.getInstance().removeProgress(deleteBulkEvent.getBulkId()); - - } - }); + });*/ } }); diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/rpc/GWTWorkspaceService.java b/src/main/java/org/gcube/portlets/user/workspace/client/rpc/GWTWorkspaceService.java index abaf72c..64fc5d0 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/client/rpc/GWTWorkspaceService.java +++ b/src/main/java/org/gcube/portlets/user/workspace/client/rpc/GWTWorkspaceService.java @@ -270,17 +270,6 @@ public interface GWTWorkspaceService extends RemoteService{ */ public String getUrlWebDav(String itemId) throws Exception; - // public boolean sendTo(List listContacts, List listAttachments, String subject, String text) throws Exception; - - /** - * Sent to by message model. - * - * @param message the message - * @return true, if successful - * @throws Exception the exception - */ - public boolean sentToByMessageModel(MessageModel message) throws Exception; - /** * Send to by id. * @@ -396,23 +385,6 @@ public interface GWTWorkspaceService extends RemoteService{ */ public boolean copyItem(String itemId, String destinationFolderId) throws Exception; - /** - * Gets the list folder bulk creator. - * - * @return the list folder bulk creator - * @throws Exception the exception - */ - public List getListFolderBulkCreator() throws Exception; - - /** - * Delete bulk. - * - * @param bulkId the bulk id - * @return true, if successful - * @throws Exception the exception - */ - public boolean deleteBulk(String bulkId) throws Exception; - /** * Gets the time series by id. * diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/rpc/GWTWorkspaceServiceAsync.java b/src/main/java/org/gcube/portlets/user/workspace/client/rpc/GWTWorkspaceServiceAsync.java index 66abd88..a90786c 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/client/rpc/GWTWorkspaceServiceAsync.java +++ b/src/main/java/org/gcube/portlets/user/workspace/client/rpc/GWTWorkspaceServiceAsync.java @@ -288,14 +288,6 @@ void sendToById(List listContactsId, List listAttachmentsId, Str */ void getMessageById(String messageIdentifier, String messageType, AsyncCallback asyncCallback); - /** - * Sent to by message model. - * - * @param message the message - * @param callback the callback - */ - void sentToByMessageModel(MessageModel message, AsyncCallback callback); - /** * Save attachments. * @@ -353,22 +345,6 @@ void sendToById(List listContactsId, List listAttachmentsId, Str */ void copyItem(String itemId, String destinationFolderId, AsyncCallback callback); - /** - * Gets the list folder bulk creator. - * - * @param callback the callback - * @return the list folder bulk creator - */ - void getListFolderBulkCreator(AsyncCallback> callback); - - /** - * Delete bulk. - * - * @param bulkId the bulk id - * @param callback the callback - */ - void deleteBulk(String bulkId, AsyncCallback callback); - /** * Gets the url web dav. * diff --git a/src/main/java/org/gcube/portlets/user/workspace/server/GWTWorkspaceBuilder.java b/src/main/java/org/gcube/portlets/user/workspace/server/GWTWorkspaceBuilder.java index 5e6d566..f07e5d0 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/server/GWTWorkspaceBuilder.java +++ b/src/main/java/org/gcube/portlets/user/workspace/server/GWTWorkspaceBuilder.java @@ -599,8 +599,7 @@ public class GWTWorkspaceBuilder { } return listFileModel; } - - + /** * Builds the gxt info contacts from portal logins. * @@ -663,14 +662,18 @@ public class GWTWorkspaceBuilder { */ protected FileModel buildGXTFileModelItem(WorkspaceItem item, FileModel parentFolderModel) throws InternalErrorException { + logger.debug("buildGXTFileModelItem: "+item.getName()); FileModel fileModel = null; + if(parentFolderModel!=null) + parentFolderModel = (FolderModel) parentFolderModel; + switch (item.getType()) { case FOLDER: - fileModel = new FolderModel(item.getId(), item.getName(), (FolderModel) parentFolderModel, true, false, false); + fileModel = new FolderModel(item.getId(), item.getName(), parentFolderModel, true, false, false); fileModel.setType(GXTFolderItemTypeEnum.FOLDER.toString()); fileModel.setShareable(true); fileModel.setDescription(item.getDescription()); @@ -678,7 +681,7 @@ public class GWTWorkspaceBuilder { case FOLDER_ITEM: - fileModel = new FileModel(item.getId(), item.getName(), (FolderModel) parentFolderModel, false, false); + fileModel = new FileModel(item.getId(), item.getName(), parentFolderModel, false, false); FolderItem folderItem = (FolderItem) item; fileModel = setFolderItemType(fileModel, folderItem); fileModel.setShareable(true); @@ -686,8 +689,14 @@ public class GWTWorkspaceBuilder { case SHARED_FOLDER: WorkspaceSharedFolder shared = (WorkspaceSharedFolder) item; + //TODO + logger.debug("******START"); + logger.debug("wsFolder.isShared(): "+shared.isShared()); + logger.debug("wsFolder.getType().equals(WorkspaceItemType.SHARED_FOLDER): "+shared.getType().equals(WorkspaceItemType.SHARED_FOLDER)); + logger.debug("shared.isVreFolder(): "+shared.isVreFolder()); + logger.debug("*******END"); String name = shared.isVreFolder()?shared.getDisplayName():item.getName(); - fileModel = new FolderModel(item.getId(), name, (FolderModel) parentFolderModel, true, true, shared.isVreFolder()); + fileModel = new FolderModel(item.getId(), name, parentFolderModel, true, true, shared.isVreFolder()); fileModel.setType(GXTFolderItemTypeEnum.SHARED_FOLDER.toString()); fileModel.setShareable(true); fileModel.setDescription(item.getDescription()); @@ -1189,6 +1198,7 @@ public class GWTWorkspaceBuilder { * @throws InternalErrorException the internal error exception */ public FolderModel buildGXTFolderModelItem(WorkspaceFolder wsFolder, FileModel parent) throws InternalErrorException { + logger.debug("buildGXTFolderModelItem..."); String name = ""; @@ -1233,21 +1243,31 @@ public class GWTWorkspaceBuilder { String name = ""; + logger.debug("buildGXTFolderModelItemHandleSpecialFolder to folder: "+wsFolder.getName()); //MANAGEMENT SHARED FOLDER NAME if(wsFolder.isShared() && wsFolder.getType().equals(WorkspaceItemType.SHARED_FOLDER)){ + logger.debug("MANAGEMENT SHARED Folder name.."); WorkspaceSharedFolder shared = (WorkspaceSharedFolder) wsFolder; + logger.debug("shared.isVreFolder(): "+shared.isVreFolder()); name = shared.isVreFolder()?shared.getDisplayName():wsFolder.getName(); + if(shared.isVreFolder()) + logger.debug("shared.getDisplayName(): "+shared.getDisplayName()); + //MANAGEMENT SPECIAL FOLDER }else if(wsFolder.getName().compareTo("MySpecialFolders")==0 && wsFolder.getParent()!=null && wsFolder.getParent().isRoot()){ //MANAGEMENT SPECIAL FOLDER - logger.info("MANAGEMENT SPECIAL FOLDER NAME REWRITING AS: "+specialFolderName); + logger.debug("MANAGEMENT SPECIAL FOLDER NAME REWRITING AS: "+specialFolderName); if(specialFolderName!=null && !specialFolderName.isEmpty()) name = specialFolderName; else name = wsFolder.getName(); - }else + }else{ + logger.debug("MANAGEMENT Base Folder name.."); name = wsFolder.getName(); + } + + logger.debug("Name is: "+name); FolderModel folder = new FolderModel(wsFolder.getId(), name, parent, true, wsFolder.isShared(), false); folder.setShareable(true); diff --git a/src/main/java/org/gcube/portlets/user/workspace/server/GWTWorkspaceServiceImpl.java b/src/main/java/org/gcube/portlets/user/workspace/server/GWTWorkspaceServiceImpl.java index aed8e51..6bcc628 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/server/GWTWorkspaceServiceImpl.java +++ b/src/main/java/org/gcube/portlets/user/workspace/server/GWTWorkspaceServiceImpl.java @@ -322,7 +322,7 @@ public class GWTWorkspaceServiceImpl extends RemoteServiceServlet implements GWT if(folder == null) throw new Exception("Folder is null"); - workspaceLogger.trace("get folder children for: "+folder.getIdentifier()); + workspaceLogger.trace("get folder children for: "+folder.getIdentifier() +" name: "+folder.getName()); workspace = getWorkspace(); List listFileModels = new ArrayList(); WorkspaceItem wsItem = workspace.getItem(folder.getIdentifier()); @@ -1064,24 +1064,28 @@ public class GWTWorkspaceServiceImpl extends RemoteServiceServlet implements GWT } + /** * Gets the lists children by parents. * * @param listSubTree the list sub tree - * @param item the item + * @param parent the parent * @return the lists children by parents * @throws Exception the exception */ - private void getListsChildrenByParents(ArrayList listSubTree, WorkspaceItem item) throws Exception{ - - if(item==null || item.getParent()==null) + private void getListsChildrenByParents(ArrayList listSubTree, WorkspaceItem parent) throws Exception{ + + if(parent==null || parent.getParent()==null) return; - FolderModel parentModel = new FolderModel(item.getParent().getId(), item.getParent().getName(), null, true, item.getParent().isShared(), false); //Create parent model + workspaceLogger.trace("getListsChildrenByParents: "+parent.getName()); + + GWTWorkspaceBuilder builder = getGWTWorkspaceBuilder(); + FolderModel parentModel = (FolderModel) builder.buildGXTFileModelItem(parent, null); List childrenList = getFolderChildren(parentModel); //create children list SubTree subTree = new SubTree(parentModel, childrenList); listSubTree.add(subTree); - getListsChildrenByParents(listSubTree, item.getParent()); + getListsChildrenByParents(listSubTree, parent.getParent()); } /* (non-Javadoc) @@ -1326,7 +1330,6 @@ public class GWTWorkspaceServiceImpl extends RemoteServiceServlet implements GWT }else if(folderItem.getFolderItemType().equals(FolderItemType.REPORT_TEMPLATE)){ setValueInSession("idtemplate", oid); - } return ""; } @@ -1449,27 +1452,26 @@ public class GWTWorkspaceServiceImpl extends RemoteServiceServlet implements GWT } /* (non-Javadoc) - * @see org.gcube.portlets.user.workspace.client.rpc.GWTWorkspaceService#sendToById(java.util.List, java.util.List, java.lang.String, java.lang.String) - */ -@Override + * @see org.gcube.portlets.user.workspace.client.rpc.GWTWorkspaceService#sendToById(java.util.List, java.util.List, java.lang.String, java.lang.String) + */ + @Override public boolean sendToById(List listContactsId, List listAttachmentsId, String subject, String body) throws Exception { try { Workspace workspace = getWorkspace(); - - workspaceLogger.trace("######### SEND TO: "); - workspaceLogger.trace("subject " + subject); - workspaceLogger.trace("body " + body); +// workspaceLogger.trace("######### SEND TO: "); +// workspaceLogger.trace("subject " + subject); +// workspaceLogger.trace("body " + body); + //DEBUG for(String contactId : listContactsId) workspaceLogger.trace("contactId " + contactId); - + //DEBUG for(String id : listAttachmentsId) workspaceLogger.trace("attachId " + id); workspace.getWorkspaceMessageManager().sendMessageToPortalLogins(subject, body, listAttachmentsId, listContactsId); - return true; } catch (Exception e) { @@ -1574,49 +1576,8 @@ public class GWTWorkspaceServiceImpl extends RemoteServiceServlet implements GWT } return listWorkspaceItem; - - } - /* (non-Javadoc) - * @see org.gcube.portlets.user.workspace.client.rpc.GWTWorkspaceService#getListFolderBulkCreator() - */ - @Override - public List getListFolderBulkCreator() throws Exception { - - /* try { - Workspace workspace = getWorkspace(); - - List listFBC = workspace.getFolderBulkCreatorManager().getActiveFolderBulkCreators(); - - GWTWorkspaceBuilder builder = getGWTWorkspaceBuilder(); - - return builder.buildGXTListBulkCreatorModel(listFBC); - - } catch (Exception e) { - workspaceLogger.error("Error in getNewFolderBulkCreator ", e); -// workspaceLogger.trace("Error in getNewFolderBulkCreator " + e.getMessage()); - //GWT can't serialize all exceptions - throw new Exception(e.getMessage()); - } - - */ - return null; - } - - /* (non-Javadoc) - * @see org.gcube.portlets.user.workspace.client.rpc.GWTWorkspaceService#sentToByMessageModel(org.gcube.portlets.user.workspace.client.model.MessageModel) - */ - @Override - @Deprecated - /** - * use WsMailWidget - */ - public boolean sentToByMessageModel(MessageModel message) throws Exception { - return false; - } - - /* (non-Javadoc) * @see org.gcube.portlets.user.workspace.client.rpc.GWTWorkspaceService#saveAttachments(java.lang.String, java.lang.String) */ @@ -1664,6 +1625,7 @@ public class GWTWorkspaceServiceImpl extends RemoteServiceServlet implements GWT * @see org.gcube.portlets.user.workspace.client.rpc.GWTWorkspaceService#markMessage(java.lang.String, java.lang.String, boolean, java.lang.String) */ @Override + @Deprecated public boolean markMessage(String messageIdentifier, String messageType, boolean boolMark, String markType) throws Exception { try { @@ -1673,9 +1635,8 @@ public class GWTWorkspaceServiceImpl extends RemoteServiceServlet implements GWT workspaceLogger.trace(" markMessageAsRead by messageIdentifier " + messageIdentifier + " boolMark " + boolMark + " messageType " +messageType); if(messageType.equals(GXTCategoryItemInterface.MS_RECEIVED)){ - -// workspaceLogger.trace("#######################################Message identifier: "+messageIdentifier); -// workspaceLogger.trace("#######################################Message messageType: "+messageType); +// workspaceLogger.trace("message identifier: "+messageIdentifier); +// workspaceLogger.trace("Message messageType: "+messageType); if(markType.equals("READ")){ workspace.getWorkspaceMessageManager().getReceivedMessage(messageIdentifier).setStatus(boolMark); @@ -1685,12 +1646,9 @@ public class GWTWorkspaceServiceImpl extends RemoteServiceServlet implements GWT workspace.getWorkspaceMessageManager().getReceivedMessage(messageIdentifier).setStatus(boolMark); workspace.getWorkspaceMessageManager().getReceivedMessage(messageIdentifier).open(); } - } - - else{ - -// workspaceLogger.trace("#######################################Message sent identifier: "+messageIdentifier); -// workspaceLogger.trace("#######################################Message sent messageType: "+messageType); + }else{ +// workspaceLogger.trace("Message sent identifier: "+messageIdentifier); +// workspaceLogger.trace("essage sent messageType: "+messageType); if(markType.equals("READ")){ workspace.getWorkspaceMessageManager().getSentMessage(messageIdentifier).setStatus(boolMark); @@ -1734,8 +1692,6 @@ public class GWTWorkspaceServiceImpl extends RemoteServiceServlet implements GWT workspace.getWorkspaceMessageManager().deleteSentMessage(messageIdentifier); return true; - - } catch (Exception e) { workspaceLogger.error("Error in server deleteMessage by messageIdentifier ", e); //GWT can't serialize all exceptions @@ -1764,8 +1720,6 @@ public class GWTWorkspaceServiceImpl extends RemoteServiceServlet implements GWT listMessageModels.add(new MessageModel()); return listMessageModels; - - } catch (Exception e) { workspaceLogger.error("Error in server getNewMessagesReceived by messageIdentifier ", e); //GWT can't serialize all exceptions @@ -1840,16 +1794,11 @@ public class GWTWorkspaceServiceImpl extends RemoteServiceServlet implements GWT try { Workspace workspace = getWorkspace(); - WorkspaceItem sourceItem = workspace.getItem(itemId); //GET SOURCE ITEM BEFORE COPY String sourceSharedId = sourceItem.getIdSharedFolder(); - workspaceLogger.trace("copyItem by id: " + itemId); - WorkspaceItem destinationItem = workspace.copy(itemId, destinationFolderId); //copy item - WorkspaceItem folderDestinationItem = workspace.getItem(destinationFolderId); - checkNotifyAddItemToShare(destinationItem, sourceSharedId, folderDestinationItem); if(destinationItem!=null) @@ -1889,13 +1838,9 @@ public class GWTWorkspaceServiceImpl extends RemoteServiceServlet implements GWT WorkspaceItem sourceItem = workspace.getItem(itemId); //GET SOURCE ITEM BEFORE COPY String sourceSharedId = sourceItem.getIdSharedFolder(); - workspaceLogger.trace("copyItem by id: " + itemId); - WorkspaceItem destinationItem = workspace.copy(itemId, destinationFolderId); //copy item - WorkspaceItem folderDestinationItem = workspace.getItem(destinationFolderId); - checkNotifyAddItemToShare(destinationItem, sourceSharedId, folderDestinationItem); if(destinationItem==null){ @@ -1923,27 +1868,6 @@ public class GWTWorkspaceServiceImpl extends RemoteServiceServlet implements GWT } } - /* (non-Javadoc) - * @see org.gcube.portlets.user.workspace.client.rpc.GWTWorkspaceService#deleteBulk(java.lang.String) - */ - @Override - public boolean deleteBulk(String bulkId) throws Exception { - - try { - Workspace workspace = getWorkspace(); - workspaceLogger.trace("delete bulk " + bulkId); - workspace.getFolderBulkCreatorManager().getActiveFolderBulkCreator(bulkId).remove(); - - return true; - - } catch (Exception e) { - workspaceLogger.error("Error in getNewFolderBulkCreator ", e); -// workspaceLogger.trace("Error in getNewFolderBulkCreator " + e.getMessage()); - throw new Exception(e.getMessage()); - } - - } - /* (non-Javadoc) * @see org.gcube.portlets.user.workspace.client.rpc.GWTWorkspaceService#getUrlWebDav(java.lang.String) */ @@ -2203,11 +2127,11 @@ public class GWTWorkspaceServiceImpl extends RemoteServiceServlet implements GWT @Override public List getListParentsByItemIdentifier(String itemIdentifier, boolean includeItemAsParent) throws Exception { List listParents = new ArrayList(); - workspaceLogger.trace("get List Parents By Item Identifier "+ itemIdentifier +", include Item As (Last) Parent: "+includeItemAsParent); + workspaceLogger.debug("get List Parents By Item Identifier "+ itemIdentifier +", include Item As (Last) Parent: "+includeItemAsParent); try { Workspace workspace = getWorkspace(); WorkspaceItem wsItem = workspace.getItem(itemIdentifier); - workspaceLogger.trace("workspace retrieve item name: "+wsItem.getName()); + workspaceLogger.debug("workspace retrieve item name: "+wsItem.getName()); GWTWorkspaceBuilder builder = getGWTWorkspaceBuilder(); String nameSpecialFolder = getNameForSpecialFolder(); @@ -2230,7 +2154,6 @@ public class GWTWorkspaceServiceImpl extends RemoteServiceServlet implements GWT FileModel parent = listParents.get(i); FileModel fileModel = listParents.get(i+1); - fileModel.setParentFileModel(parent); } @@ -2261,11 +2184,8 @@ public class GWTWorkspaceServiceImpl extends RemoteServiceServlet implements GWT } Workspace workspace = getWorkspace(); - WorkspaceItem wsItem = workspace.getItem(itemId); - GWTWorkspaceBuilder builder = getGWTWorkspaceBuilder(); - return builder.buildGXTInfoContactModel(wsItem.getOwner()); } catch (Exception e) { @@ -2284,15 +2204,11 @@ public class GWTWorkspaceServiceImpl extends RemoteServiceServlet implements GWT workspaceLogger.info("Get User Manager to shared folder id: "+folderId); Workspace workspace = getWorkspace(); - List listManagers = new ArrayList(); - workspaceLogger.info("Adding owner.."); InfoContactModel owner = getOwnerByItemId(folderId); //GET OWNER - workspaceLogger.info("Added owner: "+owner); listManagers.add(owner); - WorkspaceItem wsItem = workspace.getItem(folderId); if(wsItem.isShared() && (wsItem.getType().equals(WorkspaceItemType.SHARED_FOLDER))){ @@ -2315,9 +2231,7 @@ public class GWTWorkspaceServiceImpl extends RemoteServiceServlet implements GWT List adms = builder.buildGxtInfoContactsFromPortalLogins(listLogins); listManagers.addAll(adms); - workspaceLogger.info("Returing" +listManagers.size() +"users managers"); - return listManagers; } @@ -2435,16 +2349,12 @@ public class GWTWorkspaceServiceImpl extends RemoteServiceServlet implements GWT workspaceLogger.trace("get last modification date ItemId "+ itemId); try { - Workspace workspace = getWorkspace(); - + Workspace workspace = getWorkspace(); WorkspaceItem wsItem = workspace.getItem(itemId); - wsItem.getLastModificationTime().getTime(); - Date lastModification =null; if(wsItem.getLastModificationTime()!=null){ - lastModification = wsItem.getLastModificationTime().getTime(); } @@ -2464,12 +2374,10 @@ public class GWTWorkspaceServiceImpl extends RemoteServiceServlet implements GWT workspaceLogger.trace("get Parent By Item Identifier "+ identifier); try { + Workspace workspace = getWorkspace(); - WorkspaceItem wsItem = workspace.getItem(identifier); - workspaceLogger.trace("workspace retrieve item name: "+wsItem.getName()); - GWTWorkspaceBuilder builder = getGWTWorkspaceBuilder(); while(wsItem!=null && wsItem.getParent()!=null){ @@ -2498,15 +2406,9 @@ public class GWTWorkspaceServiceImpl extends RemoteServiceServlet implements GWT try { Workspace workspace = getWorkspace(); - WorkspaceItem wsItem = workspace.getItem(identifier); - -// List accoutings = wsItem.getAccounting(); - GWTWorkspaceBuilder builder = getGWTWorkspaceBuilder(); - List listReaders = builder.buildGXTAccountingItemFromReaders(wsItem.getReaders()); - workspaceLogger.trace("get accounting readers - returning size "+listReaders.size()); return listReaders; @@ -2527,15 +2429,10 @@ public class GWTWorkspaceServiceImpl extends RemoteServiceServlet implements GWT try { Workspace workspace = getWorkspace(); - WorkspaceItem wsItem = workspace.getItem(identifier); - List accoutings = wsItem.getAccounting(); - GWTWorkspaceBuilder builder = getGWTWorkspaceBuilder(); - List listReaders = builder.buildGXTAccountingItem(accoutings, GxtAccountingEntryType.ALL); - workspaceLogger.trace("get accounting readers - returning size "+listReaders.size()); return listReaders; @@ -2553,10 +2450,9 @@ public class GWTWorkspaceServiceImpl extends RemoteServiceServlet implements GWT public String getShortUrl(String longUrl) throws Exception { workspaceLogger.trace("get short url for "+ longUrl); - UrlShortener shortener = getUrlShortener(); try{ - + if(shortener!=null && shortener.isAvailable()) return shortener.shorten(longUrl); @@ -2650,33 +2546,24 @@ public class GWTWorkspaceServiceImpl extends RemoteServiceServlet implements GWT throw new Exception("List identifiers is null"); Workspace workspace = getWorkspace(); - workspaceLogger.trace("removeItem item for list size: "+ids.size()); for (String itemId : ids) { - //NOTIFICATION WorkspaceItem wsItem = workspace.getItem(itemId); - //SAVING ATTRIBUTE FOR NOTIFICATION boolean sourceItemIsShared = wsItem.isShared(); String itemName = wsItem.getName(); String sourceFolderSharedId = null; - if(sourceItemIsShared){ sourceFolderSharedId = wsItem.getIdSharedFolder(); - } - + } //REMOVE ITEM workspace.removeItem(itemId); - //IF SOURCE SHARED FOLDER IS NOT NULL if(sourceFolderSharedId!=null) NotificationsUtil.checkSendNotifyRemoveItemToShare(this.getThreadLocalRequest().getSession(), sourceItemIsShared, itemName, itemId, sourceFolderSharedId); - } - - } catch (InsufficientPrivilegesException e) { workspaceLogger.error("Error in server Item remove", e); String error = "An error occurred on deleting item. "+e.getMessage(); @@ -2709,8 +2596,7 @@ public class GWTWorkspaceServiceImpl extends RemoteServiceServlet implements GWT throw new Exception("List Logins is null or empty"); workspaceLogger.trace("Setting ACL for folder id: "+folderId); - workspaceLogger.trace("ACL type is: "+aclType); - + workspaceLogger.trace("ACL type is: "+aclType); Workspace workspace = getWorkspace(); WorkspaceItem wsItem = workspace.getItem(folderId); @@ -2728,9 +2614,7 @@ public class GWTWorkspaceServiceImpl extends RemoteServiceServlet implements GWT workspaceLogger.trace("Folder " +ite.getName()+" is a "+WorkspaceFolder.class.getName()); // ite = (WorkspaceSharedFolder) workspace.getItem(wsItem.getIdSharedFolder()); } - // validateACLToUser(ite, listLogins, aclType); - ite.setACL(listLogins, ACLType.valueOf(aclType)); }else throw new Exception("Source item is not shared or shared folder"); @@ -2988,7 +2872,7 @@ public class GWTWorkspaceServiceImpl extends RemoteServiceServlet implements GWT } /** - * Gets ACLs Description For WorkspaceItem ById + * Gets ACLs Description For WorkspaceItem ById. * * @param workspaceItemId the folder id * @return a description of the ACLs @@ -3625,5 +3509,4 @@ public class GWTWorkspaceServiceImpl extends RemoteServiceServlet implements GWT throw new Exception(error); } } - }