From 8f0361983bb2c271b0bd8a4fd8615348f40a4402 Mon Sep 17 00:00:00 2001 From: Giancarlo Panichi Date: Fri, 22 Feb 2019 11:00:52 +0000 Subject: [PATCH] ref 13226:StorageHub - Update workspace-sharing-widget to SH https://support.d4science.org/issues/13226 Updated to StorageHub git-svn-id: http://svn.d4science-ii.research-infrastructures.eu/gcube/trunk/portlets/user/workspace-tree-widget@177225 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../client/rpc/GWTWorkspaceService.java | 68 +------------------ .../client/rpc/GWTWorkspaceServiceAsync.java | 61 +---------------- 2 files changed, 4 insertions(+), 125 deletions(-) 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 1824860..38741c0 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 @@ -28,6 +28,8 @@ import org.gcube.portlets.user.workspace.shared.WorkspaceTrashOperation; import org.gcube.portlets.user.workspace.shared.WorkspaceUserQuote; import org.gcube.portlets.user.workspace.shared.WorkspaceVersioningOperation; import org.gcube.portlets.user.workspace.shared.accounting.GxtAccountingField; +import org.gcube.portlets.widgets.workspacesharingwidget.shared.InfoContactModel; +import org.gcube.portlets.widgets.workspacesharingwidget.shared.WorkspaceACL; import com.google.gwt.user.client.rpc.RemoteService; import com.google.gwt.user.client.rpc.RemoteServiceRelativePath; @@ -350,73 +352,9 @@ public interface GWTWorkspaceService extends RemoteService { */ public GWTWorkspaceItem getTimeSeriesById(String identifier) throws Exception; + /** -<<<<<<< .mine -||||||| .r176880 - * Share folder. - * - * @param folder the folder - * @param listContacts the list contacts - * @param isNewFolder the is new folder - * @param acl the acl - * @return true, if successful - * @throws Exception the exception - */ - boolean shareFolder(FileModel folder, List listContacts, - boolean isNewFolder, WorkspaceACL acl) throws Exception; - /** - * Gets the list user shared by folder shared id. - * - * @param itemId the item id - * @return the list user shared by folder shared id - * @throws Exception the exception - */ - public List getListUserSharedByFolderSharedId(String itemId) throws Exception; - - /** - * Un shared folder by folder shared id. - * - * @param folderSharedId the folder shared id - * @return true, if successful - * @throws Exception the exception - */ - public boolean unSharedFolderByFolderSharedId(String folderSharedId) throws Exception; - - /** -======= - * Share folder. - * - * @param folder the folder - * @param listContacts the list contacts - * @param isNewFolder the is new folder - * @param acl the acl - * @return true, if successful - * @throws Exception the exception - */ - FileModel shareFolder(FileModel folder, List listContacts, - boolean isNewFolder, WorkspaceACL acl) throws Exception; - - /** - * Gets the list user shared by folder shared id. - * - * @param itemId the item id - * @return the list user shared by folder shared id - * @throws Exception the exception - */ - public List getListUserSharedByFolderSharedId(String itemId) throws Exception; - - /** - * Un shared folder by folder shared id. - * - * @param folderSharedId the folder shared id - * @return true, if successful - * @throws Exception the exception - */ - public boolean unSharedFolderByFolderSharedId(String folderSharedId) throws Exception; - - /** ->>>>>>> .r177215 * Gets the list parents by item identifier. * * @param itemIdentifier 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 09d9432..9f6c723 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 @@ -308,68 +308,9 @@ public interface GWTWorkspaceServiceAsync { */ void getTimeSeriesById(String identifier, AsyncCallback callback); -<<<<<<< .mine - /** -||||||| .r176880 - /** - * Share folder. - * - * @param folder the folder - * @param listContacts the list contacts - * @param isNewFolder the is new folder - * @param acl the acl - * @param callback the callback - */ - void shareFolder(FileModel folder, List listContacts, - boolean isNewFolder, WorkspaceACL acl, - AsyncCallback callback); + /** - * Gets the list user shared by folder shared id. - * - * @param itemId the item id - * @param callback the callback - * @return the list user shared by folder shared id - */ - void getListUserSharedByFolderSharedId(String itemId, - AsyncCallback> callback); - - /** - * Un shared folder by folder shared id. - * - * @param folderSharedId the folder shared id - * @param callback the callback - */ - void unSharedFolderByFolderSharedId(String folderSharedId, - AsyncCallback callback); - - /** -======= - void shareFolder( - FileModel folder, List listContacts, - boolean isNewFolder, WorkspaceACL acl, AsyncCallback callback); - - /** - * Gets the list user shared by folder shared id. - * - * @param itemId the item id - * @param callback the callback - * @return the list user shared by folder shared id - */ - void getListUserSharedByFolderSharedId(String itemId, - AsyncCallback> callback); - - /** - * Un shared folder by folder shared id. - * - * @param folderSharedId the folder shared id - * @param callback the callback - */ - void unSharedFolderByFolderSharedId(String folderSharedId, - AsyncCallback callback); - - /** ->>>>>>> .r177215 * Gets the list parents by item identifier. * * @param itemIdentifier