From 3b6f44bb123bdf8013f6ad1a987885c349a2b771 Mon Sep 17 00:00:00 2001 From: Francesco Mangiacrapa Date: Thu, 29 Oct 2015 17:00:06 +0000 Subject: [PATCH] 1270: Workspace improvements: many rpc calls after an delete multiple Task-Url: https://support.d4science.org/issues/1270 Fixed this task git-svn-id: http://svn.d4science-ii.research-infrastructures.eu/gcube/trunk/portlets/user/workspace-tree-widget@120109 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../workspace/client/AppControllerExplorer.java | 13 +++---------- .../client/interfaces/SubscriberInterface.java | 9 +++++---- 2 files changed, 8 insertions(+), 14 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 669773b..455c085 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 @@ -1858,20 +1858,18 @@ public class AppControllerExplorer implements EventHandler, TreeAppControllerInt }else if(event instanceof DeleteItemEvent){ DeleteItemEvent deleteEvent = (DeleteItemEvent) event; - - sub.deleteItem(deleteEvent.getFileTarget().getIdentifier()); + List ids = new ArrayList(1); + ids.add(deleteEvent.getFileTarget().getIdentifier()); + sub.deleteItems(ids); }else if(event instanceof SelectedItemEvent){ SelectedItemEvent selectedEvent = (SelectedItemEvent) event; - // ArrayList listFileModel = getListParentsByIdentifier(selectedEvent.getFileTarget().getIdentifier()); - List listFileModel = new ArrayList(); FileModel item = explorerPanel.getAsycTreePanel().getFileModelByIdentifier(selectedEvent.getFileTarget().getIdentifier()); -// System.out.println("selected item is "+item); listFileModel = getListParents(listFileModel,item); //used for update path bar sub.selectedItem(selectedEvent.getFileTarget(), listFileModel); @@ -1946,8 +1944,6 @@ public class AppControllerExplorer implements EventHandler, TreeAppControllerInt SendMessageEvent messageEvent = (SendMessageEvent) event; - // sub.updatePrevieMessage(messageEvent.getMessage().getFromLogin(), messageEvent.getMessage().getSubject(), messageEvent.getMessage().getDate(), messageEvent.getMessage().getTextMessage(), messageEvent.getMessage().getListAttachments()); - HashMap hashFiles = new HashMap(); if(messageEvent.getListFileModelSelected()!=null){ @@ -1961,11 +1957,8 @@ public class AppControllerExplorer implements EventHandler, TreeAppControllerInt OpenMessageEvent messageEvent = (OpenMessageEvent) event; - // sub.updatePrevieMessage(messageEvent.getMessage().getFromLogin(), messageEvent.getMessage().getSubject(), messageEvent.getMessage().getDate(), messageEvent.getMessage().getTextMessage(), messageEvent.getMessage().getListAttachments()); - MessageModel message = messageEvent.getMessage(); - }else if(event instanceof FileDownloadEvent){ FileDownloadEvent messageEvent = (FileDownloadEvent) event; diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/interfaces/SubscriberInterface.java b/src/main/java/org/gcube/portlets/user/workspace/client/interfaces/SubscriberInterface.java index eac56f5..9967238 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/client/interfaces/SubscriberInterface.java +++ b/src/main/java/org/gcube/portlets/user/workspace/client/interfaces/SubscriberInterface.java @@ -27,7 +27,7 @@ public interface SubscriberInterface { * @param itemIdentifier the item identifier * @param parentId the parent * @param file the file - * @param isOverwrite + * @param isOverwrite the is overwrite */ void addedFile(String itemIdentifier, String parentId, WS_UPLOAD_TYPE file, boolean isOverwrite); @@ -63,13 +63,14 @@ public interface SubscriberInterface { */ boolean renameItem(String itemIdentifier, String newName, String extension); + /** - * Delete item. + * Delete items. * - * @param itemIdentifier the item identifier + * @param itemsIdentifier the items identifier * @return true, if successful */ - boolean deleteItem(String itemIdentifier); + boolean deleteItems(List ids); /** * Added folder.