diff --git a/.classpath b/.classpath index 71d462c..dd89720 100644 --- a/.classpath +++ b/.classpath @@ -13,7 +13,6 @@ - diff --git a/distro/changelog.xml b/distro/changelog.xml index 92078b6..a24776e 100644 --- a/distro/changelog.xml +++ b/distro/changelog.xml @@ -1,4 +1,8 @@ + + Updated to StorageHub [ticket: #13226] + Updated regular expression to validate Folder and File names 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 2d9e1d1..0603608 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 @@ -110,7 +110,6 @@ import org.gcube.portlets.user.workspace.client.interfaces.SubscriberInterface; import org.gcube.portlets.user.workspace.client.interfaces.TreeAppControllerInterface; import org.gcube.portlets.user.workspace.client.model.FileModel; import org.gcube.portlets.user.workspace.client.model.FolderModel; -import org.gcube.portlets.user.workspace.client.model.InfoContactModel; import org.gcube.portlets.user.workspace.client.model.SmartFolderModel; import org.gcube.portlets.user.workspace.client.model.SubTree; import org.gcube.portlets.user.workspace.client.rpc.GWTWorkspaceService; @@ -142,7 +141,6 @@ import org.gcube.portlets.user.workspace.client.workspace.folder.item.GWTExterna import org.gcube.portlets.user.workspace.client.workspace.folder.item.GWTExternalUrl; import org.gcube.portlets.user.workspace.client.workspace.folder.item.gcube.GWTImageDocument; import org.gcube.portlets.user.workspace.client.workspace.folder.item.gcube.GWTUrlDocument; -import org.gcube.portlets.user.workspace.shared.ReportAssignmentACL; import org.gcube.portlets.user.workspace.shared.SessionExpiredException; import org.gcube.portlets.user.workspace.shared.UserBean; import org.gcube.portlets.user.workspace.shared.WorkspaceOperationResult; @@ -151,9 +149,10 @@ import org.gcube.portlets.widgets.ckandatapublisherwidget.client.events.CloseCre import org.gcube.portlets.widgets.ckandatapublisherwidget.client.ui.form.CreateDatasetForm; import org.gcube.portlets.widgets.workspacesharingwidget.client.ConstantsSharing.LOAD_CONTACTS_AS; import org.gcube.portlets.widgets.workspacesharingwidget.client.MultiDragConstants; -import org.gcube.portlets.widgets.workspacesharingwidget.client.MultiDragContactsEditPermissions; +import org.gcube.portlets.widgets.workspacesharingwidget.client.ShowPermissionsDialog; import org.gcube.portlets.widgets.workspacesharingwidget.client.SimpleMultiDragWorkspaceContact; -import org.gcube.portlets.widgets.workspacesharingwidget.client.view.sharing.multisuggest.DialogMultiDragContact; +import org.gcube.portlets.widgets.workspacesharingwidget.client.rpc.WorkspaceSharingServiceAsync; +import org.gcube.portlets.widgets.workspacesharingwidget.shared.InfoContactModel; import org.gcube.portlets.widgets.workspaceuploader.client.WorkspaceUploadNotification.WorskpaceUploadNotificationListener; import org.gcube.portlets.widgets.workspaceuploader.client.uploader.DialogUpload.UPLOAD_TYPE; import org.gcube.portlets.widgets.workspaceuploader.client.uploader.MultipleDilaogUpload; @@ -189,27 +188,26 @@ import com.google.gwt.user.client.Window; import com.google.gwt.user.client.rpc.AsyncCallback; import com.google.gwt.user.client.ui.HasWidgets; - /** * The Class AppControllerExplorer. * - * @author Francesco Mangiacrapa francesco.mangiacrapa@isti.cnr.it - * May 15, 2017 + * @author Francesco Mangiacrapa francesco.mangiacrapaATisti.cnr.it May 15, 2017 */ -public class AppControllerExplorer implements EventHandler, TreeAppControllerInterface{ +public class AppControllerExplorer implements EventHandler, TreeAppControllerInterface { - public static final GWTWorkspaceServiceAsync rpcWorkspaceService = (GWTWorkspaceServiceAsync) GWT.create(GWTWorkspaceService.class); + public static final GWTWorkspaceServiceAsync rpcWorkspaceService = (GWTWorkspaceServiceAsync) GWT + .create(GWTWorkspaceService.class); private ExplorerPanel explorerPanel; private final static HandlerManager eventBus = new HandlerManager(null); private HashMap> subscribers = null; private boolean selectRootItem; public static String myLogin; public static String myLoginFirstName; - //PRE-LOAD LIST OF USER FORM LIFERAY + // PRE-LOAD LIST OF USER FORM LIFERAY private UserStore userStore = new UserStore(); private static AppControllerExplorer singleton; - private Map msgFolderSynched = new HashMap(); + private Map msgFolderSynched = new HashMap(); private WsThreddsWidget wsThreddsWidget = new WsThreddsWidget(); private WsTaskExecutorWidget taskExecutor = new WsTaskExecutorWidget(); @@ -226,7 +224,6 @@ public class AppControllerExplorer implements EventHandler, TreeAppControllerInt singleton = this; } - /** * Gets the single instance of AppControllerExplorer. * @@ -255,7 +252,6 @@ public class AppControllerExplorer implements EventHandler, TreeAppControllerInt return rpcWorkspaceService; } - /** * Bind. */ @@ -268,37 +264,41 @@ public class AppControllerExplorer implements EventHandler, TreeAppControllerInt GWT.log("Fired CheckItemLocked..."); - if(checkItemLockedBySyncEvent.getItem()!=null){ + if (checkItemLockedBySyncEvent.getItem() != null) { - rpcWorkspaceService.isItemUnderSync(checkItemLockedBySyncEvent.getItem().getIdentifier(), new AsyncCallback() { + rpcWorkspaceService.isItemUnderSync(checkItemLockedBySyncEvent.getItem().getIdentifier(), + new AsyncCallback() { - @Override - public void onFailure(Throwable caught) { + @Override + public void onFailure(Throwable caught) { - // TODO Auto-generated method stub + // TODO Auto-generated method stub - } + } - @Override - public void onSuccess(Boolean result) { + @Override + public void onSuccess(Boolean result) { - GWT.log("CheckItemLocked for folder: "+checkItemLockedBySyncEvent.getItem().getName() +" returned locked: "+result); + GWT.log("CheckItemLocked for folder: " + + checkItemLockedBySyncEvent.getItem().getName() + " returned locked: " + + result); - String msgDisplayed = msgFolderSynched.get(checkItemLockedBySyncEvent.getItem().getIdentifier()); + String msgDisplayed = msgFolderSynched + .get(checkItemLockedBySyncEvent.getItem().getIdentifier()); - if(msgDisplayed==null && result){ - String msg= "The folder: "+checkItemLockedBySyncEvent.getItem().getName()+", "+ConstantsExplorer.MSG_FOLDER_LOCKED_BY_SYNC; - MessageBox.info("Warning: folder under synchornization", msg, null); - msgFolderSynched.put(checkItemLockedBySyncEvent.getItem().getIdentifier(), msg); - } + if (msgDisplayed == null && result) { + String msg = "The folder: " + checkItemLockedBySyncEvent.getItem().getName() + + ", " + ConstantsExplorer.MSG_FOLDER_LOCKED_BY_SYNC; + MessageBox.info("Warning: folder under synchornization", msg, null); + msgFolderSynched.put(checkItemLockedBySyncEvent.getItem().getIdentifier(), msg); + } - } - }); + } + }); } } }); - eventBus.addHandler(PublishOnDataCatalogueEvent.TYPE, new PublishOnDataCatalogueEventHandler() { @Override @@ -307,14 +307,14 @@ public class AppControllerExplorer implements EventHandler, TreeAppControllerInt // get the folder id final String folderId = publishEvent.getFolderId(); - if(folderId != null && !folderId.isEmpty()){ + if (folderId != null && !folderId.isEmpty()) { final Modal modal = new Modal(true, true); modal.setTitle("Publish Item"); modal.addStyleName("insert-metadata-modal-style"); modal.addStyleName("modal-top-custom"); - //((Element)modal.getElement().getChildNodes().getItem(1)).addClassName("modal-body-custom"); + // ((Element)modal.getElement().getChildNodes().getItem(1)).addClassName("modal-body-custom"); modal.add(new CreateDatasetForm(folderId, eventBus)); modal.setCloseVisible(true); modal.show(); @@ -339,92 +339,98 @@ public class AppControllerExplorer implements EventHandler, TreeAppControllerInt final FileModel folder = publishEvent.getFolderToPublish(); - if(folder!=null){ + if (folder != null) { - WsFolder wsFolder = new WsFolder(folder.getIdentifier(), folder.getName()); - try { - wsThreddsWidget.showSyncFolderInfo(wsFolder); + WsFolder wsFolder = new WsFolder(folder.getIdentifier(), folder.getName()); + try { + wsThreddsWidget.showSyncFolderInfo(wsFolder); - wsThreddsWidget.addSyncCompletedListner(new SyncCompletedNotificationListner() { + wsThreddsWidget.addSyncCompletedListner(new SyncCompletedNotificationListner() { @Override public void onSyncError(WsFolder folder) { - rpcWorkspaceService.getListParentsByItemIdentifier(folder.getFolderId(), false, new AsyncCallback>() { + rpcWorkspaceService.getListParentsByItemIdentifier(folder.getFolderId(), false, + new AsyncCallback>() { - @Override - public void onFailure(Throwable caught) { + @Override + public void onFailure(Throwable caught) { - // TODO Auto-generated method stub + // TODO Auto-generated method + // stub - } + } - @Override - public void onSuccess( - List result) { + @Override + public void onSuccess(List result) { - if(result.size()>0){ + if (result.size() > 0) { - eventBus.fireEvent(new RefreshFolderEvent(result.get(result.size()-1), true, false, false)); - } + eventBus.fireEvent(new RefreshFolderEvent( + result.get(result.size() - 1), true, false, false)); + } - } - }); + } + }); } @Override public void onSyncCompleted(WsFolder folder) { - if(folder!=null){ + if (folder != null) { - rpcWorkspaceService.getListParentsByItemIdentifier(folder.getFolderId(), false, new AsyncCallback>() { + rpcWorkspaceService.getListParentsByItemIdentifier(folder.getFolderId(), false, + new AsyncCallback>() { - @Override - public void onFailure(Throwable caught) { + @Override + public void onFailure(Throwable caught) { - // TODO Auto-generated method stub + // TODO Auto-generated + // method stub - } + } - @Override - public void onSuccess( - List result) { + @Override + public void onSuccess(List result) { - if(result.size()>0){ + if (result.size() > 0) { - eventBus.fireEvent(new RefreshFolderEvent(result.get(result.size()-1), true, false, false)); - } + eventBus.fireEvent(new RefreshFolderEvent( + result.get(result.size() - 1), true, false, false)); + } - } - }); + } + }); } } @Override public void onUnSyncPerformed(WsFolder folder) { - if(folder!=null){ + if (folder != null) { - rpcWorkspaceService.getListParentsByItemIdentifier(folder.getFolderId(), false, new AsyncCallback>() { + rpcWorkspaceService.getListParentsByItemIdentifier(folder.getFolderId(), false, + new AsyncCallback>() { - @Override - public void onFailure(Throwable caught) { + @Override + public void onFailure(Throwable caught) { - // TODO Auto-generated method stub + // TODO Auto-generated + // method stub - } + } - @Override - public void onSuccess( - List result) { + @Override + public void onSuccess(List result) { - if(result.size()>0){ + if (result.size() > 0) { - eventBus.fireEvent(new RefreshFolderEvent(result.get(result.size()-1), true, false, false)); - } + eventBus.fireEvent(new RefreshFolderEvent( + result.get(result.size() - 1), true, false, false)); + } - } - }); + } + }); } } @@ -437,14 +443,13 @@ public class AppControllerExplorer implements EventHandler, TreeAppControllerInt } }); - eventBus.addHandler(VersioningHistoryShowEvent.TYPE, new VersioningHistoryShowEventHandler() { @Override public void onFileVersioning(VersioningHistoryShowEvent versioningHistoryEvent) { FileModel file = versioningHistoryEvent.getTargetFileModel(); - if(file==null) + if (file == null) return; notifySubscriber(versioningHistoryEvent); @@ -456,26 +461,27 @@ public class AppControllerExplorer implements EventHandler, TreeAppControllerInt @Override public void onExecuteDMTask(ExecuteDataMinerTaskEvent executeDataMinerTaskEvent) { - if(executeDataMinerTaskEvent.getTargetFileModel()!=null){ - WSItem wsItem = new WSItem(executeDataMinerTaskEvent.getTargetFileModel().getIdentifier(), executeDataMinerTaskEvent.getTargetFileModel().getName()); + if (executeDataMinerTaskEvent.getTargetFileModel() != null) { + WSItem wsItem = new WSItem(executeDataMinerTaskEvent.getTargetFileModel().getIdentifier(), + executeDataMinerTaskEvent.getTargetFileModel().getName()); wsItem.setFolder(executeDataMinerTaskEvent.getTargetFileModel().isDirectory()); try { String[] filterForParameterTypes = new String[1]; filterForParameterTypes[0] = "FILE"; - FilterOperator filterOperator = wsItem.isFolder()?FilterOperator.LOGICAL_NOT:FilterOperator.LOGICAL_OR; - SelectableOperator selectableOperator = new SelectableOperator(filterForParameterTypes, filterOperator); + FilterOperator filterOperator = wsItem.isFolder() ? FilterOperator.LOGICAL_NOT + : FilterOperator.LOGICAL_OR; + SelectableOperator selectableOperator = new SelectableOperator(filterForParameterTypes, + filterOperator); taskExecutor.showTaskConfigurations(wsItem, selectableOperator); - } - catch (Exception e) { + } catch (Exception e) { Window.alert(e.getMessage()); } } } }); - eventBus.addHandler(UpdateWorkspaceSizeEvent.TYPE, new UpdateWorkspaceSizeEventHandler() { @Override @@ -495,18 +501,20 @@ public class AppControllerExplorer implements EventHandler, TreeAppControllerInt @Override public void onGetFolderLink(GetFolderLinkEvent getFolderLinkEvent) { - GWT.log("getFolderLinkEvent.getSourceFile() "+getFolderLinkEvent.getSourceFile()); + GWT.log("getFolderLinkEvent.getSourceFile() " + getFolderLinkEvent.getSourceFile()); // TODO Auto-generated method stub - if(getFolderLinkEvent.getSourceFile()!=null){ - GWT.log("getFolderLinkEvent.getSourceFile() "+getFolderLinkEvent.getSourceFile()); - DialogGetLink dialog = new DialogGetLink("Copy to clipboard Folder Link: Ctrl+C", getFolderLinkEvent.getSourceFile(), null, Link_Type.FOLDER_LINK, getFolderLinkEvent.isSetPublic()); + if (getFolderLinkEvent.getSourceFile() != null) { + GWT.log("getFolderLinkEvent.getSourceFile() " + getFolderLinkEvent.getSourceFile()); + DialogGetLink dialog = new DialogGetLink("Copy to clipboard Folder Link: Ctrl+C", + getFolderLinkEvent.getSourceFile(), null, Link_Type.FOLDER_LINK, + getFolderLinkEvent.isSetPublic()); dialog.show(); } } }); - eventBus.addHandler(UnShareFolderEvent.TYPE,new UnShareFolderEventHandler() { + eventBus.addHandler(UnShareFolderEvent.TYPE, new UnShareFolderEventHandler() { @Override public void onUnShareFolder(UnShareFolderEvent unShareFolderEvent) { @@ -515,10 +523,10 @@ public class AppControllerExplorer implements EventHandler, TreeAppControllerInt String folderId = null; - if(source!=null) + if (source != null) folderId = source.getIdentifier(); - if(folderId!=null){ + if (folderId != null) { String msg = "Unsharing the folder, the files will be removed from your workspace. Continue?"; MessageBoxConfirm mbc = new MessageBoxConfirm("Confirm Unshare?", msg); @@ -528,45 +536,48 @@ public class AppControllerExplorer implements EventHandler, TreeAppControllerInt public void handleEvent(MessageBoxEvent be) { - //IF NOT CANCELLED + // IF NOT CANCELLED String clickedButton = be.getButtonClicked().getItemId(); - if(clickedButton.equals(Dialog.YES)){ - explorerPanel.getAsycTreePanel().mask(ConstantsExplorer.UNSHARING,ConstantsExplorer.LOADINGSTYLE); - rpcWorkspaceService.unSharedFolderByFolderSharedId(folderIdentification, new AsyncCallback() { + if (clickedButton.equals(Dialog.YES)) { + explorerPanel.getAsycTreePanel().mask(ConstantsExplorer.UNSHARING, + ConstantsExplorer.LOADINGSTYLE); + WorkspaceSharingServiceAsync.INSTANCE.unSharedFolderByFolderSharedId( + folderIdentification, new AsyncCallback() { - @Override - public void onFailure(Throwable caught) { - explorerPanel.getAsycTreePanel().unmask(); - if(caught instanceof SessionExpiredException){ - GWT.log("Session expired"); - eventBus.fireEvent(new SessionExpiredEvent()); - return; - } - - new MessageBoxAlert("Error", caught.getMessage(), null); - explorerPanel.getAsycTreePanel().removeAllAndRecoveryRoot(); - } - - @Override - public void onSuccess(Boolean result) { - GWT.log("Unshare was: "+result); - - GWT.log("Waiting "+waitTiming); - if(result){ //REFRESH PARENT FOLDER - Timer t = new Timer() { - @Override - public void run() { - GWT.log("Runing refresh after wait: "+waitTiming); - eventBus.fireEvent(new RefreshFolderEvent(source.getParentFileModel(), true, true, false)); + @Override + public void onFailure(Throwable caught) { explorerPanel.getAsycTreePanel().unmask(); - } - }; + if (caught instanceof SessionExpiredException) { + GWT.log("Session expired"); + eventBus.fireEvent(new SessionExpiredEvent()); + return; + } - t.schedule(waitTiming); - }else - explorerPanel.getAsycTreePanel().unmask(); - } - }); + new MessageBoxAlert("Error", caught.getMessage(), null); + explorerPanel.getAsycTreePanel().removeAllAndRecoveryRoot(); + } + + @Override + public void onSuccess(Boolean result) { + GWT.log("Waiting " + waitTiming); + if (result) { // REFRESH PARENT + // FOLDER + Timer t = new Timer() { + @Override + public void run() { + GWT.log("Runing refresh after wait: " + waitTiming); + eventBus.fireEvent(new RefreshFolderEvent( + source.getParentFileModel(), true, true, false)); + explorerPanel.getAsycTreePanel().unmask(); + } + }; + + t.schedule(waitTiming); + } else + explorerPanel.getAsycTreePanel().unmask(); + } + + }); } } }); @@ -591,43 +602,43 @@ public class AppControllerExplorer implements EventHandler, TreeAppControllerInt final FileModel file = addAdministratorEvent.getSelectedFolder(); - if(file==null || file.getIdentifier()==null) + if (file == null || file.getIdentifier() == null) return; - //ADMINISTRATOR/S CAN EDIT OTHER ADMINISTRATOR/S + // ADMINISTRATOR/S CAN EDIT OTHER ADMINISTRATOR/S showAddAdministratorsDialog(file); - //COMMENTED 03-03-2017 ONLY OWNER CAN EDIT ADMINISTRATOR/S - /*rpcWorkspaceService.getOwnerByItemId(file.getIdentifier(), new AsyncCallback() { - - @Override - public void onFailure(Throwable caught) { - - if(caught instanceof SessionExpiredException){ - GWT.log("Session expired"); - eventBus.fireEvent(new SessionExpiredEvent()); - return; - } - - new MessageBoxAlert("Error", "Sorry, an error occurred on recovering the contacts, try again later", null); - explorerPanel.unmask(); - } - - @Override - public void onSuccess(InfoContactModel infoContactModel) { - - //IF IS OWNER - if(AppControllerExplorer.myLogin.compareToIgnoreCase(infoContactModel.getLogin())==0) - showAddAdministratorsDialog(file); - else - new MessageBoxAlert("Permission denied", "You have no permissions to manage administrators. You are not manager of \""+file.getName()+"\"", null); - - } - });*/ + // COMMENTED 03-03-2017 ONLY OWNER CAN EDIT ADMINISTRATOR/S + /* + * rpcWorkspaceService.getOwnerByItemId(file.getIdentifier(), + * new AsyncCallback() { + * + * @Override public void onFailure(Throwable caught) { + * + * if(caught instanceof SessionExpiredException){ + * GWT.log("Session expired"); eventBus.fireEvent(new + * SessionExpiredEvent()); return; } + * + * new MessageBoxAlert("Error", + * "Sorry, an error occurred on recovering the contacts, try again later" + * , null); explorerPanel.unmask(); } + * + * @Override public void onSuccess(InfoContactModel + * infoContactModel) { + * + * //IF IS OWNER + * if(AppControllerExplorer.myLogin.compareToIgnoreCase( + * infoContactModel.getLogin())==0) + * showAddAdministratorsDialog(file); else new + * MessageBoxAlert("Permission denied", + * "You have no permissions to manage administrators. You are not manager of \"" + * +file.getName()+"\"", null); + * + * } }); + */ } }); - eventBus.addHandler(EditUserPermissionEvent.TYPE, new EditUserPermissionEventHandler() { @Override @@ -635,39 +646,45 @@ public class AppControllerExplorer implements EventHandler, TreeAppControllerInt final FileModel file = editUserPermissionEvent.getSourceFolder(); - if(file==null || file.getIdentifier()==null) + if (file == null || file.getIdentifier() == null) return; + WorkspaceSharingServiceAsync.INSTANCE.getOwnerByItemId(file.getIdentifier(), + new AsyncCallback() { - rpcWorkspaceService.getOwnerByItemId(file.getIdentifier(), new AsyncCallback() { + @Override + public void onFailure(Throwable caught) { - @Override - public void onFailure(Throwable caught) { + if (caught instanceof SessionExpiredException) { + GWT.log("Session expired"); + eventBus.fireEvent(new SessionExpiredEvent()); + return; + } - if(caught instanceof SessionExpiredException){ - GWT.log("Session expired"); - eventBus.fireEvent(new SessionExpiredEvent()); - return; - } + new MessageBoxAlert("Error", + "Sorry, an error occurred on recovering the contacts, try again later", null); + explorerPanel.unmask(); + } - new MessageBoxAlert("Error", "Sorry, an error occurred on recovering the contacts, try again later", null); - explorerPanel.unmask(); - } + @Override + public void onSuccess(InfoContactModel infoContactModel) { - @Override - public void onSuccess(InfoContactModel infoContactModel) { + ediPermissions(file); - ediPermissions(file); + // GWT.log("Comparing owner login + // "+infoContactModel +" with " + // +AppControllerExplorer.myLogin); + // //IF IS OWNER + // if(AppControllerExplorer.myLogin.compareToIgnoreCase(infoContactModel.getLogin())==0) + // ediPermissions(file); + // else + // new MessageBoxAlert("Permission denied", "You + // have no authority to manage user permissions. + // You are not manager of + // \""+file.getName()+"\"", null); -// GWT.log("Comparing owner login "+infoContactModel +" with " +AppControllerExplorer.myLogin); -// //IF IS OWNER -// if(AppControllerExplorer.myLogin.compareToIgnoreCase(infoContactModel.getLogin())==0) -// ediPermissions(file); -// else -// new MessageBoxAlert("Permission denied", "You have no authority to manage user permissions. You are not manager of \""+file.getName()+"\"", null); + } - } - - }); + }); } }); @@ -680,7 +697,6 @@ public class AppControllerExplorer implements EventHandler, TreeAppControllerInt } }); - eventBus.addHandler(CreateSharedFolderEvent.TYPE, new CreateSharedFolderEventHandler() { @Override @@ -688,39 +704,40 @@ public class AppControllerExplorer implements EventHandler, TreeAppControllerInt final FileModel sourceFileModel = createSharedFolderEvent.getFileSourceModel(); - //IF ITEM IS SHAREABLE - if(sourceFileModel.isShareable()){ + // IF ITEM IS SHAREABLE + if (sourceFileModel.isShareable()) { - //DEBUG - System.out.println("create shared folderEvent - sourceFileModel id "+sourceFileModel.getIdentifier()); + // DEBUG + System.out.println( + "create shared folderEvent - sourceFileModel id " + sourceFileModel.getIdentifier()); - final FileModel parentFileModel= createSharedFolderEvent.getParentFileModel(); + final FileModel parentFileModel = createSharedFolderEvent.getParentFileModel(); final boolean isNewFolder = createSharedFolderEvent.isNewFolder(); DialogShareFolder dialogSharedFolder = null; String parentDirectoryName = null; FileModel parent = null; - //COMMENTED 26/02/2014 - // if(parentFileModel==null){ //PARENT IS ROOT - // parent = explorerPanel.getAsycTreePanel().getRootItem(); - // sourceFileModel.setParentFileModel(parent); - // } + // COMMENTED 26/02/2014 + // if(parentFileModel==null){ //PARENT IS ROOT + // parent = explorerPanel.getAsycTreePanel().getRootItem(); + // sourceFileModel.setParentFileModel(parent); + // } - if(sourceFileModel.isDirectory()){ - // explorerPanel.getAsycTreePanel().setExpandTreeLevel(sourceFileModel.getIdentifier(), true); + if (sourceFileModel.isDirectory()) { + // explorerPanel.getAsycTreePanel().setExpandTreeLevel(sourceFileModel.getIdentifier(), + // true); parentDirectoryName = sourceFileModel.getName(); parent = sourceFileModel; - } - else{ + } else { parentDirectoryName = parentFileModel.getName(); } - if(isNewFolder) + if (isNewFolder) dialogSharedFolder = new DialogShareFolder(parentDirectoryName, eventBus, userStore); else - dialogSharedFolder = new DialogShareFolder(parentDirectoryName, sourceFileModel, eventBus, userStore); - + dialogSharedFolder = new DialogShareFolder(parentDirectoryName, sourceFileModel, eventBus, + userStore); final DialogShareFolder finalDialog = dialogSharedFolder; final FileModel parentModel = parent; @@ -730,100 +747,130 @@ public class AppControllerExplorer implements EventHandler, TreeAppControllerInt @Override public void handleEvent(BaseEvent be) { - if(finalDialog.isValidForm(true)){ + if (finalDialog.isValidForm(true)) { FileModel fileModel = null; - if(isNewFolder){ - //create a lowest object to send to server - fileModel = new FileModel("tempId", finalDialog.getName(), parentModel, true, false); //create new shared folder + if (isNewFolder) { + // create a lowest object to send to server + fileModel = new FileModel("tempId", finalDialog.getName(), parentModel, true, + false); // create new shared folder - } - else{ - fileModel = finalDialog.getParentFolder(); //add user for share + } else { + fileModel = finalDialog.getParentFolder(); // add + // user + // for + // share - //create a lowest object to send to server - fileModel = new FileModel(fileModel.getIdentifier(), fileModel.getName(), fileModel.getParentFileModel(), fileModel.isDirectory(), fileModel.isShared()); + // create a lowest object to send to server + fileModel = new FileModel(fileModel.getIdentifier(), fileModel.getName(), + fileModel.getParentFileModel(), fileModel.isDirectory(), + fileModel.isShared()); } fileModel.setDescription(finalDialog.getDescription()); - //DEBUG + // DEBUG /* - System.out.println("FileModel id "+fileModel.getIdentifier() + " name: "+fileModel.getName() + " parent " + fileModel.getParentFileModel()); - for(InfoContactModel contact:finalDialog.getSharedListUsers() ){ - System.out.println("Share with Contact "+contact) ; - - }*/ - - System.out.println("ACL is "+finalDialog.getSelectedACL()); + * System.out.println("FileModel id "+fileModel. + * getIdentifier() + + * " name: "+fileModel.getName() + " parent " + + * fileModel.getParentFileModel()); + * for(InfoContactModel + * contact:finalDialog.getSharedListUsers() ){ + * System.out.println("Share with Contact " + * +contact) ; + * + * } + */ + System.out.println("ACL is " + finalDialog.getSelectedACL()); Info.display("Info", "An operation of sharing was submitted"); explorerPanel.mask("Setting permissions", ConstantsExplorer.LOADINGSTYLE); - rpcWorkspaceService.shareFolder(fileModel, finalDialog.getSharedListUsers(), isNewFolder, finalDialog.getSelectedACL(), new AsyncCallback() { + WorkspaceSharingServiceAsync.INSTANCE.shareFolder(fileModel.getIdentifier(), + fileModel.getName(), fileModel.getDescription(), + fileModel.getParentFileModel() != null + ? fileModel.getParentFileModel().getIdentifier() : null, + finalDialog.getSharedListUsers(), isNewFolder, finalDialog.getSelectedACL(), + new AsyncCallback() { - @Override - public void onFailure(Throwable caught) { + @Override + public void onFailure(Throwable caught) { - if(caught instanceof SessionExpiredException){ - GWT.log("Session expired"); - eventBus.fireEvent(new SessionExpiredEvent()); - return; - } + if (caught instanceof SessionExpiredException) { + GWT.log("Session expired"); + eventBus.fireEvent(new SessionExpiredEvent()); + return; + } - new MessageBoxAlert("Error", caught.getMessage(), null); - explorerPanel.unmask(); - explorerPanel.getAsycTreePanel().removeAllAndRecoveryRoot(); - } - - @Override - public void onSuccess(FileModel result) { - - if(result!=null){ - final FileModel parentToRefresh = result.getParentFileModel(); - GWT.log("share completed throwing refresh folder: "+parentToRefresh.getName()+", its id is: "+parentToRefresh.getIdentifier()); - - GWT.log("Waiting "+waitTiming); - - //REFRESH PARENT FOLDER - Timer t = new Timer() { - @Override - public void run() { - GWT.log("Runing refresh after wait: "+waitTiming); - //TODO UPDATED ID - RefreshFolderEvent refEvent = new RefreshFolderEvent(parentToRefresh, true, true, false); - refEvent.setForceReloadBreadCrumb(true); - eventBus.fireEvent(refEvent); + new MessageBoxAlert("Error", caught.getMessage(), null); explorerPanel.unmask(); - } - }; + explorerPanel.getAsycTreePanel().removeAllAndRecoveryRoot(); + } - t.schedule(waitTiming); + @Override + public void onSuccess(Boolean result) { + if (result) { + FileModel parentToRefresh = null; + if (isNewFolder) + parentToRefresh = parentModel; + else + parentToRefresh = parentFileModel; - }else{ - new MessageBoxAlert("Error", "Sharing error, please refresh and try again", null); - explorerPanel.unmask(); - } - } - }); + GWT.log("share completed throwing refresh folder : " + + parentToRefresh.getName() + " get id: " + + parentToRefresh.getIdentifier()); + + // REFRESH PARENT FOLDER + /* + * Timer t = new Timer() { + * + * @Override public void + * run() { GWT. + * log("Runing refresh after wait: " + * +waitTiming); //TODO + * UPDATED ID + * RefreshFolderEvent + * refEvent = new + * RefreshFolderEvent( + * parentToRefresh, true, + * true, false); refEvent. + * setForceReloadBreadCrumb( + * true); + * eventBus.fireEvent( + * refEvent); + * explorerPanel.unmask(); } + * }; + */ + // t.schedule(waitTiming); + + // TODO UPDATED ID + RefreshFolderEvent refEvent = new RefreshFolderEvent( + parentToRefresh, true, true, false); + refEvent.setForceReloadBreadCrumb(true); + eventBus.fireEvent(refEvent); + } + explorerPanel.unmask(); + } + }); } } }); - } - else{//ITEM IS NOT SHAREABLE - new InfoDisplayMessage("Info", "The selected item is not shareable because an ancestor item is already shared"); + } else {// ITEM IS NOT SHAREABLE + new InfoDisplayMessage("Info", + "The selected item is not shareable because an ancestor item is already shared"); } } }); - //********EVENTS TO NOTIFY SUBSCRIBERS + // ********EVENTS TO NOTIFY SUBSCRIBERS eventBus.addHandler(SubTreeLoadedEvent.TYPE, new SubTreeLoadedEventHandler() { @Override @@ -831,13 +878,14 @@ public class AppControllerExplorer implements EventHandler, TreeAppControllerInt doSubTreeLoaded(event); } + private void doSubTreeLoaded(SubTreeLoadedEvent event) { notifySubscriber(event); } }); - //********EVENTS TO NOTIFY SUBSCRIBERS + // ********EVENTS TO NOTIFY SUBSCRIBERS eventBus.addHandler(SessionExpiredEvent.TYPE, new SessionExpiredEventHandler() { @Override @@ -852,20 +900,24 @@ public class AppControllerExplorer implements EventHandler, TreeAppControllerInt public void onClickWebDavUrl(WebDavUrlEvent webDavUrlEvent) { String itemIdentifier = webDavUrlEvent.getItemIdentifier(); - if(itemIdentifier==null) + if (itemIdentifier == null) itemIdentifier = explorerPanel.getAsycTreePanel().getRootItem().getIdentifier(); rpcWorkspaceService.getUrlWebDav(itemIdentifier, new AsyncCallback() { @Override public void onFailure(Throwable caught) { - new MessageBoxAlert("Error", ConstantsExplorer.SERVER_ERROR+" viewing WebDAV url"+ ConstantsExplorer.TRY_AGAIN, null); + new MessageBoxAlert("Error", + ConstantsExplorer.SERVER_ERROR + " viewing WebDAV url" + ConstantsExplorer.TRY_AGAIN, + null); } @Override public void onSuccess(String url) { - // new MessageBoxInfo(ConstantsExplorer.URL_WEBDAV, url); - DialogWebDavUrl diag = new DialogWebDavUrl(ConstantsExplorer.URL_WEBDAV +": "+ ConstantsExplorer.TITLEACCESSWEBDAV, "", url); + // new MessageBoxInfo(ConstantsExplorer.URL_WEBDAV, + // url); + DialogWebDavUrl diag = new DialogWebDavUrl( + ConstantsExplorer.URL_WEBDAV + ": " + ConstantsExplorer.TITLEACCESSWEBDAV, "", url); diag.selectTxt(); } @@ -881,16 +933,28 @@ public class AppControllerExplorer implements EventHandler, TreeAppControllerInt @Override public void onGetLink(GetShareLinkEvent getLinkEvent) { - if(getLinkEvent.getSourceFile()!=null){ + if (getLinkEvent.getSourceFile() != null) { String currentUrl = portalURL(); int lastChar = currentUrl.lastIndexOf("?"); - currentUrl = lastChar>-1?currentUrl.substring(0, lastChar):currentUrl; //IF EXISTS - REMOVE STRING AFTER ? (? INLCUSE) + currentUrl = lastChar > -1 ? currentUrl.substring(0, lastChar) : currentUrl; // IF + // EXISTS + // - + // REMOVE + // STRING + // AFTER + // ? + // (? + // INLCUSE) - //int last = currentUrl.lastIndexOf("/"); - //String shareLinkUrl = currentUrl.substring(0,last+1) + "?" +ConstantsExplorer.GET_ITEMID_PARAMETER+"="+getLinkEvent.getSourceFile().getIdentifier(); - String shareLinkUrl = currentUrl+ "?" +ConstantsExplorer.GET_ITEMID_PARAMETER+"="+getLinkEvent.getSourceFile().getIdentifier(); - shareLinkUrl+="&"+ConstantsExplorer.GET_OPERATION_PARAMETER+"="+WsPortletInitOperation.gotofolder; + // int last = currentUrl.lastIndexOf("/"); + // String shareLinkUrl = currentUrl.substring(0,last+1) + + // "?" + // +ConstantsExplorer.GET_ITEMID_PARAMETER+"="+getLinkEvent.getSourceFile().getIdentifier(); + String shareLinkUrl = currentUrl + "?" + ConstantsExplorer.GET_ITEMID_PARAMETER + "=" + + getLinkEvent.getSourceFile().getIdentifier(); + shareLinkUrl += "&" + ConstantsExplorer.GET_OPERATION_PARAMETER + "=" + + WsPortletInitOperation.gotofolder; DialogShareLink dialog = new DialogShareLink("Copy to clipboard Share Link: Ctrl+C", shareLinkUrl); dialog.show(); @@ -898,110 +962,120 @@ public class AppControllerExplorer implements EventHandler, TreeAppControllerInt } }); - eventBus.addHandler(GetPublicLinkEvent.TYPE, new GetPublicLinkEventHandler() { @Override public void onGetPublicLink(GetPublicLinkEvent getPublicLinkEvent) { // TODO Auto-generated method stub - if(getPublicLinkEvent.getSourceFile()!=null){ - DialogGetLink dialog = new DialogGetLink("Copy to clipboard Public Link: Ctrl+C", getPublicLinkEvent.getSourceFile(), getPublicLinkEvent.getVersion(), Link_Type.PUBLIC_LINK, false); + if (getPublicLinkEvent.getSourceFile() != null) { + DialogGetLink dialog = new DialogGetLink("Copy to clipboard Public Link: Ctrl+C", + getPublicLinkEvent.getSourceFile(), getPublicLinkEvent.getVersion(), Link_Type.PUBLIC_LINK, + false); dialog.show(); } } }); - eventBus.addHandler(RefreshFolderEvent.TYPE, new RefreshItemEventHandler() { @Override public void onRefreshItem(RefreshFolderEvent refreshItemEvent) { - GWT.log("RefreshFolderEvent: "+refreshItemEvent); + GWT.log("RefreshFolderEvent: " + refreshItemEvent); - if(refreshItemEvent.getFolderTarget()!=null && refreshItemEvent.getFolderTarget().getIdentifier()!=null){ + if (refreshItemEvent.getFolderTarget() != null + && refreshItemEvent.getFolderTarget().getIdentifier() != null) { - if(!refreshItemEvent.isCalledTreeSide()){ //Called Tree side - explorerPanel.getAsycTreePanel().reloadTreeLevelAndExpandFolder(refreshItemEvent.getFolderTarget().getIdentifier(), refreshItemEvent.isExpandFolder()); + if (!refreshItemEvent.isCalledTreeSide()) { // Called Tree + // side + explorerPanel.getAsycTreePanel().reloadTreeLevelAndExpandFolder( + refreshItemEvent.getFolderTarget().getIdentifier(), refreshItemEvent.isExpandFolder()); notifySubscriber(refreshItemEvent); + } else { // Validating folder existence - called portlet + // side + // FileModel target = + // explorerPanel.getAsycTreePanel().getFileModelByIdentifier(refreshItemEvent.getFolderTarget().getIdentifier()); + // if(target!=null) + explorerPanel.getAsycTreePanel().reloadTreeLevelAndExpandFolder( + refreshItemEvent.getFolderTarget().getIdentifier(), refreshItemEvent.isExpandFolder()); } - else{ //Validating folder existence - called portlet side -// FileModel target = explorerPanel.getAsycTreePanel().getFileModelByIdentifier(refreshItemEvent.getFolderTarget().getIdentifier()); -// if(target!=null) - explorerPanel.getAsycTreePanel().reloadTreeLevelAndExpandFolder(refreshItemEvent.getFolderTarget().getIdentifier(), refreshItemEvent.isExpandFolder()); - } - } - else + } else GWT.log("warn: escape refresh because item is null"); } }); - //Called from context menu on grid + // Called from context menu on grid eventBus.addHandler(OpenContextMenuTreeEvent.TYPE, new OpenContextMenuTreeEventHandler() { @Override public void onOpenContextMenuTree(OpenContextMenuTreeEvent openContextMenuTreeEvent) { - explorerPanel.getAsycTreePanel().getContextMenuTree().openContextMenuOnItem(openContextMenuTreeEvent.getSelectedItems(), openContextMenuTreeEvent.getClientX(), openContextMenuTreeEvent.getClientY()); + explorerPanel.getAsycTreePanel().getContextMenuTree().openContextMenuOnItem( + openContextMenuTreeEvent.getSelectedItems(), openContextMenuTreeEvent.getClientX(), + openContextMenuTreeEvent.getClientY()); } }); -// eventBus.addHandler(CopyItemsEvent.TYPE, new CopyItemsEventHandler() { -// -// @Override -// public void onCopyItems(CopyItemsEvent copytemEvent) { -// notifySubscriber(copytemEvent); -// } -// }); + // eventBus.addHandler(CopyItemsEvent.TYPE, new CopyItemsEventHandler() + // { + // + // @Override + // public void onCopyItems(CopyItemsEvent copytemEvent) { + // notifySubscriber(copytemEvent); + // } + // }); eventBus.addHandler(CopyItemsEvent.TYPE, new CopyItemsEventHandler() { @Override public void onCopyItems(final CopyItemsEvent copytemEvent) { - - if(copytemEvent.getIds()!=null && copytemEvent.getIds().size()>0){ + if (copytemEvent.getIds() != null && copytemEvent.getIds().size() > 0) { explorerPanel.mask("Copying...", ConstantsExplorer.LOADINGSTYLE); - rpcWorkspaceService.copyItems(copytemEvent.getIds(), copytemEvent.getDestinationFolderId(), new AsyncCallback() { + rpcWorkspaceService.copyItems(copytemEvent.getIds(), copytemEvent.getDestinationFolderId(), + new AsyncCallback() { - @Override - public void onFailure(Throwable caught) { + @Override + public void onFailure(Throwable caught) { - explorerPanel.unmask(); - if(caught instanceof SessionExpiredException){ - GWT.log("Session expired"); - eventBus.fireEvent(new SessionExpiredEvent()); - return; - } + explorerPanel.unmask(); + if (caught instanceof SessionExpiredException) { + GWT.log("Session expired"); + eventBus.fireEvent(new SessionExpiredEvent()); + return; + } - new MessageBoxAlert("Error", caught.getMessage()+"." , null); - explorerPanel.getAsycTreePanel().reloadTreeLevelAndExpandFolder(copytemEvent.getDestinationFolderId(), false); - notifySubscriber(copytemEvent); + new MessageBoxAlert("Error", caught.getMessage() + ".", null); + explorerPanel.getAsycTreePanel().reloadTreeLevelAndExpandFolder( + copytemEvent.getDestinationFolderId(), false); + notifySubscriber(copytemEvent); - } + } - @Override - public void onSuccess(WorkspaceOperationResult result) { + @Override + public void onSuccess(WorkspaceOperationResult result) { - explorerPanel.unmask(); - GWT.log("Copy terminated without error? "+result); - FileModel folderDestionationInTree = explorerPanel.getAsycTreePanel().getFileModelByIdentifier(copytemEvent.getDestinationFolderId()); - GWT.log("Destination Folder: "+copytemEvent.getDestinationFolderId() +" is in Tree: "+folderDestionationInTree); + explorerPanel.unmask(); + GWT.log("Copy terminated without error? " + result); + FileModel folderDestionationInTree = explorerPanel.getAsycTreePanel() + .getFileModelByIdentifier(copytemEvent.getDestinationFolderId()); + GWT.log("Destination Folder: " + copytemEvent.getDestinationFolderId() + + " is in Tree: " + folderDestionationInTree); - if(result.getError()!=null) - new MessageBoxAlert("Error", result.getError(), null); + if (result.getError() != null) + new MessageBoxAlert("Error", result.getError(), null); - if(folderDestionationInTree!=null) - eventBus.fireEvent(new RefreshFolderEvent(folderDestionationInTree, true, false, false)); + if (folderDestionationInTree != null) + eventBus.fireEvent( + new RefreshFolderEvent(folderDestionationInTree, true, false, false)); - notifySubscriber(copytemEvent); + notifySubscriber(copytemEvent); - } - }); + } + }); } - } }); @@ -1010,83 +1084,104 @@ public class AppControllerExplorer implements EventHandler, TreeAppControllerInt @Override public void onMoveItems(MoveItemsEvent moveItemEvent) { - GWT.log("MoveItemEvent is fired on : "+moveItemEvent.getIds().size()+ "items, DestinationId: "+moveItemEvent.getDestionationFolderId()); + GWT.log("MoveItemEvent is fired on : " + moveItemEvent.getIds().size() + "items, DestinationId: " + + moveItemEvent.getDestionationFolderId()); doMoveItems(moveItemEvent); } private void doMoveItems(final MoveItemsEvent moveItemsEvent) { - if(moveItemsEvent.getIds()==null || moveItemsEvent.getIds().size()==0) + if (moveItemsEvent.getIds() == null || moveItemsEvent.getIds().size() == 0) return; WorkspaceExplorerConstants.SELECT = "Move"; - DISPLAY_FIELD[] displayFields = new DISPLAY_FIELD[]{DISPLAY_FIELD.ICON, DISPLAY_FIELD.NAME, DISPLAY_FIELD.OWNER}; - final WorkspaceExplorerSelectDialog navigator = new WorkspaceExplorerSelectDialog("Move to...", true, moveItemsEvent.getSourceParentFolder().getIdentifier(), "", displayFields); + DISPLAY_FIELD[] displayFields = new DISPLAY_FIELD[] { DISPLAY_FIELD.ICON, DISPLAY_FIELD.NAME, + DISPLAY_FIELD.OWNER }; + final WorkspaceExplorerSelectDialog navigator = new WorkspaceExplorerSelectDialog("Move to...", true, + moveItemsEvent.getSourceParentFolder().getIdentifier(), "", displayFields); - WorskpaceExplorerSelectNotificationListener listener = new WorskpaceExplorerSelectNotificationListener() { + WorskpaceExplorerSelectNotificationListener listener = new WorskpaceExplorerSelectNotificationListener() { @Override public void onSelectedItem(Item item) { navigator.hide(); - if(item==null) - new MessageBoxAlert("Error", "No folder selected" , null); + if (item == null) + new MessageBoxAlert("Error", "No folder selected", null); - GWT.log("destionation folder is: "+item); + GWT.log("destionation folder is: " + item); final String destinationFolderId = item.getId(); - moveItemsEvent.setDestionationFolderId(destinationFolderId); //do not remove this set + moveItemsEvent.setDestionationFolderId(destinationFolderId); // do + // not + // remove + // this + // set explorerPanel.mask("Moving...", ConstantsExplorer.LOADINGSTYLE); - rpcWorkspaceService.moveItems(moveItemsEvent.getIds(), destinationFolderId, new AsyncCallback() { + rpcWorkspaceService.moveItems(moveItemsEvent.getIds(), destinationFolderId, + new AsyncCallback() { - public void onFailure(Throwable caught) { - explorerPanel.unmask(); - if(caught instanceof SessionExpiredException){ - GWT.log("Session expired"); - eventBus.fireEvent(new SessionExpiredEvent()); - return; - } + public void onFailure(Throwable caught) { + explorerPanel.unmask(); + if (caught instanceof SessionExpiredException) { + GWT.log("Session expired"); + eventBus.fireEvent(new SessionExpiredEvent()); + return; + } + new MessageBoxAlert("Error", caught.getMessage() + ".", null); + explorerPanel.getAsycTreePanel() + .reloadTreeLevelAndExpandFolder(destinationFolderId, false); + String sourceParentId = moveItemsEvent.getSourceParentFolder() != null + ? moveItemsEvent.getSourceParentFolder().getIdentifier() : null; + explorerPanel.getAsycTreePanel().reloadTreeLevelAndExpandFolder(sourceParentId, + true); + notifySubscriber(moveItemsEvent); // WE + // MISSING + // THE + // PARENT + // OF + // destinationFolderId + } - new MessageBoxAlert("Error", caught.getMessage()+"." , null); - explorerPanel.getAsycTreePanel().reloadTreeLevelAndExpandFolder(destinationFolderId, false); - String sourceParentId = moveItemsEvent.getSourceParentFolder()!=null?moveItemsEvent.getSourceParentFolder().getIdentifier():null; - explorerPanel.getAsycTreePanel().reloadTreeLevelAndExpandFolder(sourceParentId, true); - notifySubscriber(moveItemsEvent); //WE MISSING THE PARENT OF destinationFolderId - } + @Override + public void onSuccess(WorkspaceOperationResult result) { + explorerPanel.unmask(); + GWT.log("Move terminated without error? " + result); - @Override - public void onSuccess(WorkspaceOperationResult result) { - explorerPanel.unmask(); - GWT.log("Move terminated without error? "+result); + // NO ERROR + if (result.getError() == null) { + // REFRESHING SOURCE PARENT FOLDER + eventBus.fireEvent(new RefreshFolderEvent( + moveItemsEvent.getSourceParentFolder(), true, false, false)); + } else { + // WITH ERROR + new MessageBoxAlert("Error", result.getError(), null); + } - //NO ERROR - if(result.getError()==null){ - //REFRESHING SOURCE PARENT FOLDER - eventBus.fireEvent(new RefreshFolderEvent(moveItemsEvent.getSourceParentFolder(), true, false, false)); - }else{ - //WITH ERROR - new MessageBoxAlert("Error", result.getError(), null); - } + // GETTING DESTINATION FOLDER + FileModel folderDestionationInTree = explorerPanel.getAsycTreePanel() + .getFileModelByIdentifier(destinationFolderId); + GWT.log("Destination Folder: " + destinationFolderId + " is in Tree: " + + folderDestionationInTree); - //GETTING DESTINATION FOLDER - FileModel folderDestionationInTree = explorerPanel.getAsycTreePanel().getFileModelByIdentifier(destinationFolderId); - GWT.log("Destination Folder: "+destinationFolderId +" is in Tree: "+folderDestionationInTree); + // IF DESTINATION FOLDER IS IN THE TREE, + // REFRESH IT + if (folderDestionationInTree != null) + eventBus.fireEvent(new RefreshFolderEvent(folderDestionationInTree, true, + false, false)); - //IF DESTINATION FOLDER IS IN THE TREE, REFRESH IT - if(folderDestionationInTree!=null) - eventBus.fireEvent(new RefreshFolderEvent(folderDestionationInTree, true, false, false)); - -// if(folderDestionationInTree!=null) -// moveItemsEvent.setTreeRefreshable(true); -// else -// moveItemsEvent.setTreeRefreshable(false); - - moveItemsEvent.setTreeRefreshable(false); //forcing grid refresh - notifySubscriber(moveItemsEvent); - } - }); + // if(folderDestionationInTree!=null) + // moveItemsEvent.setTreeRefreshable(true); + // else + // moveItemsEvent.setTreeRefreshable(false); + moveItemsEvent.setTreeRefreshable(false); // forcing + // grid + // refresh + notifySubscriber(moveItemsEvent); + } + }); } @@ -1114,51 +1209,56 @@ public class AppControllerExplorer implements EventHandler, TreeAppControllerInt navigator.addWorkspaceExplorerSelectNotificationListener(listener); navigator.show(); + // break; -// break; + // case COPY: + // + // rpcWorkspaceService.copyItems(pasteItemEvent.getIds(), + // pasteItemEvent.getFolderDestinationId(), new + // AsyncCallback() { + // + // @Override + // public void onFailure(Throwable caught) { + // + // if(caught instanceof SessionExpiredException){ + // GWT.log("Session expired"); + // eventBus.fireEvent(new SessionExpiredEvent()); + // return; + // } + // + // new MessageBoxAlert("Error", caught.getMessage(), null); + // + // eventBus.fireEvent(new + // RefreshFolderEvent(explorerPanel.getAsycTreePanel().getFileModelByIdentifier(pasteItemEvent.getFolderDestinationId()), + // false, true, false)); + // + // notifySubscriber(pasteItemEvent); + // } + // + // @Override + // public void onSuccess(Boolean result) { + // + // FileModel fileInTree = + // explorerPanel.getAsycTreePanel().getFileModelByIdentifier(pasteItemEvent.getFolderDestinationId()); + // if(result) + // eventBus.fireEvent(new RefreshFolderEvent(fileInTree, false, + // false, false)); + // + // if(fileInTree!=null) + // pasteItemEvent.setTreeRefreshable(true); + // else + // pasteItemEvent.setTreeRefreshable(false); + // + // notifySubscriber(pasteItemEvent); + // } + // + // }); -// case COPY: -// -// rpcWorkspaceService.copyItems(pasteItemEvent.getIds(), pasteItemEvent.getFolderDestinationId(), new AsyncCallback() { -// -// @Override -// public void onFailure(Throwable caught) { -// -// if(caught instanceof SessionExpiredException){ -// GWT.log("Session expired"); -// eventBus.fireEvent(new SessionExpiredEvent()); -// return; -// } -// -// new MessageBoxAlert("Error", caught.getMessage(), null); -// -// eventBus.fireEvent(new RefreshFolderEvent(explorerPanel.getAsycTreePanel().getFileModelByIdentifier(pasteItemEvent.getFolderDestinationId()), false, true, false)); -// -// notifySubscriber(pasteItemEvent); -// } -// -// @Override -// public void onSuccess(Boolean result) { -// -// FileModel fileInTree = explorerPanel.getAsycTreePanel().getFileModelByIdentifier(pasteItemEvent.getFolderDestinationId()); -// if(result) -// eventBus.fireEvent(new RefreshFolderEvent(fileInTree, false, false, false)); -// -// if(fileInTree!=null) -// pasteItemEvent.setTreeRefreshable(true); -// else -// pasteItemEvent.setTreeRefreshable(false); -// -// notifySubscriber(pasteItemEvent); -// } -// -// }); + // break; -// break; - -// default: -// -// } + // default: + // + // } } }); @@ -1175,17 +1275,20 @@ public class AppControllerExplorer implements EventHandler, TreeAppControllerInt @Override public void onClickScopeFilter(FilterScopeEvent filterScopeEvent) { - explorerPanel.getAsycTreePanel().setSearch(false); //SET IS SEARCH FALSE + explorerPanel.getAsycTreePanel().setSearch(false); // SET IS + // SEARCH + // FALSE doChangeScope(filterScopeEvent.getScopeId()); - } private void doChangeScope(String scopeId) { - explorerPanel.getAsycTreePanel().loadRootItem(selectRootItem); // RELOAD ROOT BY SCOPE - + explorerPanel.getAsycTreePanel().loadRootItem(selectRootItem); // RELOAD + // ROOT + // BY + // SCOPE } }); @@ -1197,30 +1300,31 @@ public class AppControllerExplorer implements EventHandler, TreeAppControllerInt FileModel fileItem = accountingHistoryEvent.getTargetFileModel(); - if(fileItem!=null){ + if (fileItem != null) { - String title = ConstantsExplorer.ACCOUNTING_HISTORY_OF+fileItem.getName(); + String title = ConstantsExplorer.ACCOUNTING_HISTORY_OF + fileItem.getName(); - final WindowAccountingInfo winInfo = new WindowAccountingInfo(fileItem,title); + final WindowAccountingInfo winInfo = new WindowAccountingInfo(fileItem, title); winInfo.show(); winInfo.maskAccountingInfo(true); - rpcWorkspaceService.getAccountingHistory(fileItem.getIdentifier(), new AsyncCallback>() { + rpcWorkspaceService.getAccountingHistory(fileItem.getIdentifier(), + new AsyncCallback>() { - @Override - public void onFailure(Throwable caught) { - winInfo.maskAccountingInfo(false); - new MessageBoxAlert("Error", caught.getMessage(), null); + @Override + public void onFailure(Throwable caught) { + winInfo.maskAccountingInfo(false); + new MessageBoxAlert("Error", caught.getMessage(), null); - } + } - @Override - public void onSuccess(List result) { + @Override + public void onSuccess(List result) { - winInfo.updateInfoContainer(result); - winInfo.maskAccountingInfo(false); - } - }); + winInfo.updateInfoContainer(result); + winInfo.maskAccountingInfo(false); + } + }); } } }); @@ -1232,56 +1336,62 @@ public class AppControllerExplorer implements EventHandler, TreeAppControllerInt FileModel fileItem = accountingReadersEvent.getTargetFileModel(); - if(fileItem!=null){ + if (fileItem != null) { - String title = ConstantsExplorer.ACCOUNTING_READERS_OF+fileItem.getName(); + String title = ConstantsExplorer.ACCOUNTING_READERS_OF + fileItem.getName(); - final WindowAccountingInfo winInfo = new WindowAccountingInfo(fileItem,title); + final WindowAccountingInfo winInfo = new WindowAccountingInfo(fileItem, title); winInfo.show(); winInfo.maskAccountingInfo(true); - rpcWorkspaceService.getAccountingReaders(fileItem.getIdentifier(), new AsyncCallback>() { + rpcWorkspaceService.getAccountingReaders(fileItem.getIdentifier(), + new AsyncCallback>() { - @Override - public void onFailure(Throwable caught) { - winInfo.maskAccountingInfo(false); - new MessageBoxAlert("Error", caught.getMessage(), null); + @Override + public void onFailure(Throwable caught) { + winInfo.maskAccountingInfo(false); + new MessageBoxAlert("Error", caught.getMessage(), null); - } + } - @Override - public void onSuccess(List result) { + @Override + public void onSuccess(List result) { - winInfo.updateInfoContainer(result); - winInfo.maskAccountingInfo(false); - } - }); + winInfo.updateInfoContainer(result); + winInfo.maskAccountingInfo(false); + } + }); } } }); - eventBus.addHandler(FileDownloadEvent.TYPE, new FileDownloadEventHandler() { @Override public void onFileDownloadEvent(FileDownloadEvent fileDownloadEvent) { - if(fileDownloadEvent.getItemIdentifier()!=null){ + if (fileDownloadEvent.getItemIdentifier() != null) { // Add currentContextId parameter String currentContextId = GCubeClientContext.getCurrentContextId(); - if(fileDownloadEvent.getDownloadType().equals(DownloadType.SHOW)){ - if(fileDownloadEvent.getItemName()!= null){ + if (fileDownloadEvent.getDownloadType().equals(DownloadType.SHOW)) { + if (fileDownloadEvent.getItemName() != null) { try { - //String currentUserId = GCubeClientContext.getCurrentUserId(); - String queryString = "id="+fileDownloadEvent.getItemIdentifier()+"&viewContent=true&"+ConstantsExplorer.CURRENT_CONTEXT_ID+"="+currentContextId; - if(fileDownloadEvent.getVersionId()!=null) - queryString+="&"+ConstantsExplorer.FILE_VERSION_ID+"="+fileDownloadEvent.getVersionId(); - new RequestBuilderWorkspaceValidateItem(RequestBuilder.GET, ConstantsExplorer.DOWNLOAD_WORKSPACE_SERVICE, queryString, "_blank", downloadHandlerCallback); + // String currentUserId = + // GCubeClientContext.getCurrentUserId(); + String queryString = "id=" + fileDownloadEvent.getItemIdentifier() + + "&viewContent=true&" + ConstantsExplorer.CURRENT_CONTEXT_ID + "=" + + currentContextId; + if (fileDownloadEvent.getVersionId() != null) + queryString += "&" + ConstantsExplorer.FILE_VERSION_ID + "=" + + fileDownloadEvent.getVersionId(); + new RequestBuilderWorkspaceValidateItem(RequestBuilder.GET, + ConstantsExplorer.DOWNLOAD_WORKSPACE_SERVICE, queryString, "_blank", + downloadHandlerCallback); } catch (Exception e) { explorerPanel.getAsycTreePanel().unmask(); @@ -1290,37 +1400,50 @@ public class AppControllerExplorer implements EventHandler, TreeAppControllerInt } } - // com.google.gwt.user.client.Window.open(ConstantsExplorer.DOWNLOAD_WORKSPACE_SERVICE+"?id="+fileDownloadEvent.getItemIdentifier()+"&viewContent=true", fileDownloadEvent.getItemName(), ""); - } else{ - - //Task #12601 - Migrated to StorageHub - /*if (fileDownloadEvent.isFolder()) { - FolderDownloadDialog dlg = new FolderDownloadDialog(fileDownloadEvent, myLogin); - dlg.setPopupPosition(Window.getClientWidth() - (FolderDownloadDialog.WIDTH + 50), Window.getClientHeight() - (FolderDownloadDialog.HEIGHT + 120)); - dlg.show(); - } - - else { - try { - //String currentUserId = GCubeClientContext.getCurrentUserId(); - String queryString = "id="+fileDownloadEvent.getItemIdentifier()+"&"+ConstantsExplorer.CURRENT_CONTEXT_ID+"="+currentContextId; - if(fileDownloadEvent.getVersionId()!=null) - queryString+="&"+ConstantsExplorer.FILE_VERSION_ID+"="+fileDownloadEvent.getVersionId(); - new RequestBuilderWorkspaceValidateItem(RequestBuilder.GET,ConstantsExplorer.DOWNLOAD_WORKSPACE_SERVICE, queryString, "_self", downloadHandlerCallback); - } catch (Exception e) { - explorerPanel.getAsycTreePanel().unmask(); - new MessageBoxAlert("Error", e.getMessage(), null); - explorerPanel.getAsycTreePanel().removeAllAndRecoveryRoot(); - } - }*/ + // com.google.gwt.user.client.Window.open(ConstantsExplorer.DOWNLOAD_WORKSPACE_SERVICE+"?id="+fileDownloadEvent.getItemIdentifier()+"&viewContent=true", + // fileDownloadEvent.getItemName(), ""); + } else { + // Task #12601 - Migrated to StorageHub + /* + * if (fileDownloadEvent.isFolder()) { + * FolderDownloadDialog dlg = new + * FolderDownloadDialog(fileDownloadEvent, myLogin); + * dlg.setPopupPosition(Window.getClientWidth() - + * (FolderDownloadDialog.WIDTH + 50), + * Window.getClientHeight() - + * (FolderDownloadDialog.HEIGHT + 120)); dlg.show(); } + * + * else { try { //String currentUserId = + * GCubeClientContext.getCurrentUserId(); String + * queryString = + * "id="+fileDownloadEvent.getItemIdentifier()+"&"+ + * ConstantsExplorer.CURRENT_CONTEXT_ID+"="+ + * currentContextId; + * if(fileDownloadEvent.getVersionId()!=null) + * queryString+="&"+ConstantsExplorer.FILE_VERSION_ID+ + * "="+fileDownloadEvent.getVersionId(); new + * RequestBuilderWorkspaceValidateItem(RequestBuilder. + * GET,ConstantsExplorer.DOWNLOAD_WORKSPACE_SERVICE, + * queryString, "_self", downloadHandlerCallback); } + * catch (Exception e) { + * explorerPanel.getAsycTreePanel().unmask(); new + * MessageBoxAlert("Error", e.getMessage(), null); + * explorerPanel.getAsycTreePanel(). + * removeAllAndRecoveryRoot(); } } + */ try { - //String currentUserId = GCubeClientContext.getCurrentUserId(); - String queryString = "id="+fileDownloadEvent.getItemIdentifier()+"&"+ConstantsExplorer.CURRENT_CONTEXT_ID+"="+currentContextId; - if(fileDownloadEvent.getVersionId()!=null) - queryString+="&"+ConstantsExplorer.FILE_VERSION_ID+"="+fileDownloadEvent.getVersionId(); - new RequestBuilderWorkspaceValidateItem(RequestBuilder.GET,ConstantsExplorer.DOWNLOAD_WORKSPACE_SERVICE, queryString, "_self", downloadHandlerCallback); + // String currentUserId = + // GCubeClientContext.getCurrentUserId(); + String queryString = "id=" + fileDownloadEvent.getItemIdentifier() + "&" + + ConstantsExplorer.CURRENT_CONTEXT_ID + "=" + currentContextId; + if (fileDownloadEvent.getVersionId() != null) + queryString += "&" + ConstantsExplorer.FILE_VERSION_ID + "=" + + fileDownloadEvent.getVersionId(); + new RequestBuilderWorkspaceValidateItem(RequestBuilder.GET, + ConstantsExplorer.DOWNLOAD_WORKSPACE_SERVICE, queryString, "_self", + downloadHandlerCallback); } catch (Exception e) { explorerPanel.getAsycTreePanel().unmask(); new MessageBoxAlert("Error", e.getMessage(), null); @@ -1334,8 +1457,6 @@ public class AppControllerExplorer implements EventHandler, TreeAppControllerInt } }); - - eventBus.addHandler(FileUploadEvent.TYPE, new FileUploadEventHandler() { @Override @@ -1347,44 +1468,47 @@ public class AppControllerExplorer implements EventHandler, TreeAppControllerInt GWT.log("FileUploadEvent..."); FileModel folder = fileUploadEvent.getTargetFolderModel(); - if(folder == null) + if (folder == null) folder = explorerPanel.getAsycTreePanel().getRootItem(); String caption = "Upload "; UPLOAD_TYPE upType = UPLOAD_TYPE.File; - if(fileUploadEvent.getUploadType().compareTo(WS_UPLOAD_TYPE.Archive)==0){ - caption+= "Archive"; + if (fileUploadEvent.getUploadType().compareTo(WS_UPLOAD_TYPE.Archive) == 0) { + caption += "Archive"; upType = UPLOAD_TYPE.Archive; - }else if(fileUploadEvent.getUploadType().compareTo(WS_UPLOAD_TYPE.File)==0){ - caption+= "File/s"; + } else if (fileUploadEvent.getUploadType().compareTo(WS_UPLOAD_TYPE.File) == 0) { + caption += "File/s"; upType = UPLOAD_TYPE.File; } - caption+= " in: "+folder.getName(); + caption += " in: " + folder.getName(); MultipleDilaogUpload uploadStream = new MultipleDilaogUpload(caption, folder.getIdentifier(), upType); WorskpaceUploadNotificationListener listener = new WorskpaceUploadNotificationListener() { @Override public void onUploadCompleted(String parentId, String itemId) { - GWT.log("Upload completed: [parentID: "+parentId+", itemId: "+itemId+", uploadType: "+fileUploadEvent.getUploadType()+"]"); - eventBus.fireEvent(new CompletedFileUploadEvent(parentId, itemId, fileUploadEvent.getUploadType(), false)); + GWT.log("Upload completed: [parentID: " + parentId + ", itemId: " + itemId + ", uploadType: " + + fileUploadEvent.getUploadType() + "]"); + eventBus.fireEvent( + new CompletedFileUploadEvent(parentId, itemId, fileUploadEvent.getUploadType(), false)); } @Override public void onUploadAborted(String parentId, String itemId) { - GWT.log("Upload Aborted: [parentID: "+parentId+", itemId: "+itemId+"]"); + GWT.log("Upload Aborted: [parentID: " + parentId + ", itemId: " + itemId + "]"); } @Override public void onError(String parentId, String itemId, Throwable throwable) { - GWT.log("Upload Error: [parentID: "+parentId+", itemId: "+itemId+"]"); + GWT.log("Upload Error: [parentID: " + parentId + ", itemId: " + itemId + "]"); } @Override public void onOverwriteCompleted(String parentId, String itemId) { - GWT.log("Upload Override Completed: [parentID: "+parentId+", itemId: "+itemId+"]"); - eventBus.fireEvent(new CompletedFileUploadEvent(parentId, itemId, fileUploadEvent.getUploadType(), true)); + GWT.log("Upload Override Completed: [parentID: " + parentId + ", itemId: " + itemId + "]"); + eventBus.fireEvent( + new CompletedFileUploadEvent(parentId, itemId, fileUploadEvent.getUploadType(), true)); } }; @@ -1403,19 +1527,22 @@ public class AppControllerExplorer implements EventHandler, TreeAppControllerInt private void doCompletedFileUploadEvent(CompletedFileUploadEvent completedFileUploadEvent) { boolean isLevelExpanded = treeLevelIsExpanded(completedFileUploadEvent.getParentId()); - //REFRESH TREE ONLY IF FOLDER PARENT EXISTS IN TREE - FileModel parent = explorerPanel.getAsycTreePanel().getFileModelByIdentifier(completedFileUploadEvent.getParentId()); - GWT.log("doCompletedFileUploadEvent..."+parent); - if(parent!=null && completedFileUploadEvent.getItemIdentifier()!=null){ - explorerPanel.getAsycTreePanel().reloadTreeLevelAndExpandFolder(completedFileUploadEvent.getParentId(), isLevelExpanded); - // explorerPanel.getAsycTreePanel().addItemIdAndExpandFolder(parent, completedFileUploadEvent.getItemIdentifier(), isLevelExpanded); + // REFRESH TREE ONLY IF FOLDER PARENT EXISTS IN TREE + FileModel parent = explorerPanel.getAsycTreePanel() + .getFileModelByIdentifier(completedFileUploadEvent.getParentId()); + GWT.log("doCompletedFileUploadEvent..." + parent); + if (parent != null && completedFileUploadEvent.getItemIdentifier() != null) { + explorerPanel.getAsycTreePanel() + .reloadTreeLevelAndExpandFolder(completedFileUploadEvent.getParentId(), isLevelExpanded); + // explorerPanel.getAsycTreePanel().addItemIdAndExpandFolder(parent, + // completedFileUploadEvent.getItemIdentifier(), + // isLevelExpanded); } doUpdateWorkspaceSize(new UpdateWorkspaceSizeEvent()); notifySubscriber(completedFileUploadEvent); } }); - eventBus.addHandler(DeleteSmartFolderEvent.TYPE, new DeleteSmartFolderEventHandler() { @Override @@ -1428,32 +1555,35 @@ public class AppControllerExplorer implements EventHandler, TreeAppControllerInt final String smartIdentifier = deleteSmartFolderEvent.getSmartIdentifier(); final String smartName = deleteSmartFolderEvent.getSmartName(); - MessageBoxConfirm mbc = new MessageBoxConfirm(ConstantsExplorer.MESSAGE_DELETE, ConstantsExplorer.MESSAGE_CONFIRM_DELETE_SMART_FOLDER + " "+ smartName +"?"); + MessageBoxConfirm mbc = new MessageBoxConfirm(ConstantsExplorer.MESSAGE_DELETE, + ConstantsExplorer.MESSAGE_CONFIRM_DELETE_SMART_FOLDER + " " + smartName + "?"); mbc.getMessageBoxConfirm().addCallback(new Listener() { public void handleEvent(MessageBoxEvent be) { - // eventBus.fireEvent(new DeleteItemEvent(sel)); + // eventBus.fireEvent(new DeleteItemEvent(sel)); - //IF NOT CANCELLED + // IF NOT CANCELLED String clickedButton = be.getButtonClicked().getItemId(); - if(clickedButton.equals(Dialog.YES)){ + if (clickedButton.equals(Dialog.YES)) { - rpcWorkspaceService.removeSmartFolder(smartIdentifier, smartName, new AsyncCallback() { + rpcWorkspaceService.removeSmartFolder(smartIdentifier, smartName, + new AsyncCallback() { - @Override - public void onSuccess(Boolean result) { + @Override + public void onSuccess(Boolean result) { - } + } - @Override - public void onFailure(Throwable caught) { - // explorerPanel.getAsycTreePanel().unmask(); - new MessageBoxAlert("Error", ConstantsExplorer.SERVER_ERROR + " deleting smart folder.", null); - explorerPanel.getAsycTreePanel().removeAllAndRecoveryRoot(); + @Override + public void onFailure(Throwable caught) { + // explorerPanel.getAsycTreePanel().unmask(); + new MessageBoxAlert("Error", + ConstantsExplorer.SERVER_ERROR + " deleting smart folder.", null); + explorerPanel.getAsycTreePanel().removeAllAndRecoveryRoot(); - } - }); + } + }); } } @@ -1461,15 +1591,12 @@ public class AppControllerExplorer implements EventHandler, TreeAppControllerInt } }); - eventBus.addHandler(AddSmartFolderEvent.TYPE, new AddSmartFolderEventHandler() { - @Override public void onSaveSmartFolder(AddSmartFolderEvent saveSmartFolderEvent) { doSaveSmartFolder(saveSmartFolderEvent); - } private void doSaveSmartFolder(final AddSmartFolderEvent saveSmartFolderEvent) { @@ -1477,49 +1604,52 @@ public class AppControllerExplorer implements EventHandler, TreeAppControllerInt final String query = saveSmartFolderEvent.getSearchText(); final String parentId = saveSmartFolderEvent.getParentId(); - final DialogAddFolderAndSmart dialogAddSmartFolder = new DialogAddFolderAndSmart("", AddType.SMARTFOLDER); + final DialogAddFolderAndSmart dialogAddSmartFolder = new DialogAddFolderAndSmart("", + AddType.SMARTFOLDER); dialogAddSmartFolder.getButtonById(Dialog.OK).addListener(Events.Select, new Listener() { @Override public void handleEvent(BaseEvent be) { - if(dialogAddSmartFolder.isValidForm()) + if (dialogAddSmartFolder.isValidForm()) - rpcWorkspaceService.createSmartFolder(dialogAddSmartFolder.getName(), dialogAddSmartFolder.getDescription(), query, parentId, new AsyncCallback() { + rpcWorkspaceService.createSmartFolder(dialogAddSmartFolder.getName(), + dialogAddSmartFolder.getDescription(), query, parentId, + new AsyncCallback() { - @Override - public void onFailure(Throwable caught) { - explorerPanel.getAsycTreePanel().unmask(); - if(caught instanceof SessionExpiredException){ - GWT.log("Session expired"); - eventBus.fireEvent(new SessionExpiredEvent()); - return; - } - new MessageBoxAlert("Error", ConstantsExplorer.SERVER_ERROR + " saving smart folder.", null); - explorerPanel.getAsycTreePanel().removeAllAndRecoveryRoot(); + @Override + public void onFailure(Throwable caught) { + explorerPanel.getAsycTreePanel().unmask(); + if (caught instanceof SessionExpiredException) { + GWT.log("Session expired"); + eventBus.fireEvent(new SessionExpiredEvent()); + return; + } + new MessageBoxAlert("Error", + ConstantsExplorer.SERVER_ERROR + " saving smart folder.", null); + explorerPanel.getAsycTreePanel().removeAllAndRecoveryRoot(); - } + } - @Override - public void onSuccess(SmartFolderModel smart) { + @Override + public void onSuccess(SmartFolderModel smart) { - } - }); + } + }); } - }); } }); - eventBus.addHandler(SmartFolderSelectedEvent.TYPE, new SmartFolderSelectedEventHandler() { @Override public void onSmartFolderSelected(SmartFolderSelectedEvent smartFolderSelectedEvent) { searching(true); - // System.out.println("Click smart folder : " + smartFolderSelectedEvent.getSmartFolderName()); + // System.out.println("Click smart folder : " + + // smartFolderSelectedEvent.getSmartFolderName()); doSmartFolderSelected(smartFolderSelectedEvent); } @@ -1529,7 +1659,6 @@ public class AppControllerExplorer implements EventHandler, TreeAppControllerInt } }); - eventBus.addHandler(RenameItemEvent.TYPE, new RenameItemEventHandler() { @Override public void onRenameItem(RenameItemEvent event) { @@ -1539,7 +1668,8 @@ public class AppControllerExplorer implements EventHandler, TreeAppControllerInt private void doRenameItem(final RenameItemEvent event) { final FileModel target = event.getFileTarget(); - final DialogText dgt = new DialogText(ConstantsExplorer.MESSAGE_RENAME, ConstantsExplorer.MESSAGE_ITEM_NAME, event.getFileTarget().getName(), target.isDirectory()); + final DialogText dgt = new DialogText(ConstantsExplorer.MESSAGE_RENAME, + ConstantsExplorer.MESSAGE_ITEM_NAME, event.getFileTarget().getName(), target.isDirectory()); dgt.getButtonById(Dialog.OK).addListener(Events.Select, new Listener() { @@ -1548,35 +1678,37 @@ public class AppControllerExplorer implements EventHandler, TreeAppControllerInt final String newName = dgt.getTxtValue(); - if(dgt.isValidForm()){ + if (dgt.isValidForm()) { dgt.mask("Renaming..."); - GWT.log("Renaming on id: "+target.getIdentifier()); - rpcWorkspaceService.renameItem(target.getIdentifier(), newName, target.getName(), new AsyncCallback(){ + GWT.log("Renaming on id: " + target.getIdentifier()); + rpcWorkspaceService.renameItem(target.getIdentifier(), newName, target.getName(), + new AsyncCallback() { - @Override - public void onFailure(Throwable caught) { - dgt.unmask(); - dgt.hide(); - if(caught instanceof SessionExpiredException){ - GWT.log("Session expired"); - eventBus.fireEvent(new SessionExpiredEvent()); - return; - } + @Override + public void onFailure(Throwable caught) { + dgt.unmask(); + dgt.hide(); + if (caught instanceof SessionExpiredException) { + GWT.log("Session expired"); + eventBus.fireEvent(new SessionExpiredEvent()); + return; + } - new MessageBoxAlert("Error", caught.getMessage(), null); - explorerPanel.getAsycTreePanel().removeAllAndRecoveryRoot(); + new MessageBoxAlert("Error", caught.getMessage(), null); + explorerPanel.getAsycTreePanel().removeAllAndRecoveryRoot(); - } + } - @Override - public void onSuccess(Boolean result) { - dgt.unmask(); - dgt.hide(); - explorerPanel.getAsycTreePanel().renameItem(target.getIdentifier(), newName, null); - event.setNewName(newName); - notifySubscriber(event); - } - }); + @Override + public void onSuccess(Boolean result) { + dgt.unmask(); + dgt.hide(); + explorerPanel.getAsycTreePanel().renameItem(target.getIdentifier(), newName, + null); + event.setNewName(newName); + notifySubscriber(event); + } + }); } } }); @@ -1590,19 +1722,19 @@ public class AppControllerExplorer implements EventHandler, TreeAppControllerInt doDeleteItem(event); } - private void doDeleteItem(final DeleteItemEvent event){ + private void doDeleteItem(final DeleteItemEvent event) { String title = ""; String msg = ""; - if(event.getFileTarget().isShared()){ + if (event.getFileTarget().isShared()) { title = ConstantsExplorer.MESSAGE_DELETE; msg = "This item is shared. Deleting this item will affect other users. Continue?"; } - else{ + else { title = ConstantsExplorer.MESSAGE_DELETE; - msg = ConstantsExplorer.MESSAGE_CONFIRM_DELETE_ITEM + " "+ event.getFileTarget().getName() +"?"; + msg = ConstantsExplorer.MESSAGE_CONFIRM_DELETE_ITEM + " " + event.getFileTarget().getName() + "?"; } MessageBoxConfirm mbc = new MessageBoxConfirm(title, msg); @@ -1610,44 +1742,55 @@ public class AppControllerExplorer implements EventHandler, TreeAppControllerInt public void handleEvent(MessageBoxEvent be) { - //IF NOT CANCELLED + // IF NOT CANCELLED String clickedButton = be.getButtonClicked().getItemId(); - if(clickedButton.equals(Dialog.YES)){ + if (clickedButton.equals(Dialog.YES)) { explorerPanel.getAsycTreePanel().mask("Deleting", ConstantsExplorer.LOADINGSTYLE); - rpcWorkspaceService.deleteItem(event.getFileTarget().getIdentifier(), new AsyncCallback(){ + rpcWorkspaceService.deleteItem(event.getFileTarget().getIdentifier(), + new AsyncCallback() { - @Override - public void onFailure(Throwable caught) { - explorerPanel.getAsycTreePanel().unmask(); - new MessageBoxAlert("Error", caught.getMessage(), null); - explorerPanel.getAsycTreePanel().removeAllAndRecoveryRoot(); + @Override + public void onFailure(Throwable caught) { + explorerPanel.getAsycTreePanel().unmask(); + new MessageBoxAlert("Error", caught.getMessage(), null); + explorerPanel.getAsycTreePanel().removeAllAndRecoveryRoot(); - } - - @Override - public void onSuccess(Boolean result) { - explorerPanel.getAsycTreePanel().unmask(); - //Timer is used as work around to chrome and safari browser - Timer t = new Timer() { - public void run() { - - FileModel fileModel = event.getFileTarget(); - if(explorerPanel.getAsycTreePanel().deleteItem(fileModel.getIdentifier())){ - explorerPanel.getAsycTreePanel().selectItem(fileModel.getParentFileModel().getIdentifier()); //Select parent of item deleted - } - - notifySubscriber(event); - // doUpdateWorkspaceSize(new UpdateWorkspaceSizeEvent()); - // eventBus.fireEvent(new UpdateWorkspaceSizeEvent()); } - }; - // Schedule the timer to run after 250 ms. - t.schedule(250); + @Override + public void onSuccess(Boolean result) { + explorerPanel.getAsycTreePanel().unmask(); + // Timer is used as work around to + // chrome and safari browser + Timer t = new Timer() { + public void run() { - } - }); + FileModel fileModel = event.getFileTarget(); + if (explorerPanel.getAsycTreePanel() + .deleteItem(fileModel.getIdentifier())) { + explorerPanel.getAsycTreePanel().selectItem( + fileModel.getParentFileModel().getIdentifier()); // Select + // parent + // of + // item + // deleted + } + + notifySubscriber(event); + // doUpdateWorkspaceSize(new + // UpdateWorkspaceSizeEvent()); + // eventBus.fireEvent(new + // UpdateWorkspaceSizeEvent()); + } + }; + + // Schedule the timer to run after + // 250 ms. + t.schedule(250); + + } + }); } } @@ -1656,7 +1799,6 @@ public class AppControllerExplorer implements EventHandler, TreeAppControllerInt }); - eventBus.addHandler(SelectedItemEvent.TYPE, new SelectedItemEventHandler() { @Override @@ -1671,7 +1813,6 @@ public class AppControllerExplorer implements EventHandler, TreeAppControllerInt }); - eventBus.addHandler(ExpandFolderEvent.TYPE, new ExpandFolderEventHandler() { @Override @@ -1697,15 +1838,14 @@ public class AppControllerExplorer implements EventHandler, TreeAppControllerInt private void doAddItem(final AddFolderEvent event) { final FileModel sourceFileModel = event.getFileSourceModel(); - final FileModel parentFileModel= event.getParentFileModel(); + final FileModel parentFileModel = event.getParentFileModel(); String directory = null; - if(sourceFileModel.isDirectory()){ + if (sourceFileModel.isDirectory()) { explorerPanel.getAsycTreePanel().setExpandTreeLevel(sourceFileModel.getIdentifier(), true); directory = sourceFileModel.getName(); - } - else + } else directory = parentFileModel.getName(); final DialogAddFolderAndSmart dialogAddFolder = new DialogAddFolderAndSmart(directory, AddType.FOLDER); @@ -1715,53 +1855,59 @@ public class AppControllerExplorer implements EventHandler, TreeAppControllerInt @Override public void handleEvent(BaseEvent be) { - if(dialogAddFolder.isValidForm()){ + if (dialogAddFolder.isValidForm()) { - if(sourceFileModel.isDirectory()){ + if (sourceFileModel.isDirectory()) { - rpcWorkspaceService.createFolder(dialogAddFolder.getName(), dialogAddFolder.getDescription(), sourceFileModel, new AsyncCallback(){ + rpcWorkspaceService.createFolder(dialogAddFolder.getName(), + dialogAddFolder.getDescription(), sourceFileModel, + new AsyncCallback() { - @Override - public void onFailure(Throwable caught) { - explorerPanel.getAsycTreePanel().unmask(); - if(caught instanceof SessionExpiredException){ - GWT.log("Session expired"); - eventBus.fireEvent(new SessionExpiredEvent()); - return; - } - new MessageBoxAlert("Error", caught.getMessage(), null); - } + @Override + public void onFailure(Throwable caught) { + explorerPanel.getAsycTreePanel().unmask(); + if (caught instanceof SessionExpiredException) { + GWT.log("Session expired"); + eventBus.fireEvent(new SessionExpiredEvent()); + return; + } + new MessageBoxAlert("Error", caught.getMessage(), null); + } - @Override - public void onSuccess(FolderModel child) { + @Override + public void onSuccess(FolderModel child) { - explorerPanel.getAsycTreePanel().addItem(sourceFileModel.getIdentifier(), child, false); - event.setNewFolder(child); - notifySubscriber(event); - } + explorerPanel.getAsycTreePanel() + .addItem(sourceFileModel.getIdentifier(), child, false); + event.setNewFolder(child); + notifySubscriber(event); + } - }); + }); - }else{ + } else { - rpcWorkspaceService.createFolder(dialogAddFolder.getName(), dialogAddFolder.getDescription(), parentFileModel, new AsyncCallback(){ + rpcWorkspaceService.createFolder(dialogAddFolder.getName(), + dialogAddFolder.getDescription(), parentFileModel, + new AsyncCallback() { - @Override - public void onFailure(Throwable caught) { - explorerPanel.getAsycTreePanel().unmask(); - new MessageBoxAlert("Error", caught.getMessage(), null); + @Override + public void onFailure(Throwable caught) { + explorerPanel.getAsycTreePanel().unmask(); + new MessageBoxAlert("Error", caught.getMessage(), null); - } + } - @Override - public void onSuccess(FolderModel child) { + @Override + public void onSuccess(FolderModel child) { - explorerPanel.getAsycTreePanel().addItem(parentFileModel.getIdentifier(), child, false); - event.setNewFolder(child); - notifySubscriber(event); - } + explorerPanel.getAsycTreePanel() + .addItem(parentFileModel.getIdentifier(), child, false); + event.setNewFolder(child); + notifySubscriber(event); + } - }); + }); } } @@ -1772,44 +1918,48 @@ public class AppControllerExplorer implements EventHandler, TreeAppControllerInt } }); - eventBus.addHandler(DragOnTreeMoveItemEvent.TYPE, new DragOnTreeMoveItemEventHandler() { @Override public void onMoveItem(final DragOnTreeMoveItemEvent event) { - explorerPanel.getAsycTreePanel().mask(ConstantsExplorer.MOVING,ConstantsExplorer.LOADINGSTYLE); + explorerPanel.getAsycTreePanel().mask(ConstantsExplorer.MOVING, ConstantsExplorer.LOADINGSTYLE); - rpcWorkspaceService.moveItems(Arrays.asList(event.getFileSourceModel().getIdentifier()), event.getTargetParentFileModel().getIdentifier(), new AsyncCallback() { + rpcWorkspaceService.moveItems(Arrays.asList(event.getFileSourceModel().getIdentifier()), + event.getTargetParentFileModel().getIdentifier(), + new AsyncCallback() { - @Override - public void onFailure(Throwable caught) { - explorerPanel.getAsycTreePanel().unmask(); - if(caught instanceof SessionExpiredException){ - GWT.log("Session expired"); - eventBus.fireEvent(new SessionExpiredEvent()); - return; - } + @Override + public void onFailure(Throwable caught) { + explorerPanel.getAsycTreePanel().unmask(); + if (caught instanceof SessionExpiredException) { + GWT.log("Session expired"); + eventBus.fireEvent(new SessionExpiredEvent()); + return; + } - new MessageBoxAlert("Error", caught.getMessage()+"." , null); - // System.out.println(caught.getMessage()); - explorerPanel.getAsycTreePanel().reloadTreeLevelAndExpandFolder(event.getTargetParentFileModel().getIdentifier(), false); - explorerPanel.getAsycTreePanel().reloadTreeLevelAndExpandFolder(event.getFileSourceModel().getParentFileModel().getIdentifier(), true); - } + new MessageBoxAlert("Error", caught.getMessage() + ".", null); + // System.out.println(caught.getMessage()); + explorerPanel.getAsycTreePanel().reloadTreeLevelAndExpandFolder( + event.getTargetParentFileModel().getIdentifier(), false); + explorerPanel.getAsycTreePanel().reloadTreeLevelAndExpandFolder( + event.getFileSourceModel().getParentFileModel().getIdentifier(), true); + } - @Override - public void onSuccess(WorkspaceOperationResult result) { - explorerPanel.getAsycTreePanel().unmask(); - if(result!=null){ + @Override + public void onSuccess(WorkspaceOperationResult result) { + explorerPanel.getAsycTreePanel().unmask(); + if (result != null) { - if(result.getError()!=null) - new MessageBoxAlert("Error",result.getError(), null); + if (result.getError() != null) + new MessageBoxAlert("Error", result.getError(), null); - explorerPanel.getAsycTreePanel().reloadTreeLevelAndExpandFolder(event.getTargetParentFileModel().getIdentifier(), true); - notifySubscriber(event); - } - } - }); + explorerPanel.getAsycTreePanel().reloadTreeLevelAndExpandFolder( + event.getTargetParentFileModel().getIdentifier(), true); + notifySubscriber(event); + } + } + }); } }); @@ -1819,14 +1969,21 @@ public class AppControllerExplorer implements EventHandler, TreeAppControllerInt @Override public void onClickPreview(ImagePreviewEvent imagePreviewEvent) { - if(imagePreviewEvent.getClientX() > 0 && imagePreviewEvent.getClientY() > 0) + if (imagePreviewEvent.getClientX() > 0 && imagePreviewEvent.getClientY() > 0) doClickPreview(imagePreviewEvent, imagePreviewEvent.getClientX(), imagePreviewEvent.getClientY()); else doClickPreview(imagePreviewEvent, 50, 50); - //ADDED 24/07/2013 - if(imagePreviewEvent.getSourceFileModel()!=null){ //FILE CAN NOT LOADED IN TREE - notifySubscriber(new FileDownloadEvent(imagePreviewEvent.getSourceFileModel().getIdentifier(), imagePreviewEvent.getSourceFileModel().getName(), FileDownloadEvent.DownloadType.SHOW, false, null)); + // ADDED 24/07/2013 + if (imagePreviewEvent.getSourceFileModel() != null) { // FILE + // CAN + // NOT + // LOADED + // IN + // TREE + notifySubscriber(new FileDownloadEvent(imagePreviewEvent.getSourceFileModel().getIdentifier(), + imagePreviewEvent.getSourceFileModel().getName(), FileDownloadEvent.DownloadType.SHOW, + false, null)); } } @@ -1836,30 +1993,35 @@ public class AppControllerExplorer implements EventHandler, TreeAppControllerInt final FileModel fileModel = imagePreviewEvent.getSourceFileModel(); boolean fullDetails = false; - rpcWorkspaceService.getImageById(fileModel.getIdentifier(), fileModel.getGXTFolderItemType().equals(GXTFolderItemTypeEnum.IMAGE_DOCUMENT), fullDetails, new AsyncCallback() { + rpcWorkspaceService.getImageById(fileModel.getIdentifier(), + fileModel.getGXTFolderItemType().equals(GXTFolderItemTypeEnum.IMAGE_DOCUMENT), fullDetails, + new AsyncCallback() { - @Override - public void onFailure(Throwable caught) { - explorerPanel.getAsycTreePanel().unmask(); - new MessageBoxAlert("Error", ConstantsExplorer.SERVER_ERROR + " getting the image preview", null); - explorerPanel.getAsycTreePanel().removeAllAndRecoveryRoot(); + @Override + public void onFailure(Throwable caught) { + explorerPanel.getAsycTreePanel().unmask(); + new MessageBoxAlert("Error", + ConstantsExplorer.SERVER_ERROR + " getting the image preview", null); + explorerPanel.getAsycTreePanel().removeAllAndRecoveryRoot(); - } + } - @Override - public void onSuccess(GWTWorkspaceItem item) { - GWT.log("Image loaded: "+item.getName() + " label: "+item.getLabel() +" type: "+fileModel.getGXTFolderItemType()); - if(fileModel.getGXTFolderItemType().equals(GXTFolderItemTypeEnum.IMAGE_DOCUMENT)) - new ImagesPreviewController(fileModel.getName(), fileModel.getParentFileModel(), (GWTImageDocument) item, positionX, positionY); - else - new ImagesPreviewController(fileModel.getName(), fileModel.getParentFileModel(), (GWTExternalImage) item, positionX, positionY); + @Override + public void onSuccess(GWTWorkspaceItem item) { + GWT.log("Image loaded: " + item.getName() + " label: " + item.getLabel() + " type: " + + fileModel.getGXTFolderItemType()); + if (fileModel.getGXTFolderItemType().equals(GXTFolderItemTypeEnum.IMAGE_DOCUMENT)) + new ImagesPreviewController(fileModel.getName(), fileModel.getParentFileModel(), + (GWTImageDocument) item, positionX, positionY); + else + new ImagesPreviewController(fileModel.getName(), fileModel.getParentFileModel(), + (GWTExternalImage) item, positionX, positionY); - } - }); + } + }); } }); - eventBus.addHandler(OpenUrlEvent.TYPE, new OpenUrlEventHandler() { @Override @@ -1869,7 +2031,6 @@ public class AppControllerExplorer implements EventHandler, TreeAppControllerInt } }); - eventBus.addHandler(CreateUrlEvent.TYPE, new CreateUrlEventHandler() { @Override @@ -1889,30 +2050,35 @@ public class AppControllerExplorer implements EventHandler, TreeAppControllerInt @Override public void handleEvent(BaseEvent be) { - if(dgu.isValidForm()){ - explorerPanel.getAsycTreePanel().mask(ConstantsExplorer.VALIDATINGOPERATION,ConstantsExplorer.LOADINGSTYLE); + if (dgu.isValidForm()) { + explorerPanel.getAsycTreePanel().mask(ConstantsExplorer.VALIDATINGOPERATION, + ConstantsExplorer.LOADINGSTYLE); - GWT.log("parent: "+parent); - rpcWorkspaceService.createExternalUrl(parent.getIdentifier(), dgu.getName(), dgu.getDescription(), dgu.getUrl(), new AsyncCallback() { + GWT.log("parent: " + parent); + rpcWorkspaceService.createExternalUrl(parent.getIdentifier(), dgu.getName(), + dgu.getDescription(), dgu.getUrl(), new AsyncCallback() { - @Override - public void onFailure(Throwable caught) { - explorerPanel.getAsycTreePanel().unmask(); - new MessageBoxAlert("Error", ConstantsExplorer.SERVER_ERROR +" creating url.", null); - explorerPanel.getAsycTreePanel().removeAllAndRecoveryRoot(); + @Override + public void onFailure(Throwable caught) { + explorerPanel.getAsycTreePanel().unmask(); + new MessageBoxAlert("Error", + ConstantsExplorer.SERVER_ERROR + " creating url.", null); + explorerPanel.getAsycTreePanel().removeAllAndRecoveryRoot(); - } + } - @Override - public void onSuccess(FileModel child) { - explorerPanel.getAsycTreePanel().unmask(); - eventBus.fireEvent(new CompletedFileUploadEvent(parent.getIdentifier(), child.getIdentifier(), WS_UPLOAD_TYPE.File, false)); + @Override + public void onSuccess(FileModel child) { + explorerPanel.getAsycTreePanel().unmask(); + eventBus.fireEvent(new CompletedFileUploadEvent(parent.getIdentifier(), + child.getIdentifier(), WS_UPLOAD_TYPE.File, false)); -// explorerPanel.getAsycTreePanel().addItem(parent.getIdentifier(), child, false); -// explorerPanel.getAsycTreePanel().unmask(); -// notifySubscriber(createUrlEvent); - } - }); + // explorerPanel.getAsycTreePanel().addItem(parent.getIdentifier(), + // child, false); + // explorerPanel.getAsycTreePanel().unmask(); + // notifySubscriber(createUrlEvent); + } + }); } } }); @@ -1924,10 +2090,10 @@ public class AppControllerExplorer implements EventHandler, TreeAppControllerInt @Override public void onPermissionSetting(VRESettingPermissionEvent settingPermissionEvent) { - if(settingPermissionEvent.getSourceFile()!=null){ + if (settingPermissionEvent.getSourceFile() != null) { DialogPermission dialog = new DialogPermission(settingPermissionEvent.getSourceFile()); dialog.show(); - }else + } else Info.display("Attention", "Select a VRE Folder to change permissions!"); } }); @@ -1941,49 +2107,52 @@ public class AppControllerExplorer implements EventHandler, TreeAppControllerInt } }); - eventBus.addHandler(OpenReportsEvent.TYPE, new OpenReportsEventHandler() { @Override public void onClickOpenReports(OpenReportsEvent openReportsEvent) { - if(openReportsEvent.getSourceFileModel().getGXTFolderItemType().equals(GXTFolderItemTypeEnum.REPORT_TEMPLATE)) + if (openReportsEvent.getSourceFileModel().getGXTFolderItemType() + .equals(GXTFolderItemTypeEnum.REPORT_TEMPLATE)) doClickOpenReportTemplate(openReportsEvent); else doClickOpenReport(openReportsEvent); } - public void doClickOpenReport(OpenReportsEvent openReportsEvent) { final NewBrowserWindow newBrowserWindow = NewBrowserWindow.open("", "_self", ""); - rpcWorkspaceService.getURLFromApplicationProfile(openReportsEvent.getSourceFileModel().getIdentifier(), new AsyncCallback() { + rpcWorkspaceService.getURLFromApplicationProfile(openReportsEvent.getSourceFileModel().getIdentifier(), + new AsyncCallback() { - @Override - public void onFailure(Throwable caught) { - new MessageBoxAlert("Error", ConstantsExplorer.SERVER_ERROR + " getting application profile - attribute idreport", null); + @Override + public void onFailure(Throwable caught) { + new MessageBoxAlert("Error", ConstantsExplorer.SERVER_ERROR + + " getting application profile - attribute idreport", null); - } + } - @Override - public void onSuccess(String url) { + @Override + public void onSuccess(String url) { - if(url==null || url.isEmpty()){ - String currentUrl = portalURL(); - int last = currentUrl.lastIndexOf("/"); - String reportUrl = currentUrl.substring(0,last+1) + ConstantsExplorer.REPORTGENERATION; - // new WindowOpenUrl(reportUrl, "_self", ""); - newBrowserWindow.setUrl(reportUrl); - } - else{ - String reportUrl = url; - // new WindowOpenUrl(reportUrl, "_self", ""); - newBrowserWindow.setUrl(reportUrl); - } - } - }); + if (url == null || url.isEmpty()) { + String currentUrl = portalURL(); + int last = currentUrl.lastIndexOf("/"); + String reportUrl = currentUrl.substring(0, last + 1) + + ConstantsExplorer.REPORTGENERATION; + // new WindowOpenUrl(reportUrl, "_self", + // ""); + newBrowserWindow.setUrl(reportUrl); + } else { + String reportUrl = url; + // new WindowOpenUrl(reportUrl, "_self", + // ""); + newBrowserWindow.setUrl(reportUrl); + } + } + }); } @@ -1991,45 +2160,50 @@ public class AppControllerExplorer implements EventHandler, TreeAppControllerInt final NewBrowserWindow newBrowserWindow = NewBrowserWindow.open("", "_self", ""); - rpcWorkspaceService.getURLFromApplicationProfile(openReportTemplateEvent.getSourceFileModel().getIdentifier(), new AsyncCallback() { + rpcWorkspaceService.getURLFromApplicationProfile( + openReportTemplateEvent.getSourceFileModel().getIdentifier(), new AsyncCallback() { - @Override - public void onFailure(Throwable caught) { - new MessageBoxAlert("Error", ConstantsExplorer.SERVER_ERROR + " getting application profile - attribute idreport", null); + @Override + public void onFailure(Throwable caught) { + new MessageBoxAlert("Error", ConstantsExplorer.SERVER_ERROR + + " getting application profile - attribute idreport", null); - } + } - @Override - public void onSuccess(String url) { + @Override + public void onSuccess(String url) { - if(url==null || url.isEmpty()){ - String currentUrl = portalURL(); - int last = currentUrl.lastIndexOf("/"); - String templateUrl = currentUrl.substring(0,last+1) + ConstantsExplorer.TEMPLATECREATION; - // Log.trace("Url: "+templateUrl); - GWT.log("currentUrl " +currentUrl); - GWT.log("reportUrl " +templateUrl); - newBrowserWindow.setUrl(templateUrl); - // new WindowOpenUrl(templateUrl, "_self", ""); - }else{ + if (url == null || url.isEmpty()) { + String currentUrl = portalURL(); + int last = currentUrl.lastIndexOf("/"); + String templateUrl = currentUrl.substring(0, last + 1) + + ConstantsExplorer.TEMPLATECREATION; + // Log.trace("Url: "+templateUrl); + GWT.log("currentUrl " + currentUrl); + GWT.log("reportUrl " + templateUrl); + newBrowserWindow.setUrl(templateUrl); + // new WindowOpenUrl(templateUrl, "_self", + // ""); + } else { - String templateUrl = url; - newBrowserWindow.setUrl(templateUrl); - // new WindowOpenUrl(templateUrl, "_self", ""); - } + String templateUrl = url; + newBrowserWindow.setUrl(templateUrl); + // new WindowOpenUrl(templateUrl, "_self", + // ""); + } - } - }); + } + }); } }); } - /** * Do update workspace size. * - * @param updateWorkspaceSizeEvent the update workspace size event + * @param updateWorkspaceSizeEvent + * the update workspace size event */ protected void doUpdateWorkspaceSize(UpdateWorkspaceSizeEvent updateWorkspaceSizeEvent) { notifySubscriber(updateWorkspaceSizeEvent); @@ -2041,148 +2215,157 @@ public class AppControllerExplorer implements EventHandler, TreeAppControllerInt * @return the string */ public static native String portalURL()/*-{ - return $wnd.location.href; + return $wnd.location.href; }-*/; - //********END EVENTS TO NOTIFY SUBSCRIBERS + // ********END EVENTS TO NOTIFY SUBSCRIBERS - - //Method Notify Subscriber + // Method Notify Subscriber /** * Notify subscriber. * - * @param event the event + * @param event + * the event */ - public void notifySubscriber(GuiEventInterface event) - { + public void notifySubscriber(GuiEventInterface event) { if (subscribers.containsKey(event.getKey())) - for (SubscriberInterface sub : subscribers.get(event.getKey())){ + for (SubscriberInterface sub : subscribers.get(event.getKey())) { - if(event instanceof RenameItemEvent){ + if (event instanceof RenameItemEvent) { RenameItemEvent renameEvent = (RenameItemEvent) event; - sub.renameItem(renameEvent.getFileTarget().getIdentifier(), renameEvent.getNewName(), renameEvent.getExtension()); + sub.renameItem(renameEvent.getFileTarget().getIdentifier(), renameEvent.getNewName(), + renameEvent.getExtension()); - }else if(event instanceof DeleteItemEvent){ + } else if (event instanceof DeleteItemEvent) { DeleteItemEvent deleteEvent = (DeleteItemEvent) event; List ids = new ArrayList(1); ids.add(deleteEvent.getFileTarget().getIdentifier()); sub.deleteItems(ids); - }else if(event instanceof SelectedItemEvent){ + } else if (event instanceof SelectedItemEvent) { SelectedItemEvent selectedEvent = (SelectedItemEvent) event; List listFileModel = new ArrayList(); - FileModel item = explorerPanel.getAsycTreePanel().getFileModelByIdentifier(selectedEvent.getFileTarget().getIdentifier()); + FileModel item = explorerPanel.getAsycTreePanel() + .getFileModelByIdentifier(selectedEvent.getFileTarget().getIdentifier()); - listFileModel = getListParents(listFileModel,item); //used for update path bar + listFileModel = getListParents(listFileModel, item); // used + // for + // update + // path + // bar sub.selectedItem(selectedEvent.getFileTarget(), listFileModel); - }else if(event instanceof ExpandFolderEvent){ + } else if (event instanceof ExpandFolderEvent) { ExpandFolderEvent expandEvent = (ExpandFolderEvent) event; sub.expandFolderItem(expandEvent.getFolderTarget()); - }else if(event instanceof AddFolderEvent){ + } else if (event instanceof AddFolderEvent) { AddFolderEvent addItemEvent = (AddFolderEvent) event; - if(addItemEvent.getFileSourceModel().isDirectory()) + if (addItemEvent.getFileSourceModel().isDirectory()) sub.addedFolder(addItemEvent.getNewFolder().getIdentifier(), addItemEvent.getFileSourceModel()); else sub.addedFolder(addItemEvent.getNewFolder().getIdentifier(), addItemEvent.getParentFileModel()); - }else if(event instanceof SubTreeLoadedEvent){ + } else if (event instanceof SubTreeLoadedEvent) { GWT.log("SubTreeLoadedEvent..."); SubTreeLoadedEvent subTreeEvent = (SubTreeLoadedEvent) event; sub.setParentItemSelected(subTreeEvent.getPathParentsList()); - // if(openTreeMenuEvent && isShowTreeMenu==false) - // eventBus.fireEvent(new O) + // if(openTreeMenuEvent && isShowTreeMenu==false) + // eventBus.fireEvent(new O) - }else if(event instanceof SmartFolderSelectedEvent){ + } else if (event instanceof SmartFolderSelectedEvent) { SmartFolderSelectedEvent smartEvent = (SmartFolderSelectedEvent) event; sub.smartFolderSelected(smartEvent.getSmartFolderCustomId(), smartEvent.getCategory()); - }else if(event instanceof FileUploadEvent){ + } else if (event instanceof FileUploadEvent) { - // FileUploadEvent fileUpEvent = (FileUploadEvent) event; - // sub.addedFile(fileUpEvent.getParentFileModel(), ""); + // FileUploadEvent fileUpEvent = (FileUploadEvent) event; + // sub.addedFile(fileUpEvent.getParentFileModel(), ""); - } else if(event instanceof CompletedFileUploadEvent){ + } else if (event instanceof CompletedFileUploadEvent) { CompletedFileUploadEvent fileUpEvent = (CompletedFileUploadEvent) event; - sub.addedFile(fileUpEvent.getItemIdentifier(), fileUpEvent.getParentId(), fileUpEvent.getUploadType(), fileUpEvent.isOverwrite()); + sub.addedFile(fileUpEvent.getItemIdentifier(), fileUpEvent.getParentId(), + fileUpEvent.getUploadType(), fileUpEvent.isOverwrite()); - }else if(event instanceof CreateUrlEvent){ + } else if (event instanceof CreateUrlEvent) { CreateUrlEvent createUrlEvent = (CreateUrlEvent) event; - sub.addedFile(createUrlEvent.getItemIdentifier(), createUrlEvent.getParentFileModel().getIdentifier(), WS_UPLOAD_TYPE.File, false); + sub.addedFile(createUrlEvent.getItemIdentifier(), + createUrlEvent.getParentFileModel().getIdentifier(), WS_UPLOAD_TYPE.File, false); - }else if(event instanceof DragOnTreeMoveItemEvent){ + } else if (event instanceof DragOnTreeMoveItemEvent) { DragOnTreeMoveItemEvent moveItemEvent = (DragOnTreeMoveItemEvent) event; - sub.movedItems(moveItemEvent.getFileSourceModel().getIdentifier(), moveItemEvent.getTargetParentFileModel()); + sub.movedItems(moveItemEvent.getFileSourceModel().getIdentifier(), + moveItemEvent.getTargetParentFileModel()); - }else if(event instanceof SwitchViewEvent){ + } else if (event instanceof SwitchViewEvent) { SwitchViewEvent switchView = (SwitchViewEvent) event; sub.switchView(switchView.getType()); - }else if(event instanceof RefreshFolderEvent){ + } else if (event instanceof RefreshFolderEvent) { RefreshFolderEvent refresh = (RefreshFolderEvent) event; - sub.refreshFolder(refresh.getFolderTarget(), refresh.isForceRefresh(), refresh.isForceReloadBreadCrumb()); + sub.refreshFolder(refresh.getFolderTarget(), refresh.isForceRefresh(), + refresh.isForceReloadBreadCrumb()); - }else if(event instanceof FileDownloadEvent){ + } else if (event instanceof FileDownloadEvent) { FileDownloadEvent messageEvent = (FileDownloadEvent) event; sub.fileDownloaded(messageEvent.getItemIdentifier()); - }else if(event instanceof SessionExpiredEvent){ + } else if (event instanceof SessionExpiredEvent) { sub.viewSessionExpiredPanel(); - }else if(event instanceof MoveItemsEvent){ + } else if (event instanceof MoveItemsEvent) { MoveItemsEvent moveEvent = (MoveItemsEvent) event; sub.moveEventIsCompleted(moveEvent.isTreeRefreshable(), moveEvent.getDestionationFolderId()); - }else if(event instanceof CopyItemsEvent){ + } else if (event instanceof CopyItemsEvent) { CopyItemsEvent copyEvent = (CopyItemsEvent) event; sub.copyEventIsCompleted(copyEvent.getDestinationFolderId()); - }else if(event instanceof TrashEvent){ + } else if (event instanceof TrashEvent) { TrashEvent trashEvent = (TrashEvent) event; sub.trashEvent(trashEvent.getTrashOperation(), trashEvent.getTargetFileModels()); - }else if(event instanceof UpdatedVREPermissionEvent){ + } else if (event instanceof UpdatedVREPermissionEvent) { UpdatedVREPermissionEvent vreEvent = (UpdatedVREPermissionEvent) event; sub.updatedVREPermissions(vreEvent.getVreFolderId()); - }else if(event instanceof UpdateWorkspaceSizeEvent){ + } else if (event instanceof UpdateWorkspaceSizeEvent) { sub.updateWorksapaceSize(true); - }else if(event instanceof VersioningHistoryShowEvent){ + } else if (event instanceof VersioningHistoryShowEvent) { VersioningHistoryShowEvent historyVers = (VersioningHistoryShowEvent) event; sub.versioningHistory(historyVers.getTargetFileModel()); - }else if(event instanceof LoadFolderEvent){ + } else if (event instanceof LoadFolderEvent) { LoadFolderEvent loadFolderEvent = (LoadFolderEvent) event; sub.loadFolder(loadFolderEvent.getTargetFolder()); } @@ -2193,21 +2376,24 @@ public class AppControllerExplorer implements EventHandler, TreeAppControllerInt /** * Tree level is expanded. * - * @param folderId the folder id + * @param folderId + * the folder id * @return true, if successful */ - public boolean treeLevelIsExpanded(String folderId){ + public boolean treeLevelIsExpanded(String folderId) { return explorerPanel.getAsycTreePanel().isExpanded(folderId); } /** * Gets the list parents. * - * @param listParentModel the list parent model - * @param item the item + * @param listParentModel + * the list parent model + * @param item + * the item * @return the list parents */ - private List getListParents(List listParentModel, FileModel item){ + private List getListParents(List listParentModel, FileModel item) { getParents(listParentModel, item); @@ -2220,17 +2406,19 @@ public class AppControllerExplorer implements EventHandler, TreeAppControllerInt /** * Gets the parents. * - * @param listParents the list parents - * @param item the item + * @param listParents + * the list parents + * @param item + * the item * @return the parents */ - private void getParents(List listParents, FileModel item){ + private void getParents(List listParents, FileModel item) { - if(item==null || item.getParentFileModel()==null){ + if (item == null || item.getParentFileModel() == null) { return; } - if(item.getParentFileModel().isRoot()){ + if (item.getParentFileModel().isRoot()) { listParents.add(item.getParentFileModel()); return; } @@ -2242,11 +2430,12 @@ public class AppControllerExplorer implements EventHandler, TreeAppControllerInt /** * Subscribe. * - * @param subscriber the subscriber - * @param keys the keys + * @param subscriber + * the subscriber + * @param keys + * the keys */ - public void subscribe(SubscriberInterface subscriber, EventsTypeEnum[] keys) - { + public void subscribe(SubscriberInterface subscriber, EventsTypeEnum[] keys) { for (EventsTypeEnum m : keys) subscribe(subscriber, m); } @@ -2254,15 +2443,15 @@ public class AppControllerExplorer implements EventHandler, TreeAppControllerInt /** * Subscribe. * - * @param subscriber the subscriber - * @param key the key + * @param subscriber + * the subscriber + * @param key + * the key */ - public void subscribe(SubscriberInterface subscriber, EventsTypeEnum key) - { + public void subscribe(SubscriberInterface subscriber, EventsTypeEnum key) { if (subscribers.containsKey(key)) subscribers.get(key).add(subscriber); - else - { + else { ArrayList subs = new ArrayList(); subs.add(subscriber); subscribers.put(key, subs); @@ -2272,11 +2461,12 @@ public class AppControllerExplorer implements EventHandler, TreeAppControllerInt /** * Unsubscribe. * - * @param subscriber the subscriber - * @param key the key + * @param subscriber + * the subscriber + * @param key + * the key */ - public void unsubscribe(SubscriberInterface subscriber, EventsTypeEnum key) - { + public void unsubscribe(SubscriberInterface subscriber, EventsTypeEnum key) { if (subscribers.containsKey(key)) subscribers.get(key).remove(subscriber); } @@ -2284,25 +2474,31 @@ public class AppControllerExplorer implements EventHandler, TreeAppControllerInt /** * Go. * - * @param rootPanel the root panel - * @param onlyTree the only tree - * @param instancingSmartFolder the instancing smart folder - * @param instancingMessages the instancing messages - * @param selectRootItem the select root item + * @param rootPanel + * the root panel + * @param onlyTree + * the only tree + * @param instancingSmartFolder + * the instancing smart folder + * @param instancingMessages + * the instancing messages + * @param selectRootItem + * the select root item */ - public void go(final HasWidgets rootPanel, boolean onlyTree, boolean instancingSmartFolder, boolean instancingMessages, boolean selectRootItem) { + public void go(final HasWidgets rootPanel, boolean onlyTree, boolean instancingSmartFolder, + boolean instancingMessages, boolean selectRootItem) { - if(onlyTree){ + if (onlyTree) { this.selectRootItem = selectRootItem; - this.explorerPanel = new ExplorerPanel(true,this.selectRootItem); - this.selectRootItem = false; //set false select root item; only first time is used + this.explorerPanel = new ExplorerPanel(true, this.selectRootItem); + this.selectRootItem = false; // set false select root item; only + // first time is used this.explorerPanel.setSize(400, 600); this.explorerPanel.getAsycTreePanel().setSizeTreePanel(350, 550); - // rootPanel.add(new BasicDNDExample()); //it's example of drag&drop - }else - this.explorerPanel = new ExplorerPanel(instancingSmartFolder,instancingMessages); - + // rootPanel.add(new BasicDNDExample()); //it's example of drag&drop + } else + this.explorerPanel = new ExplorerPanel(instancingSmartFolder, instancingMessages); rootPanel.add(explorerPanel); } @@ -2314,21 +2510,24 @@ public class AppControllerExplorer implements EventHandler, TreeAppControllerInt * @deprecated */ @Deprecated - public ExplorerPanel getTreePanel(){ + public ExplorerPanel getTreePanel() { this.explorerPanel = getPanel(); return this.explorerPanel; } /** - * Instance only Async Tree with specific width - height - select by default the root item . + * Instance only Async Tree with specific width - height - select by default + * the root item . * - * @param width the width - * @param height the height + * @param width + * the width + * @param height + * the height * @return AsyncTreePanel */ - public AsyncTreePanel getTree(int width, int height){ + public AsyncTreePanel getTree(int width, int height) { this.explorerPanel = getPanel(); this.explorerPanel.getAsycTreePanel().setSizeTreePanel(width, height); @@ -2347,38 +2546,42 @@ public class AppControllerExplorer implements EventHandler, TreeAppControllerInt /** * Refresh root. * - * @param selectRootItem the select root item + * @param selectRootItem + * the select root item */ - public void refreshRoot(boolean selectRootItem){ - if(explorerPanel.getAsycTreePanel()!=null) + public void refreshRoot(boolean selectRootItem) { + if (explorerPanel.getAsycTreePanel() != null) explorerPanel.getAsycTreePanel().removeAllAndRecoveryRoot(selectRootItem); } - /** * Instance only Async Tree. Select by default root items of tree. + * * @return ExplorerPanel */ - public ExplorerPanel getPanel(){ + public ExplorerPanel getPanel() { this.explorerPanel = new ExplorerPanel(true, true); loadMyLogin(); loadMyFirstName(); return this.explorerPanel; } - /** - * Instance by default asyncronus Tree while Smart Folders and Messages was instanced as input value. + * Instance by default asyncronus Tree while Smart Folders and Messages was + * instanced as input value. * - * @param instancingSmartFolder the instancing smart folder - * @param instancingMessages the instancing messages - * @param selectRootItem the select root item + * @param instancingSmartFolder + * the instancing smart folder + * @param instancingMessages + * the instancing messages + * @param selectRootItem + * the select root item * @return ExplorerPanel */ - public ExplorerPanel getPanel(boolean instancingSmartFolder, boolean instancingMessages, boolean selectRootItem){ + public ExplorerPanel getPanel(boolean instancingSmartFolder, boolean instancingMessages, boolean selectRootItem) { this.explorerPanel = new ExplorerPanel(instancingSmartFolder, instancingMessages, selectRootItem); - this.selectRootItem=selectRootItem; + this.selectRootItem = selectRootItem; loadMyLogin(); loadMyFirstName(); return this.explorerPanel; @@ -2387,147 +2590,154 @@ public class AppControllerExplorer implements EventHandler, TreeAppControllerInt /** * Edi permissions. * - * @param file the file + * @param file + * the file */ private void ediPermissions(final FileModel file) { - GWT.log("Edit Permissions on "+file); - MultiDragConstants.HEADING_DIALOG = "Edit User/s permissions to: "+file.getName(); - MultiDragConstants.ALL_CONTACTS_LEFT_LIST = "Shared User/s"; - MultiDragConstants.SHARE_WITH_RIGHT_LIST = "Set permissions for User/s"; + GWT.log("Show Permissions on " + file); + // MultiDragConstants.HEADING_DIALOG = "Permissions: " + file.getName(); + /// MultiDragConstants.ALL_CONTACTS_LEFT_LIST = "Shared User/s"; + // MultiDragConstants.SHARE_WITH_RIGHT_LIST = "Set permissions for + // User/s"; - final MultiDragContactsEditPermissions multiDragContact = new MultiDragContactsEditPermissions(LOAD_CONTACTS_AS.SHARED_USER, file.getIdentifier(), true); + final ShowPermissionsDialog showPermissionDialog = new ShowPermissionsDialog("Permissions: " + file.getName(), + file.getIdentifier()); + showPermissionDialog.show(); - final DialogMultiDragContact multidrag = multiDragContact.getDialog(); - - multidrag.setTxtHelp("Sets the permission for the user(s) dragged in the right list"); - - multidrag.getButtonById(Dialog.OK).addListener(Events.Select, new Listener() { - - @Override - public void handleEvent(BaseEvent be) { - final List targets = multiDragContact.getTargetContacts(); - - if(targets.size()==0){ - MessageBoxConfirm info = new MessageBoxConfirm("Any User/s?", "You have not selected any Users, confirm exit?"); - - info.getMessageBoxConfirm().addCallback(new Listener() { - - public void handleEvent(MessageBoxEvent be) { - //IF NOT CANCELLED - String clickedButton = be.getButtonClicked().getItemId(); - if(clickedButton.equals(Dialog.YES)){ - multidrag.hide(); - } - } - }); - } - - // GWT.log(targets.toString()); - - if(targets.size()>=1 && multiDragContact.getSelectedAcl()!=null){ - - final List logins = new ArrayList(targets.size()); - - for (org.gcube.portlets.widgets.workspacesharingwidget.shared.InfoContactModel infoContactModel : targets) { - GWT.log(infoContactModel.toString()); - logins.add(infoContactModel.getLogin()); - } - - rpcWorkspaceService.validateACLToUser(file.getIdentifier(), logins, multiDragContact.getSelectedAclID(), new AsyncCallback() { - - @Override - public void onFailure(Throwable caught) { - new MessageBoxAlert("Error", caught.getMessage(), null); - - } - - @Override - public void onSuccess(ReportAssignmentACL result) { - - String msg = ""; - - if(result.getErrors().size()>0){ - for (String error : result.getErrors()){ - msg+="
  • "+error +";

    • "; - - } - new MessageBoxAlert("Warning!!", msg, null); - return; - } - - if(result.getValidLogins().size()==0){ - msg+= "Setting permission '"+multiDragContact.getSelectedAcl().getLabel() +"' is not valid for "+file.getName(); - MessageBox info = MessageBox.info("Permissions not valid for "+file.getName(), msg, null); - info.show(); - return; - } - - String names = ""; - for (String name : result.getValidLogins()) { - names+="
  • "+name +";
    • "; - } - - msg+= "Setting permission '"+multiDragContact.getSelectedAcl().getLabel() +"' for:
      "+names+"
    confirm?"; - - MessageBoxConfirm confirm = new MessageBoxConfirm("Setting new permissions to "+file.getName() +"?", msg); - confirm.getMessageBoxConfirm().addCallback(new Listener() { - - public void handleEvent(MessageBoxEvent be) { - - //IF NOT CANCELLED - String clickedButton = be.getButtonClicked().getItemId(); - if(clickedButton.equals(Dialog.YES)){ - // doAddAdministratorToFolderId(file, logins); - setACLToFolderId(file.getIdentifier(), logins, multiDragContact.getSelectedAclID()); - multidrag.hide(); - }else if(clickedButton.equals(Dialog.CANCEL)){ - multidrag.hide(); - } - - } - }); - - } - }); - - } - - } - }); - - multidrag.show(); + /* + * @SuppressWarnings("unused") final MultiDragContactsEditPermissions + * multiDragContact = new MultiDragContactsEditPermissions( + * LOAD_CONTACTS_AS.SHARED_USER, file.getIdentifier(), true); + * + * final DialogMultiDragContact multidrag = + * multiDragContact.getDialog(); + * + * multidrag. + * setTxtHelp("Sets the permission for the user(s) dragged in the right list" + * ); + * + * multidrag.getButtonById(Dialog.OK).addListener(Events.Select, new + * Listener() { + * + * @Override public void handleEvent(BaseEvent be) { final + * List targets = multiDragContact .getTargetContacts(); + * + * if (targets.size() == 0) { MessageBoxConfirm info = new + * MessageBoxConfirm("Any User/s?", + * "You have not selected any Users, confirm exit?"); + * + * info.getMessageBoxConfirm().addCallback(new + * Listener() { + * + * public void handleEvent(MessageBoxEvent be) { // IF NOT CANCELLED + * String clickedButton = be.getButtonClicked().getItemId(); if + * (clickedButton.equals(Dialog.YES)) { multidrag.hide(); } } }); } + * + * // GWT.log(targets.toString()); + * + * if (targets.size() >= 1 && multiDragContact.getSelectedAcl() != null) + * { + * + * final List logins = new ArrayList(targets.size()); + * + * for (org.gcube.portlets.widgets.workspacesharingwidget.shared. + * InfoContactModel infoContactModel : targets) { + * GWT.log(infoContactModel.toString()); + * logins.add(infoContactModel.getLogin()); } + * + * WorkspaceSharingServiceAsync.INSTANCE.validateACLToUser(file. + * getIdentifier(), logins, multiDragContact.getSelectedAclID(), new + * AsyncCallback() { + * + * @Override public void onFailure(Throwable caught) { new + * MessageBoxAlert("Error", caught.getMessage(), null); + * + * } + * + * @Override public void onSuccess(ReportAssignmentACL result) { + * + * String msg = ""; + * + * if (result.getErrors().size() > 0) { for (String error : + * result.getErrors()) { msg += "
  • " + error + ";

    • "; + * + * } new MessageBoxAlert("Warning!!", msg, null); return; } + * + * if (result.getValidLogins().size() == 0) { msg += + * "Setting permission '" + multiDragContact.getSelectedAcl().getLabel() + * + "' is not valid for " + file.getName(); MessageBox info = + * MessageBox.info("Permissions not valid for " + file.getName(), msg, + * null); info.show(); return; } + * + * String names = ""; for (String name : result.getValidLogins()) { + * names += "
  • " + name + ";
    • "; } + * + * msg += "Setting permission '" + + * multiDragContact.getSelectedAcl().getLabel() + "' for:
      " + names + * + "
    confirm?"; + * + * MessageBoxConfirm confirm = new MessageBoxConfirm( + * "Setting new permissions to " + file.getName() + "?", msg); + * confirm.getMessageBoxConfirm().addCallback(new + * Listener() { + * + * public void handleEvent(MessageBoxEvent be) { + * + * // IF NOT CANCELLED String clickedButton = + * be.getButtonClicked().getItemId(); if + * (clickedButton.equals(Dialog.YES)) { // + * doAddAdministratorToFolderId(file, // logins); + * setACLToFolderId(file.getIdentifier(), logins, + * multiDragContact.getSelectedAclID()); multidrag.hide(); } else if + * (clickedButton.equals(Dialog.CANCEL)) { multidrag.hide(); } + * + * } }); + * + * } }); + * + * } + * + * } }); + * + * multidrag.show(); + */ } /** * Show add administrators dialog. * - * @param file the file + * @param file + * the file */ private void showAddAdministratorsDialog(final FileModel file) { - MultiDragConstants.HEADING_DIALOG = "Edit Administrator/s to: "+file.getName(); + MultiDragConstants.HEADING_DIALOG = "Edit Administrator/s to: " + file.getName(); MultiDragConstants.ALL_CONTACTS_LEFT_LIST = "All Contacts"; MultiDragConstants.SHARE_WITH_RIGHT_LIST = "New Administrator/s"; - final SimpleMultiDragWorkspaceContact multiDragContact = new SimpleMultiDragWorkspaceContact(LOAD_CONTACTS_AS.ADMINISTRATOR, file.getIdentifier(), true, false, true); + final SimpleMultiDragWorkspaceContact multiDragContact = new SimpleMultiDragWorkspaceContact( + LOAD_CONTACTS_AS.ADMINISTRATOR, file.getIdentifier(), true, false, true); final Dialog multidrag = multiDragContact.getDialogMultiDragContact(); multidrag.getButtonById(Dialog.OK).addListener(Events.Select, new Listener() { @Override public void handleEvent(BaseEvent be) { - final List targets = multiDragContact.getTargetContactsWithMyLogin(); + final List targets = multiDragContact + .getTargetContactsWithMyLogin(); - if(targets.size()==1){ - MessageBoxConfirm info = new MessageBoxConfirm("Any Administrator/s?", "You have not selected any Administrator, confirm only you as Administrator and exit?"); + if (targets.size() == 1) { + MessageBoxConfirm info = new MessageBoxConfirm("Any Administrator/s?", + "You have not selected any Administrator, confirm only you as Administrator and exit?"); info.getMessageBoxConfirm().addCallback(new Listener() { public void handleEvent(MessageBoxEvent be) { - //IF NOT CANCELLED + // IF NOT CANCELLED String clickedButton = be.getButtonClicked().getItemId(); - if(clickedButton.equals(Dialog.YES)){ + if (clickedButton.equals(Dialog.YES)) { List logins = new ArrayList(1); logins.add(targets.get(0).getLogin()); doAddAdministratorToFolderId(file, logins); @@ -2537,31 +2747,32 @@ public class AppControllerExplorer implements EventHandler, TreeAppControllerInt }); } - if(targets.size()>1){ + if (targets.size() > 1) { final List logins = new ArrayList(targets.size()); String names = "
      "; for (org.gcube.portlets.widgets.workspacesharingwidget.shared.InfoContactModel infoContactModel : targets) { logins.add(infoContactModel.getLogin()); - names+="
    • "+infoContactModel.getName() +";
      • "; + names += "
    • " + infoContactModel.getName() + ";
      • "; } String tail = "
    as new "; - tail += logins.size()>1?"administrators":"administrator"; - tail+= ", confirm?"; - MessageBoxConfirm confirm = new MessageBoxConfirm("Setting new Administrator/s?", "You have selected:
    "+names +tail); + tail += logins.size() > 1 ? "administrators" : "administrator"; + tail += ", confirm?"; + MessageBoxConfirm confirm = new MessageBoxConfirm("Setting new Administrator/s?", + "You have selected:
    " + names + tail); confirm.getMessageBoxConfirm().addCallback(new Listener() { public void handleEvent(MessageBoxEvent be) { - //IF NOT CANCELLED + // IF NOT CANCELLED String clickedButton = be.getButtonClicked().getItemId(); - if(clickedButton.equals(Dialog.YES)){ + if (clickedButton.equals(Dialog.YES)) { doAddAdministratorToFolderId(file, logins); multidrag.hide(); } - if(clickedButton.equals(Dialog.CANCEL)){ + if (clickedButton.equals(Dialog.CANCEL)) { multidrag.hide(); } @@ -2576,61 +2787,69 @@ public class AppControllerExplorer implements EventHandler, TreeAppControllerInt multidrag.show(); } - /** * Do add administrator to folder id. * - * @param file the file - * @param logins the logins + * @param file + * the file + * @param logins + * the logins */ private void doAddAdministratorToFolderId(final FileModel file, final List logins) { - rpcWorkspaceService.addAdministratorsByFolderId(file.getIdentifier(), logins, new AsyncCallback() { + WorkspaceSharingServiceAsync.INSTANCE.addAdministratorsByFolderId(file.getIdentifier(), logins, + new AsyncCallback() { - @Override - public void onFailure(Throwable arg0) { - new MessageBoxAlert("Error", arg0.getMessage(), null); - } + @Override + public void onFailure(Throwable arg0) { + new MessageBoxAlert("Error", arg0.getMessage(), null); + } - @Override - public void onSuccess(Boolean arg0) { - String msg = "Updating administrator/s completed successfully"; - MessageBox.info("Operation completed", msg, null); + @Override + public void onSuccess(Boolean arg0) { + String msg = "Updating administrator/s completed successfully"; + MessageBox.info("Operation completed", msg, null); - } - }); + } + }); } /** * Sets the acl to folder id. * - * @param folderId the folder id - * @param logins the logins - * @param aclTypeID the acl type id + * @param folderId + * the folder id + * @param logins + * the logins + * @param aclTypeID + * the acl type id */ private void setACLToFolderId(final String folderId, final List logins, String aclTypeID) { - rpcWorkspaceService.setACLs(folderId, logins, aclTypeID, new AsyncCallback() { + MessageBox.info("Attention", "set acls is not directly possible with StorageHub. Please use share or unshare.", + null); - @Override - public void onFailure(Throwable caught) { - new MessageBoxAlert("Error", caught.getMessage(), null); - - } - - @Override - public void onSuccess(Void result) { - String msg = "Updating permissions completed successfully"; - MessageBox.info("Operation completed", msg, null); - } - }); + // rpcWorkspaceService.setACLs(folderId, logins, aclTypeID, new + // AsyncCallback() { + // + // @Override + // public void onFailure(Throwable caught) { + // new MessageBoxAlert("Error", caught.getMessage(), null); + // + // } + // + // @Override + // public void onSuccess(Void result) { + // String msg = "Updating permissions completed successfully"; + // MessageBox.info("Operation completed", msg, null); + // } + // }); } - /** * Load my login. */ - private void loadMyLogin(){ + private void loadMyLogin() { String currentUrl = Window.Location.getHref().split("\\?")[0]; rpcWorkspaceService.getMyLogin(currentUrl, new AsyncCallback() { @@ -2644,19 +2863,18 @@ public class AppControllerExplorer implements EventHandler, TreeAppControllerInt @Override public void onSuccess(UserBean user) { - ConstantsExplorer.log("UserBean is: "+user.toString()); - GWT.log("My login is: "+user.getUsername()); + ConstantsExplorer.log("UserBean is: " + user.toString()); + GWT.log("My login is: " + user.getUsername()); myLogin = user.getUsername(); myLoginFirstName = user.getFirstName(); } }); } - /** * Load my first name. */ - private void loadMyFirstName(){ + private void loadMyFirstName() { rpcWorkspaceService.getMyFirstName(new AsyncCallback() { @@ -2668,101 +2886,121 @@ public class AppControllerExplorer implements EventHandler, TreeAppControllerInt @Override public void onSuccess(String firstName) { - ConstantsExplorer.log("getMyFirstName is: "+firstName); + ConstantsExplorer.log("getMyFirstName is: " + firstName); myLoginFirstName = firstName; } }); } - /** * Load item from workspace. * - * @param itemIdentifier the item identifier + * @param itemIdentifier + * the item identifier */ - private void loadItemFromWorkspace(final String itemIdentifier){ + private void loadItemFromWorkspace(final String itemIdentifier) { + explorerPanel.getAsycTreePanel().mask(ConstantsExplorer.LOADING, ConstantsExplorer.LOADINGSTYLE); - explorerPanel.getAsycTreePanel().mask(ConstantsExplorer.LOADING,ConstantsExplorer.LOADINGSTYLE); + rpcWorkspaceService.getChildrenSubTreeToRootByIdentifier(itemIdentifier, + new AsyncCallback>() { - rpcWorkspaceService.getChildrenSubTreeToRootByIdentifier(itemIdentifier, new AsyncCallback>() { - - @Override - public void onFailure(Throwable caught) { - explorerPanel.getAsycTreePanel().unmask(); - new MessageBoxAlert("Error", "Sorry - getChildrenSubTreeToRootByIdentifier", null); - explorerPanel.getAsycTreePanel().removeAllAndRecoveryRoot(); - } - - @Override - public void onSuccess(ArrayList result) { - - boolean foundAncestor = false; - // int index = 0; - int i = 0; - try{ - while (!foundAncestor) { - - if(i pathParentsList = (ArrayList) getListParentsByIdentifierFromTree(itemIdentifier); - - selectItemInTree(itemIdentifier); - explorerPanel.getAsycTreePanel().setSubTreeLoaded(false); + @Override + public void onFailure(Throwable caught) { explorerPanel.getAsycTreePanel().unmask(); - eventBus.fireEvent(new SubTreeLoadedEvent(pathParentsList)); - + new MessageBoxAlert("Error", "Sorry - getChildrenSubTreeToRootByIdentifier", null); + explorerPanel.getAsycTreePanel().removeAllAndRecoveryRoot(); } - }catch (Exception e) { - new MessageBoxAlert("Error", "Sorry, e "+e.getMessage(), null); - } - } + @Override + public void onSuccess(ArrayList result) { - }); + boolean foundAncestor = false; + // int index = 0; + int i = 0; + try { + while (!foundAncestor) { + + if (i < result.size()) { + SubTree subTree = result.get(i); // get + // SubTree + String folderModelId = subTree.getParentId(); // get + // folder + // id + FolderModel folderInTree = (FolderModel) explorerPanel.getAsycTreePanel() + .getFileModelByIdentifier(folderModelId); + + if (folderInTree != null && explorerPanel.getAsycTreePanel() + .getChildrenNumber(folderInTree.getIdentifier()) == 0) + foundAncestor = true; + i++; + } else + break; + } + + explorerPanel.getAsycTreePanel().setSubTreeLoaded(true); + + if (foundAncestor) { + + for (int j = i - 1; j < result.size(); j++) { + + SubTree subTree = result.get(j); // get + // SubTree + String folderModelId = subTree.getParentId(); // get + // folder + // id + FolderModel folderInTree = (FolderModel) explorerPanel.getAsycTreePanel() + .getFileModelByIdentifier(folderModelId); // get + // folder + // in + // tree + + if (folderInTree.getParentFileModel() != null) + subTree.getParent().setParentFileModel(folderInTree.getParentFileModel()); // set + // parent + + explorerPanel.getAsycTreePanel().addChildrenToFolder( + subTree.getParent().getIdentifier(), subTree.getChildren()); // Add + // level + explorerPanel.getAsycTreePanel() + .setExpandTreeLevel(subTree.getParent().getIdentifier(), true); // Expand + // level + } + + ArrayList pathParentsList = (ArrayList) getListParentsByIdentifierFromTree( + itemIdentifier); + + selectItemInTree(itemIdentifier); + explorerPanel.getAsycTreePanel().setSubTreeLoaded(false); + explorerPanel.getAsycTreePanel().unmask(); + eventBus.fireEvent(new SubTreeLoadedEvent(pathParentsList)); + + } + + } catch (Exception e) { + new MessageBoxAlert("Error", "Sorry, e " + e.getMessage(), null); + } + } + + }); } - /** * Deselect current selection. */ - private void deselectCurrentSelection(){ + private void deselectCurrentSelection() { FileModel fileModelSelected = explorerPanel.getAsycTreePanel().getSelectedFileModelItem(); - if(fileModelSelected!=null) + if (fileModelSelected != null) explorerPanel.getAsycTreePanel().deselectItem(fileModelSelected); } - //********METHODS TO NOTIFY TREE - /* (non-Javadoc) - * @see org.gcube.portlets.user.workspace.client.interfaces.TreeAppControllerInterface#getListParentsByIdentifierFromTree(java.lang.String) + // ********METHODS TO NOTIFY TREE + /* + * (non-Javadoc) + * + * @see org.gcube.portlets.user.workspace.client.interfaces. + * TreeAppControllerInterface#getListParentsByIdentifierFromTree(java.lang. + * String) */ @Override public List getListParentsByIdentifierFromTree(String itemIdentifier) { @@ -2771,24 +3009,30 @@ public class AppControllerExplorer implements EventHandler, TreeAppControllerInt FileModel item = this.explorerPanel.getAsycTreePanel().getFileModelByIdentifier(itemIdentifier); - if(item==null){ + if (item == null) { return null; - } - else{ - return getListParents(listParentModel,item); + } else { + return getListParents(listParentModel, item); } } - /* (non-Javadoc) - * @see org.gcube.portlets.user.workspace.client.interfaces.TreeAppControllerInterface#renameItem(java.lang.String, java.lang.String, java.lang.String) + /* + * (non-Javadoc) + * + * @see org.gcube.portlets.user.workspace.client.interfaces. + * TreeAppControllerInterface#renameItem(java.lang.String, java.lang.String, + * java.lang.String) */ @Override public boolean renameItem(String itemIdentifier, String newName, String extension) { return this.explorerPanel.getAsycTreePanel().renameItem(itemIdentifier, newName, extension); } - /* (non-Javadoc) - * @see org.gcube.portlets.user.workspace.client.interfaces.TreeAppControllerInterface#deleteItem(java.lang.String) + /* + * (non-Javadoc) + * + * @see org.gcube.portlets.user.workspace.client.interfaces. + * TreeAppControllerInterface#deleteItem(java.lang.String) */ @Override public boolean deleteItem(String itemIdentifier) { @@ -2798,22 +3042,28 @@ public class AppControllerExplorer implements EventHandler, TreeAppControllerInt /** * method not used. * - * @param itemIdentifier the item identifier - * @param name the name - * @param parentIdentifier the parent identifier + * @param itemIdentifier + * the item identifier + * @param name + * the name + * @param parentIdentifier + * the parent identifier * @return true, if successful */ @Override public boolean addFolder(String itemIdentifier, String name, String parentIdentifier) { - return false; //not used + return false; // not used } /** * method not used. * - * @param itemIdentifier the item identifier - * @param name the name - * @param parentIdentifier the parent identifier + * @param itemIdentifier + * the item identifier + * @param name + * the name + * @param parentIdentifier + * the parent identifier * @return true, if successful */ @Override @@ -2824,7 +3074,8 @@ public class AppControllerExplorer implements EventHandler, TreeAppControllerInt /** * method not used. * - * @param itemIdentifier the item identifier + * @param itemIdentifier + * the item identifier * @return true, if successful */ @Override @@ -2835,50 +3086,58 @@ public class AppControllerExplorer implements EventHandler, TreeAppControllerInt /** * method not used. * - * @param type the new visualization type + * @param type + * the new visualization type */ @Override public void setVisualizationType(VisualizationType type) { } - /* (non-Javadoc) - * @see org.gcube.portlets.user.workspace.client.interfaces.TreeAppControllerInterface#selectRootItem() + /* + * (non-Javadoc) + * + * @see org.gcube.portlets.user.workspace.client.interfaces. + * TreeAppControllerInterface#selectRootItem() */ @Override - public void selectRootItem(){ + public void selectRootItem() { this.explorerPanel.getAsycTreePanel().selectRootItem(); } /** * Gets the selected folder in tree. * - * @return FileModel parent selected or root item if no directory is selected + * @return FileModel parent selected or root item if no directory is + * selected */ @Override - public FileModel getSelectedFolderInTree(){ + public FileModel getSelectedFolderInTree() { FileModel fileModel = this.explorerPanel.getAsycTreePanel().getSelectedFileModelItem(); - if(fileModel.isDirectory()) + if (fileModel.isDirectory()) return fileModel; else return fileModel.getParentFileModel(); } - /* (non-Javadoc) - * @see org.gcube.portlets.user.workspace.client.interfaces.TreeAppControllerInterface#findItemAndSelectItemInTree(java.lang.String) + /* + * (non-Javadoc) + * + * @see org.gcube.portlets.user.workspace.client.interfaces. + * TreeAppControllerInterface#findItemAndSelectItemInTree(java.lang.String) */ @Override public void findItemAndSelectItemInTree(String itemIdentifier) { FileModel fileModel = this.explorerPanel.getAsycTreePanel().getFileModelByIdentifier(itemIdentifier); - if(fileModel==null) { //Loading item by RPC + if (fileModel == null) { // Loading item by RPC loadItemFromWorkspace(itemIdentifier); } - else{ + else { selectItemInTree(itemIdentifier); } @@ -2887,25 +3146,30 @@ public class AppControllerExplorer implements EventHandler, TreeAppControllerInt /** * Select item in tree. * - * @param itemIdentifier the item identifier + * @param itemIdentifier + * the item identifier */ - private void selectItemInTree(String itemIdentifier){ + private void selectItemInTree(String itemIdentifier) { FileModel fileModel = this.explorerPanel.getAsycTreePanel().getFileModelByIdentifier(itemIdentifier); - if(fileModel!=null){ + if (fileModel != null) { - if(explorerPanel.getAsycTreePanel().isSearch()) + if (explorerPanel.getAsycTreePanel().isSearch()) deselectCurrentSelection(); - if(fileModel.isDirectory()){ - if(fileModel.getParentFileModel()!=null) - this.explorerPanel.getAsycTreePanel().setExpandTreeLevel(fileModel.getParentFileModel().getIdentifier(), true); //expand parent folder + if (fileModel.isDirectory()) { + if (fileModel.getParentFileModel() != null) + this.explorerPanel.getAsycTreePanel() + .setExpandTreeLevel(fileModel.getParentFileModel().getIdentifier(), true); // expand + // parent + // folder this.explorerPanel.getAsycTreePanel().selectItem(itemIdentifier); - }else - this.explorerPanel.getAsycTreePanel().selectItem(itemIdentifier); //select item + } else + this.explorerPanel.getAsycTreePanel().selectItem(itemIdentifier); // select + // item } } @@ -2920,93 +3184,102 @@ public class AppControllerExplorer implements EventHandler, TreeAppControllerInt @Override public void onSuccess(WindowOpenParameter windowOpenParam) { - String params = "?"+windowOpenParam.getParameters(); + String params = "?" + windowOpenParam.getParameters(); - if(params.length()>1) - params+="&"; + if (params.length() > 1) + params += "&"; - params+=ConstantsExplorer.REDIRECTONERROR+"="+windowOpenParam.isRedirectOnError(); + params += ConstantsExplorer.REDIRECTONERROR + "=" + windowOpenParam.isRedirectOnError(); - windowOpenParam.getBrowserWindow().setUrl(ConstantsExplorer.DOWNLOAD_WORKSPACE_SERVICE+params); + windowOpenParam.getBrowserWindow().setUrl(ConstantsExplorer.DOWNLOAD_WORKSPACE_SERVICE + params); } }; - /* (non-Javadoc) - * @see org.gcube.portlets.user.workspace.client.interfaces.TreeAppControllerInterface#expandFolder(java.lang.String) + /* + * (non-Javadoc) + * + * @see org.gcube.portlets.user.workspace.client.interfaces. + * TreeAppControllerInterface#expandFolder(java.lang.String) */ @Override /** * Called when path item is clicked */ - public void expandFolder(final String itemIdentifier){ + public void expandFolder(final String itemIdentifier) { searching(false); FileModel fileModel = this.explorerPanel.getAsycTreePanel().getFileModelByIdentifier(itemIdentifier); - if(fileModel==null) { //Loading by RPC + if (fileModel == null) { // Loading by RPC loadItemFromWorkspace(itemIdentifier); - } - else{ + } else { deselectCurrentSelection(); - this.explorerPanel.getAsycTreePanel().selectItem(itemIdentifier); //select item + this.explorerPanel.getAsycTreePanel().selectItem(itemIdentifier); // select + // item } } - /* (non-Javadoc) - * @see org.gcube.portlets.user.workspace.client.interfaces.TreeAppControllerInterface#searching(boolean) + /* + * (non-Javadoc) + * + * @see org.gcube.portlets.user.workspace.client.interfaces. + * TreeAppControllerInterface#searching(boolean) */ @Override - public void searching(boolean isSearch){ - // deselecteCurrentSelection(); + public void searching(boolean isSearch) { + // deselecteCurrentSelection(); explorerPanel.getAsycTreePanel().setSearch(isSearch); } - /** * Do click url. * - * @param openUrlEvent the open url event + * @param openUrlEvent + * the open url event */ public void doClickUrl(OpenUrlEvent openUrlEvent) { final FileModel fileModel = openUrlEvent.getSourceFileModel(); - if(fileModel==null) + if (fileModel == null) return; GWT.log("do click url"); final NewBrowserWindow newBrowserWindow = NewBrowserWindow.open("", "_blank", ""); - rpcWorkspaceService.getUrlById(fileModel.getIdentifier(), fileModel.getGXTFolderItemType().equals(GXTFolderItemTypeEnum.URL_DOCUMENT), false, new AsyncCallback() { + rpcWorkspaceService.getUrlById(fileModel.getIdentifier(), + fileModel.getGXTFolderItemType().equals(GXTFolderItemTypeEnum.URL_DOCUMENT), false, + new AsyncCallback() { - @Override - public void onFailure(Throwable caught) { - explorerPanel.getAsycTreePanel().unmask(); - new MessageBoxAlert("Error", ConstantsExplorer.SERVER_ERROR + " clicking url.", null); - explorerPanel.getAsycTreePanel().removeAllAndRecoveryRoot(); + @Override + public void onFailure(Throwable caught) { + explorerPanel.getAsycTreePanel().unmask(); + new MessageBoxAlert("Error", ConstantsExplorer.SERVER_ERROR + " clicking url.", null); + explorerPanel.getAsycTreePanel().removeAllAndRecoveryRoot(); - } + } - @Override - public void onSuccess(GWTWorkspaceItem result) { + @Override + public void onSuccess(GWTWorkspaceItem result) { + if (fileModel.getGXTFolderItemType().equals(GXTFolderItemTypeEnum.URL_DOCUMENT)) { + newBrowserWindow.setUrl(((GWTUrlDocument) result).getUrl()); + // new WindowOpenUrl(((GWTUrlDocument) + // result).getUrl(), "_blank", ""); + GWT.log("URL_DOCUMENT Open " + ((GWTUrlDocument) result).getUrl()); + } else { + // new WindowOpenUrl(((GWTExternalUrl) + // result).getUrl(), "_blank", ""); + newBrowserWindow.setUrl(((GWTExternalUrl) result).getUrl()); + GWT.log("ExternalUrl Open " + ((GWTExternalUrl) result).getUrl()); + } - if(fileModel.getGXTFolderItemType().equals(GXTFolderItemTypeEnum.URL_DOCUMENT)){ - newBrowserWindow.setUrl(((GWTUrlDocument) result).getUrl()); - // new WindowOpenUrl(((GWTUrlDocument) result).getUrl(), "_blank", ""); - GWT.log("URL_DOCUMENT Open " + ((GWTUrlDocument) result).getUrl()); - } - else{ - // new WindowOpenUrl(((GWTExternalUrl) result).getUrl(), "_blank", ""); - newBrowserWindow.setUrl(((GWTExternalUrl) result).getUrl()); - GWT.log("ExternalUrl Open " + ((GWTExternalUrl) result).getUrl()); - } + } - } + }); - }); - - // com.google.gwt.user.client.Window.open(ConstantsExplorer.DOWNLOAD_WORKSPACE_SERVICE+"?id="+fileModel.getIdentifier()+"&viewContent=true", fileModel.getName(), ""); + // com.google.gwt.user.client.Window.open(ConstantsExplorer.DOWNLOAD_WORKSPACE_SERVICE+"?id="+fileModel.getIdentifier()+"&viewContent=true", + // fileModel.getName(), ""); } } diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/view/ExplorerPanel.java b/src/main/java/org/gcube/portlets/user/workspace/client/view/ExplorerPanel.java index 36b9ba8..3bdd85a 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/client/view/ExplorerPanel.java +++ b/src/main/java/org/gcube/portlets/user/workspace/client/view/ExplorerPanel.java @@ -20,7 +20,7 @@ import com.extjs.gxt.ui.client.widget.form.RadioGroup; import com.extjs.gxt.ui.client.widget.toolbar.ToolBar; /** - * @author Francesco Mangiacrapa francesco.mangiacrapa@isti.cnr.it + * @author Francesco Mangiacrapa francesco.mangiacrapaATisti.cnr.it * */ public class ExplorerPanel extends LayoutContainer { diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/view/sharing/ContactFetcher.java b/src/main/java/org/gcube/portlets/user/workspace/client/view/sharing/ContactFetcher.java index fb2be72..124ef31 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/client/view/sharing/ContactFetcher.java +++ b/src/main/java/org/gcube/portlets/user/workspace/client/view/sharing/ContactFetcher.java @@ -2,7 +2,7 @@ package org.gcube.portlets.user.workspace.client.view.sharing; import java.util.List; -import org.gcube.portlets.user.workspace.client.model.InfoContactModel; +import org.gcube.portlets.widgets.workspacesharingwidget.shared.InfoContactModel; import com.google.gwt.user.client.rpc.AsyncCallback; diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/view/sharing/DialogShareFolder.java b/src/main/java/org/gcube/portlets/user/workspace/client/view/sharing/DialogShareFolder.java index 268b7fb..e161837 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/client/view/sharing/DialogShareFolder.java +++ b/src/main/java/org/gcube/portlets/user/workspace/client/view/sharing/DialogShareFolder.java @@ -5,13 +5,14 @@ import java.util.List; import org.gcube.portlets.user.workspace.client.AppControllerExplorer; import org.gcube.portlets.user.workspace.client.ConstantsExplorer; import org.gcube.portlets.user.workspace.client.model.FileModel; -import org.gcube.portlets.user.workspace.client.model.InfoContactModel; import org.gcube.portlets.user.workspace.client.resources.Resources; import org.gcube.portlets.user.workspace.client.view.sharing.multisuggest.MultiDragContact; import org.gcube.portlets.user.workspace.client.view.sharing.multisuggest.MultiValuePanel; import org.gcube.portlets.user.workspace.client.view.windows.MessageBoxAlert; import org.gcube.portlets.user.workspace.shared.ListContact; -import org.gcube.portlets.user.workspace.shared.WorkspaceACL; +import org.gcube.portlets.widgets.workspacesharingwidget.client.rpc.WorkspaceSharingServiceAsync; +import org.gcube.portlets.widgets.workspacesharingwidget.shared.InfoContactModel; +import org.gcube.portlets.widgets.workspacesharingwidget.shared.WorkspaceACL; import com.extjs.gxt.ui.client.Style.HorizontalAlignment; import com.extjs.gxt.ui.client.Style.Scroll; @@ -39,7 +40,7 @@ import com.google.gwt.user.client.ui.Label; /** * The Class DialogShareFolder. * - * @author Francesco Mangiacrapa francesco.mangiacrapa@isti.cnr.it + * @author Francesco Mangiacrapa francesco.mangiacrapaATisti.cnr.it * Jul 10, 2017 */ public class DialogShareFolder extends Dialog { @@ -122,7 +123,7 @@ public class DialogShareFolder extends Dialog { Label labelProperty = new Label("Permissions"); hpPermission.add(labelProperty); - AppControllerExplorer.rpcWorkspaceService.getACLs(new AsyncCallback>() { + WorkspaceSharingServiceAsync.INSTANCE.getACLs(new AsyncCallback>() { @Override public void onSuccess(List result) { @@ -373,7 +374,7 @@ public class DialogShareFolder extends Dialog { Label labelProperty = new Label("Permissions"); hpPermission.add(labelProperty); - AppControllerExplorer.rpcWorkspaceService.getACLs(new AsyncCallback>() { + WorkspaceSharingServiceAsync.INSTANCE.getACLs(new AsyncCallback>() { @Override public void onSuccess(List result) { @@ -599,7 +600,7 @@ public class DialogShareFolder extends Dialog { */ private void selectAclForFolder(FileModel folder){ GWT.log("Loading ACL to: "+folder); - AppControllerExplorer.rpcWorkspaceService.getACLBySharedFolderId(folder.getIdentifier(), new AsyncCallback() { + WorkspaceSharingServiceAsync.INSTANCE.getACLsForSharedFolderId(folder.getIdentifier(), new AsyncCallback() { @Override public void onFailure(Throwable arg0) { @@ -627,7 +628,7 @@ public class DialogShareFolder extends Dialog { */ public void getUsersManagers(final String sharedFolderId,final AsyncCallback> callback) { - AppControllerExplorer.rpcWorkspaceService.getUsersManagerToSharedFolder(sharedFolderId, new AsyncCallback>() { + WorkspaceSharingServiceAsync.INSTANCE.getAdministratorsByFolderId(sharedFolderId, new AsyncCallback>() { @Override public void onFailure(Throwable arg0) { diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/view/sharing/PanelPermission.java b/src/main/java/org/gcube/portlets/user/workspace/client/view/sharing/PanelPermission.java index 88b9750..e87c9cb 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/client/view/sharing/PanelPermission.java +++ b/src/main/java/org/gcube/portlets/user/workspace/client/view/sharing/PanelPermission.java @@ -2,8 +2,8 @@ package org.gcube.portlets.user.workspace.client.view.sharing; import java.util.List; -import org.gcube.portlets.user.workspace.shared.WorkspaceACL; -import org.gcube.portlets.user.workspace.shared.WorkspaceACL.USER_TYPE; +import org.gcube.portlets.widgets.workspacesharingwidget.shared.WorkspaceACL; +import org.gcube.portlets.widgets.workspacesharingwidget.shared.WorkspaceACL.USER_TYPE; import com.extjs.gxt.ui.client.widget.LayoutContainer; import com.extjs.gxt.ui.client.widget.form.Radio; diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/view/sharing/PanelTogglePermission.java b/src/main/java/org/gcube/portlets/user/workspace/client/view/sharing/PanelTogglePermission.java index f993fa5..5c811a9 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/client/view/sharing/PanelTogglePermission.java +++ b/src/main/java/org/gcube/portlets/user/workspace/client/view/sharing/PanelTogglePermission.java @@ -4,8 +4,9 @@ import java.util.ArrayList; import java.util.List; import org.gcube.portlets.user.workspace.client.util.GetPermissionIconByACL; -import org.gcube.portlets.user.workspace.shared.WorkspaceACL; -import org.gcube.portlets.user.workspace.shared.WorkspaceACL.USER_TYPE; + +import org.gcube.portlets.widgets.workspacesharingwidget.shared.WorkspaceACL; +import org.gcube.portlets.widgets.workspacesharingwidget.shared.WorkspaceACL.USER_TYPE; import com.extjs.gxt.ui.client.Style.ButtonScale; import com.extjs.gxt.ui.client.Style.IconAlign; diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/view/sharing/UserStore.java b/src/main/java/org/gcube/portlets/user/workspace/client/view/sharing/UserStore.java index eec1ec6..a6d113b 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/client/view/sharing/UserStore.java +++ b/src/main/java/org/gcube/portlets/user/workspace/client/view/sharing/UserStore.java @@ -3,10 +3,10 @@ package org.gcube.portlets.user.workspace.client.view.sharing; import java.util.ArrayList; import java.util.List; -import org.gcube.portlets.user.workspace.client.AppControllerExplorer; import org.gcube.portlets.user.workspace.client.ConstantsExplorer; -import org.gcube.portlets.user.workspace.client.model.InfoContactModel; import org.gcube.portlets.user.workspace.client.view.windows.MessageBoxAlert; +import org.gcube.portlets.widgets.workspacesharingwidget.client.rpc.WorkspaceSharingServiceAsync; +import org.gcube.portlets.widgets.workspacesharingwidget.shared.InfoContactModel; import com.google.gwt.core.client.GWT; import com.google.gwt.user.client.rpc.AsyncCallback; @@ -14,7 +14,7 @@ import com.google.gwt.user.client.rpc.AsyncCallback; /** * The Class UserStore. * - * @author Francesco Mangiacrapa francesco.mangiacrapa@isti.cnr.it + * @author Francesco Mangiacrapa francesco.mangiacrapaATisti.cnr.it */ public class UserStore implements ContactFetcher{ @@ -58,7 +58,7 @@ public class UserStore implements ContactFetcher{ listAllContact = new ArrayList(); - AppControllerExplorer.rpcWorkspaceService.getAllContacts(new AsyncCallback>() { + WorkspaceSharingServiceAsync.INSTANCE.getAllContacts(new AsyncCallback>() { @Override public void onSuccess(List result) { @@ -88,7 +88,7 @@ public class UserStore implements ContactFetcher{ // comboSharedUsers.mask("Loading users"); - AppControllerExplorer.rpcWorkspaceService.getListUserSharedByFolderSharedId(sharedFolderId, new AsyncCallback>() { + WorkspaceSharingServiceAsync.INSTANCE.getListUserSharedByFolderSharedId(sharedFolderId, new AsyncCallback>() { @Override public void onFailure(Throwable caught) { @@ -128,7 +128,7 @@ public class UserStore implements ContactFetcher{ @Override public void getOwner(final String sharedFolderId,final AsyncCallback callback) { - AppControllerExplorer.rpcWorkspaceService.getOwnerByItemId(sharedFolderId, new AsyncCallback() { + WorkspaceSharingServiceAsync.INSTANCE.getOwnerByItemId(sharedFolderId, new AsyncCallback() { @Override public void onFailure(Throwable caught) { diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/view/sharing/multisuggest/MultiDragContact.java b/src/main/java/org/gcube/portlets/user/workspace/client/view/sharing/multisuggest/MultiDragContact.java index 8d04d29..636b42c 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/client/view/sharing/multisuggest/MultiDragContact.java +++ b/src/main/java/org/gcube/portlets/user/workspace/client/view/sharing/multisuggest/MultiDragContact.java @@ -5,9 +5,9 @@ import java.util.List; import org.gcube.portlets.user.workspace.client.ConstantsExplorer; import org.gcube.portlets.user.workspace.client.model.ExtendedInfoContactModel; -import org.gcube.portlets.user.workspace.client.model.InfoContactModel; import org.gcube.portlets.user.workspace.client.resources.Resources; import org.gcube.portlets.user.workspace.client.view.windows.MessageBoxConfirm; +import org.gcube.portlets.widgets.workspacesharingwidget.shared.InfoContactModel; import com.extjs.gxt.ui.client.Style.HorizontalAlignment; import com.extjs.gxt.ui.client.Style.Orientation; @@ -51,7 +51,7 @@ import com.extjs.gxt.ui.client.widget.toolbar.ToolBar; /** * The Class MultiDragContact. * - * @author Francesco Mangiacrapa francesco.mangiacrapa@isti.cnr.it + * @author Francesco Mangiacrapa francesco.mangiacrapaATisti.cnr.it * Jun 1, 2016 */ public class MultiDragContact extends Dialog { diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/view/sharing/multisuggest/MultiValuePanel.java b/src/main/java/org/gcube/portlets/user/workspace/client/view/sharing/multisuggest/MultiValuePanel.java index a5cacc1..e3c0b33 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/client/view/sharing/multisuggest/MultiValuePanel.java +++ b/src/main/java/org/gcube/portlets/user/workspace/client/view/sharing/multisuggest/MultiValuePanel.java @@ -4,9 +4,10 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; -import org.gcube.portlets.user.workspace.client.model.InfoContactModel; + import org.gcube.portlets.user.workspace.client.util.MaskPanel; import org.gcube.portlets.user.workspace.client.view.sharing.ContactFetcher; +import org.gcube.portlets.widgets.workspacesharingwidget.shared.InfoContactModel; import com.google.gwt.core.client.GWT; import com.google.gwt.event.dom.client.ClickEvent; diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/view/sharing/permissions/DialogPermission.java b/src/main/java/org/gcube/portlets/user/workspace/client/view/sharing/permissions/DialogPermission.java index 014490e..f69ca8b 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/client/view/sharing/permissions/DialogPermission.java +++ b/src/main/java/org/gcube/portlets/user/workspace/client/view/sharing/permissions/DialogPermission.java @@ -5,12 +5,13 @@ import java.util.List; import org.gcube.portlets.user.workspace.client.AppControllerExplorer; import org.gcube.portlets.user.workspace.client.event.UpdatedVREPermissionEvent; import org.gcube.portlets.user.workspace.client.model.FileModel; -import org.gcube.portlets.user.workspace.client.model.InfoContactModel; import org.gcube.portlets.user.workspace.client.resources.Resources; import org.gcube.portlets.user.workspace.client.view.sharing.PanelTogglePermission; import org.gcube.portlets.user.workspace.client.view.windows.InfoDisplay; import org.gcube.portlets.user.workspace.client.view.windows.MessageBoxAlert; -import org.gcube.portlets.user.workspace.shared.WorkspaceACL; +import org.gcube.portlets.widgets.workspacesharingwidget.shared.WorkspaceACL; +import org.gcube.portlets.widgets.workspacesharingwidget.client.rpc.WorkspaceSharingServiceAsync; +import org.gcube.portlets.widgets.workspacesharingwidget.shared.InfoContactModel; import com.extjs.gxt.ui.client.Style.HorizontalAlignment; import com.extjs.gxt.ui.client.Style.Scroll; @@ -25,7 +26,7 @@ import com.google.gwt.user.client.rpc.AsyncCallback; import com.google.gwt.user.client.ui.Label; /** - * @author Francesco Mangiacrapa francesco.mangiacrapa@isti.cnr.it + * @author Francesco Mangiacrapa francesco.mangiacrapaATisti.cnr.it * */ public class DialogPermission extends Dialog { @@ -92,7 +93,7 @@ public class DialogPermission extends Dialog { getUsersManagers(folder.getIdentifier(), callback); //TODO GET ACL FOR USER - AppControllerExplorer.rpcWorkspaceService.getACLs(new AsyncCallback>() { + WorkspaceSharingServiceAsync.INSTANCE.getACLs(new AsyncCallback>() { @Override public void onSuccess(List result) { @@ -141,7 +142,7 @@ public class DialogPermission extends Dialog { INSTANCE.mask("Changing permissions"); if(folder!=null && getSelectedACL().getId()!=null){ - AppControllerExplorer.rpcWorkspaceService.updateACLForVREbyGroupName(folder.getIdentifier(), getSelectedACL().getId(), new AsyncCallback() { + WorkspaceSharingServiceAsync.INSTANCE.updateACLForVREbyGroupName(folder.getIdentifier(), getSelectedACL().getId(), new AsyncCallback() { @Override public void onFailure(Throwable caught) { @@ -197,7 +198,7 @@ public class DialogPermission extends Dialog { public void getUsersManagers(final String sharedFolderId,final AsyncCallback> callback) { - AppControllerExplorer.rpcWorkspaceService.getUsersManagerToSharedFolder(sharedFolderId, new AsyncCallback>() { + WorkspaceSharingServiceAsync.INSTANCE.getAdministratorsByFolderId(sharedFolderId, new AsyncCallback>() { @Override public void onFailure(Throwable arg0) { diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/view/smartfolder/SmartFolderPanel.java b/src/main/java/org/gcube/portlets/user/workspace/client/view/smartfolder/SmartFolderPanel.java index dd1b590..848a58e 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/client/view/smartfolder/SmartFolderPanel.java +++ b/src/main/java/org/gcube/portlets/user/workspace/client/view/smartfolder/SmartFolderPanel.java @@ -20,7 +20,7 @@ import com.google.gwt.user.client.rpc.AsyncCallback; /** * The Class SmartFolderPanel. * - * @author Francesco Mangiacrapa francesco.mangiacrapa@isti.cnr.it + * @author Francesco Mangiacrapa francesco.mangiacrapaATisti.cnr.it * @author Massimiliano Assante ISTI-CNR * @version 1.0 May 14th 2012 */ diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/view/tree/AsyncTreePanel.java b/src/main/java/org/gcube/portlets/user/workspace/client/view/tree/AsyncTreePanel.java index b81d2f7..0b984ca 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/client/view/tree/AsyncTreePanel.java +++ b/src/main/java/org/gcube/portlets/user/workspace/client/view/tree/AsyncTreePanel.java @@ -56,7 +56,7 @@ import com.google.gwt.user.client.ui.AbstractImagePrototype; /** * The Class AsyncTreePanel. * - * @author Francesco Mangiacrapa francesco.mangiacrapa@isti.cnr.it + * @author Francesco Mangiacrapa francesco.mangiacrapaATisti.cnr.it * Sep 15, 2016 */ public class AsyncTreePanel extends LayoutContainer { @@ -78,7 +78,7 @@ public class AsyncTreePanel extends LayoutContainer { /** * The Enum DragType. * - * @author Francesco Mangiacrapa francesco.mangiacrapa@isti.cnr.it + * @author Francesco Mangiacrapa francesco.mangiacrapaATisti.cnr.it * Aug 29, 2016 */ private enum DragType {INSERT, APPEND}; diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/view/tree/ContextMenuTree.java b/src/main/java/org/gcube/portlets/user/workspace/client/view/tree/ContextMenuTree.java index ecf7a9d..fe7a348 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/client/view/tree/ContextMenuTree.java +++ b/src/main/java/org/gcube/portlets/user/workspace/client/view/tree/ContextMenuTree.java @@ -60,7 +60,7 @@ import com.google.gwt.user.client.ui.AbstractImagePrototype; /** * The Class ContextMenuTree. * - * @author Francesco Mangiacrapa francesco.mangiacrapa@isti.cnr.it + * @author Francesco Mangiacrapa francesco.mangiacrapaATisti.cnr.it */ public class ContextMenuTree { diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/view/windows/BulkProgressBar.java b/src/main/java/org/gcube/portlets/user/workspace/client/view/windows/BulkProgressBar.java index 06230f9..1ad76c7 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/client/view/windows/BulkProgressBar.java +++ b/src/main/java/org/gcube/portlets/user/workspace/client/view/windows/BulkProgressBar.java @@ -5,7 +5,7 @@ import com.extjs.gxt.ui.client.widget.ProgressBar; //import com.google.gwt.user.client.Timer; /** - * @author Francesco Mangiacrapa francesco.mangiacrapa@isti.cnr.it + * @author Francesco Mangiacrapa francesco.mangiacrapaATisti.cnr.it * */ public class BulkProgressBar extends ProgressBar { diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/view/windows/DialogAddFolderAndSmart.java b/src/main/java/org/gcube/portlets/user/workspace/client/view/windows/DialogAddFolderAndSmart.java index 09b89b2..88884fb 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/client/view/windows/DialogAddFolderAndSmart.java +++ b/src/main/java/org/gcube/portlets/user/workspace/client/view/windows/DialogAddFolderAndSmart.java @@ -19,7 +19,7 @@ import com.extjs.gxt.ui.client.widget.layout.FormLayout; /** * The Class DialogAddFolderAndSmart. * - * @author Francesco Mangiacrapa francesco.mangiacrapa@isti.cnr.it Jul 10, 2017 + * @author Francesco Mangiacrapa francesco.mangiacrapaATisti.cnr.it Jul 10, 2017 */ public class DialogAddFolderAndSmart extends Dialog { @@ -34,7 +34,7 @@ public class DialogAddFolderAndSmart extends Dialog { /** * The Enum AddType. * - * @author Francesco Mangiacrapa francesco.mangiacrapa@isti.cnr.it Jul 10, + * @author Francesco Mangiacrapa francesco.mangiacrapaATisti.cnr.it Jul 10, * 2017 */ public enum AddType { diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/view/windows/DialogAddUrl.java b/src/main/java/org/gcube/portlets/user/workspace/client/view/windows/DialogAddUrl.java index 2074c49..fe252fe 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/client/view/windows/DialogAddUrl.java +++ b/src/main/java/org/gcube/portlets/user/workspace/client/view/windows/DialogAddUrl.java @@ -21,7 +21,7 @@ import com.google.gwt.user.client.ui.Label; /** * The Class DialogAddUrl. * - * @author Francesco Mangiacrapa francesco.mangiacrapa@isti.cnr.it + * @author Francesco Mangiacrapa francesco.mangiacrapaATisti.cnr.it * Nov 29, 2016 */ public class DialogAddUrl extends Dialog { diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/view/windows/DialogConfirm.java b/src/main/java/org/gcube/portlets/user/workspace/client/view/windows/DialogConfirm.java index c1e93c1..ff521b6 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/client/view/windows/DialogConfirm.java +++ b/src/main/java/org/gcube/portlets/user/workspace/client/view/windows/DialogConfirm.java @@ -23,7 +23,7 @@ import com.google.gwt.user.client.ui.Widget; /** * The Class DialogConfirm. * - * @author Francesco Mangiacrapa francesco.mangiacrapa@isti.cnr.it + * @author Francesco Mangiacrapa francesco.mangiacrapaATisti.cnr.it * Feb 19, 2015 */ public class DialogConfirm extends DialogBox implements ClickHandler { diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/view/windows/DialogEditProperties.java b/src/main/java/org/gcube/portlets/user/workspace/client/view/windows/DialogEditProperties.java index 5c67ecc..1ca8769 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/client/view/windows/DialogEditProperties.java +++ b/src/main/java/org/gcube/portlets/user/workspace/client/view/windows/DialogEditProperties.java @@ -26,7 +26,7 @@ import com.google.gwt.user.client.rpc.AsyncCallback; /** * The Class DialogEditProperties. * - * @author Francesco Mangiacrapa francesco.mangiacrapa@isti.cnr.it + * @author Francesco Mangiacrapa francesco.mangiacrapaATisti.cnr.it * Jun 11, 2015 */ public class DialogEditProperties extends Dialog{ diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/view/windows/DialogGetInfo.java b/src/main/java/org/gcube/portlets/user/workspace/client/view/windows/DialogGetInfo.java index 8d650a6..ece302d 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/client/view/windows/DialogGetInfo.java +++ b/src/main/java/org/gcube/portlets/user/workspace/client/view/windows/DialogGetInfo.java @@ -7,8 +7,9 @@ import org.gcube.portlets.user.workspace.client.AppControllerExplorer; import org.gcube.portlets.user.workspace.client.ConstantsExplorer; import org.gcube.portlets.user.workspace.client.model.FileGridModel; import org.gcube.portlets.user.workspace.client.model.FileModel; -import org.gcube.portlets.user.workspace.client.model.InfoContactModel; import org.gcube.portlets.user.workspace.client.resources.Resources; +import org.gcube.portlets.widgets.workspacesharingwidget.client.rpc.WorkspaceSharingServiceAsync; +import org.gcube.portlets.widgets.workspacesharingwidget.shared.InfoContactModel; import com.extjs.gxt.ui.client.Style.HorizontalAlignment; import com.extjs.gxt.ui.client.Style.Scroll; @@ -31,7 +32,7 @@ import com.google.gwt.user.client.rpc.AsyncCallback; import com.google.gwt.user.client.ui.Image; /** - * @author Francesco Mangiacrapa francesco.mangiacrapa@isti.cnr.it + * @author Francesco Mangiacrapa francesco.mangiacrapaATisti.cnr.it * */ public class DialogGetInfo extends Dialog { @@ -55,95 +56,95 @@ public class DialogGetInfo extends Dialog { private TextField txtIsPublic = new TextField(); private TextField txtThreddsSynched = new TextField(); private TextField txtShared = new TextField(); -// private TextArea textAreaSharedWith = new TextArea(); + // private TextArea textAreaSharedWith = new TextArea(); private Html htmlUsersWidget = new Html(); private Html htmlPropertiesWidget = new Html(); private final NumberFormat number = ConstantsExplorer.numberFormatterKB; -// private TextField txtGcubeItemProperties; + // private TextField txtGcubeItemProperties; private HorizontalPanel hpGcubeProperties; private DialogEditProperties editProperties = null; public DialogGetInfo(final FileModel fileModel) { - FormLayout layout = new FormLayout(); - layout.setLabelWidth(90); - layout.setDefaultWidth(300); - setLayout(layout); + FormLayout layout = new FormLayout(); + layout.setLabelWidth(90); + layout.setDefaultWidth(300); + setLayout(layout); - setIcon(fileModel.getAbstractPrototypeIcon()); - setHeading(fileModel.getName() + " Properties"); + setIcon(fileModel.getAbstractPrototypeIcon()); + setHeading(fileModel.getName() + " Properties"); - setButtonAlign(HorizontalAlignment.RIGHT); - setModal(true); -// setBodyBorder(true); - setBodyStyle("padding: 9px; background: none"); - setWidth(widthDialog); - setResizable(false); - setButtons(Dialog.OK); + setButtonAlign(HorizontalAlignment.RIGHT); + setModal(true); + // setBodyBorder(true); + setBodyStyle("padding: 9px; background: none"); + setWidth(widthDialog); + setResizable(false); + setButtons(Dialog.OK); - txtName = new TextField(); - txtName.setFieldLabel("Name"); - txtName.setReadOnly(true); - textFieldSetValue(txtName,fileModel.getName()); - add(txtName); + txtName = new TextField(); + txtName.setFieldLabel("Name"); + txtName.setReadOnly(true); + textFieldSetValue(txtName, fileModel.getName()); + add(txtName); - txtLocation = new TextField(); - txtLocation.setFieldLabel("Location"); - txtLocation.setReadOnly(true); + txtLocation = new TextField(); + txtLocation.setFieldLabel("Location"); + txtLocation.setReadOnly(true); - if(fileModel.isRoot()) - txtLocation.setValue("/"); - else - loadLocation(fileModel.getIdentifier()); + if (fileModel.isRoot()) + txtLocation.setValue("/"); + else + loadLocation(fileModel.getIdentifier()); - add(txtLocation); + add(txtLocation); - if(fileModel.isDirectory()){ - txtIsPublic = new TextField(); - txtIsPublic.setFieldLabel("Public Folder"); - txtIsPublic.setReadOnly(true); - txtIsPublic.setValue(fileModel.isPublic()+""); - add(txtIsPublic); + if (fileModel.isDirectory()) { + txtIsPublic = new TextField(); + txtIsPublic.setFieldLabel("Public Folder"); + txtIsPublic.setReadOnly(true); + txtIsPublic.setValue(fileModel.isPublic() + ""); + add(txtIsPublic); - if(fileModel.getSynchedThreddsStatus()!=null){ - txtThreddsSynched = new TextField(); - txtThreddsSynched.setFieldLabel("Thredds Sync"); - txtThreddsSynched.setReadOnly(true); - txtThreddsSynched.setValue(fileModel.getSynchedThreddsStatus()+""); - add(txtThreddsSynched); + if (fileModel.getSynchedThreddsStatus() != null) { + txtThreddsSynched = new TextField(); + txtThreddsSynched.setFieldLabel("Thredds Sync"); + txtThreddsSynched.setReadOnly(true); + txtThreddsSynched.setValue(fileModel.getSynchedThreddsStatus() + ""); + add(txtThreddsSynched); - } + } - } + } + txtAreaDescription.setFieldLabel("Description"); + txtAreaDescription.setHeight(30); + txtAreaDescription.setReadOnly(true); + add(txtAreaDescription); - txtAreaDescription.setFieldLabel("Description"); - txtAreaDescription.setHeight(30); - txtAreaDescription.setReadOnly(true); - add(txtAreaDescription); - - //GCUBE PROPERTIES + // GCUBE PROPERTIES hpGcubeProperties = new HorizontalPanel(); - hpGcubeProperties.setStyleAttribute("padding-top", "6px"); - hpGcubeProperties.setStyleAttribute("margin-bottom", "6px"); - Label labelProperties = new Label("Properties"); - labelProperties.setTitle("Gcube Properties"); - labelProperties.setStyleAttribute("padding-right", "47px"); - hpGcubeProperties.add(labelProperties); - loadGcubeItemProperties(fileModel.getIdentifier()); - htmlPropertiesWidget.setHeight(heightTextArea); - htmlPropertiesWidget.setWidth("275px"); + hpGcubeProperties.setStyleAttribute("padding-top", "6px"); + hpGcubeProperties.setStyleAttribute("margin-bottom", "6px"); + Label labelProperties = new Label("Properties"); + labelProperties.setTitle("Gcube Properties"); + labelProperties.setStyleAttribute("padding-right", "47px"); + hpGcubeProperties.add(labelProperties); + loadGcubeItemProperties(fileModel.getIdentifier()); + htmlPropertiesWidget.setHeight(heightTextArea); + htmlPropertiesWidget.setWidth("275px"); - LayoutContainer lc = new LayoutContainer(); - lc.addStyleName("editPermissions"); + LayoutContainer lc = new LayoutContainer(); + lc.addStyleName("editPermissions"); - Image imgProperties = Resources.getIconEdit().createImage(); //EDIT PROPERTIES - imgProperties.setTitle("Edit Properties"); - lc.add(imgProperties); + Image imgProperties = Resources.getIconEdit().createImage(); // EDIT + // PROPERTIES + imgProperties.setTitle("Edit Properties"); + lc.add(imgProperties); - hpGcubeProperties.add(lc); + hpGcubeProperties.add(lc); - final Command cmdReloadProperties = new Command() { + final Command cmdReloadProperties = new Command() { @Override public void execute() { @@ -151,112 +152,111 @@ public class DialogGetInfo extends Dialog { } }; - imgProperties.addClickHandler(new ClickHandler() { + imgProperties.addClickHandler(new ClickHandler() { @Override public void onClick(ClickEvent event) { - if(editProperties==null) + if (editProperties == null) editProperties = new DialogEditProperties(fileModel, cmdReloadProperties); editProperties.show(); } }); - htmlPropertiesWidget.setStyleAttribute("margin-left", "5px"); - hpGcubeProperties.add(htmlPropertiesWidget); - hpGcubeProperties.setScrollMode(Scroll.AUTOY); - add(hpGcubeProperties); - setVisibleGcubeProperties(false); + htmlPropertiesWidget.setStyleAttribute("margin-left", "5px"); + hpGcubeProperties.add(htmlPropertiesWidget); + hpGcubeProperties.setScrollMode(Scroll.AUTOY); + add(hpGcubeProperties); + setVisibleGcubeProperties(false); - if(fileModel.isDirectory()){ - txtAreaDescription.setValue(fileModel.getDescription()); -// add(txtAreaDescription); - }else - loadDescription(fileModel.getIdentifier()); + if (fileModel.isDirectory()) { + txtAreaDescription.setValue(fileModel.getDescription()); + // add(txtAreaDescription); + } else + loadDescription(fileModel.getIdentifier()); - txtType = new TextField(); - txtType.setFieldLabel("Type"); - txtType.setReadOnly(true); - textFieldSetValue(txtType,fileModel.getType()); - add(txtType); + txtType = new TextField(); + txtType.setFieldLabel("Type"); + txtType.setReadOnly(true); + textFieldSetValue(txtType, fileModel.getType()); + add(txtType); - txtCategory = new TextField(); - txtCategory.setFieldLabel("Category"); - txtCategory.setReadOnly(true); - if(fileModel.getShortcutCategory()!=null) - textFieldSetValue(txtCategory,fileModel.getShortcutCategory().getValue()); - add(txtCategory); + txtCategory = new TextField(); + txtCategory.setFieldLabel("Category"); + txtCategory.setReadOnly(true); + if (fileModel.getShortcutCategory() != null) + textFieldSetValue(txtCategory, fileModel.getShortcutCategory().getValue()); + add(txtCategory); - txtOwner = new TextField(); - txtOwner.setFieldLabel("Owner"); - txtOwner.setReadOnly(true); - loadOwner(fileModel.getIdentifier()); - add(txtOwner); + txtOwner = new TextField(); + txtOwner.setFieldLabel("Owner"); + txtOwner.setReadOnly(true); + loadOwner(fileModel.getIdentifier()); + add(txtOwner); - txtCreated = new TextField(); - txtCreated.setFieldLabel("Created"); - txtCreated.setReadOnly(true); + txtCreated = new TextField(); + txtCreated.setFieldLabel("Created"); + txtCreated.setReadOnly(true); - loadCreationDate(fileModel.getIdentifier()); + loadCreationDate(fileModel.getIdentifier()); - add(txtCreated); + add(txtCreated); - txtLastMofication = new TextField(); - txtLastMofication.setFieldLabel("Last Mofication"); - txtLastMofication.setReadOnly(true); - if(fileModel instanceof FileGridModel) - textFieldSetValue(txtLastMofication, ((FileGridModel) fileModel).getLastModification().toString()); - else - loadLastModificationDate(fileModel.getIdentifier()); + txtLastMofication = new TextField(); + txtLastMofication.setFieldLabel("Last Mofication"); + txtLastMofication.setReadOnly(true); + if (fileModel instanceof FileGridModel) + textFieldSetValue(txtLastMofication, ((FileGridModel) fileModel).getLastModification().toString()); + else + loadLastModificationDate(fileModel.getIdentifier()); - add(txtLastMofication); + add(txtLastMofication); - txtSize = new TextField(); - txtSize.setFieldLabel("Size"); - txtSize.setReadOnly(true); + txtSize = new TextField(); + txtSize.setFieldLabel("Size"); + txtSize.setReadOnly(true); - if(fileModel instanceof FileGridModel) - textFieldSetValue(txtSize,getFormattedSize(((FileGridModel) fileModel).getSize())); - else - loadSize(fileModel.getIdentifier()); + if (fileModel instanceof FileGridModel) + textFieldSetValue(txtSize, getFormattedSize(((FileGridModel) fileModel).getSize())); + else + loadSize(fileModel.getIdentifier()); - add(txtSize); + add(txtSize); - //SHARED - txtShared = new TextField(); - txtShared.setFieldLabel("Shared"); - txtShared.setReadOnly(true); - textFieldSetValue(txtShared,fileModel.isShared()+""); - add(txtShared); + // SHARED + txtShared = new TextField(); + txtShared.setFieldLabel("Shared"); + txtShared.setReadOnly(true); + textFieldSetValue(txtShared, fileModel.isShared() + ""); + add(txtShared); - //USERS SHARED - if(fileModel.isShared()){ + // USERS SHARED + if (fileModel.isShared()) { - HorizontalPanel hp = new HorizontalPanel(); - hp.setStyleAttribute("padding-top", "6px"); - Label label = new Label("Shared with"); - label.setStyleAttribute("padding-right", "39px"); - hp.add(label); - loadACLsDescriptionForSharedFolder(fileModel.getIdentifier()); - htmlUsersWidget.setHeight(heightTextArea); - htmlUsersWidget.setWidth("297px"); - hp.add(htmlUsersWidget); - hp.setScrollMode(Scroll.AUTOY); - add(hp); - } + HorizontalPanel hp = new HorizontalPanel(); + hp.setStyleAttribute("padding-top", "6px"); + Label label = new Label("Shared with"); + label.setStyleAttribute("padding-right", "39px"); + hp.add(label); + loadACLsDescriptionForSharedFolder(fileModel.getIdentifier()); + htmlUsersWidget.setHeight(heightTextArea); + htmlUsersWidget.setWidth("297px"); + hp.add(htmlUsersWidget); + hp.setScrollMode(Scroll.AUTOY); + add(hp); + } - - this.getButtonById(Dialog.OK).addSelectionListener(new SelectionListener() { + this.getButtonById(Dialog.OK).addSelectionListener(new SelectionListener() { @Override public void componentSelected(ButtonEvent ce) { hide(); } }); - this.show(); + this.show(); } - private void setVisibleGcubeProperties(boolean bool){ + private void setVisibleGcubeProperties(boolean bool) { hpGcubeProperties.setVisible(bool); } @@ -276,7 +276,7 @@ public class DialogGetInfo extends Dialog { @Override public void onSuccess(String result) { - if(result!=null) + if (result != null) txtAreaDescription.setValue(result); else txtAreaDescription.setValue(""); @@ -295,7 +295,7 @@ public class DialogGetInfo extends Dialog { @Override public void onFailure(Throwable caught) { - GWT.log("an error occured in loadLastModificationDateById "+itemId + " "+caught.getMessage()); + GWT.log("an error occured in loadLastModificationDateById " + itemId + " " + caught.getMessage()); txtLastMofication.unmask(); } @@ -303,7 +303,7 @@ public class DialogGetInfo extends Dialog { @Override public void onSuccess(Date result) { - if(result!=null) + if (result != null) txtLastMofication.setValue(result.toString()); else txtLastMofication.setValue(UNKNOWN); @@ -314,37 +314,35 @@ public class DialogGetInfo extends Dialog { } - private void textFieldSetValue(TextField field, String value){ + private void textFieldSetValue(TextField field, String value) { - if(value==null || value.isEmpty()) + if (value == null || value.isEmpty()) field.setValue(UNKNOWN); else field.setValue(value); } - private void loadOwner(final String itemId){ + private void loadOwner(final String itemId) { txtOwner.mask(); - AppControllerExplorer.rpcWorkspaceService.getOwnerByItemId(itemId, new AsyncCallback() { + WorkspaceSharingServiceAsync.INSTANCE.getOwnerByItemId(itemId, new AsyncCallback() { @Override public void onFailure(Throwable caught) { - GWT.log("an error occured in get Owner by Id "+itemId + " "+caught.getMessage()); + GWT.log("an error occured in get Owner by Id " + itemId + " " + caught.getMessage()); txtOwner.unmask(); } @Override public void onSuccess(InfoContactModel result) { - textFieldSetValue(txtOwner,result.getName()); - txtOwner.unmask(); + textFieldSetValue(txtOwner, result.getName()); + txtOwner.unmask(); } }); } - - - private void loadGcubeItemProperties(final String itemId){ + private void loadGcubeItemProperties(final String itemId) { GWT.log("Load GcubeItemProperties"); htmlPropertiesWidget.mask(); AppControllerExplorer.rpcWorkspaceService.getHTMLGcubeItemProperties(itemId, new AsyncCallback() { @@ -352,135 +350,135 @@ public class DialogGetInfo extends Dialog { @Override public void onFailure(Throwable caught) { htmlPropertiesWidget.unmask(); - GWT.log("an error occured in load properties by Id "+itemId + " "+caught.getMessage()); + GWT.log("an error occured in load properties by Id " + itemId + " " + caught.getMessage()); setVisibleGcubeProperties(true); htmlPropertiesWidget.setHtml("Error on recovering properties"); } @Override public void onSuccess(String result) { -// setVisibleGcubeProperties(true); + // setVisibleGcubeProperties(true); htmlPropertiesWidget.unmask(); - if(result!=null){ + if (result != null) { setVisibleGcubeProperties(true); htmlPropertiesWidget.setHtml(result); } -// else{ -// htmlPropertiesWidget.setHeight(20); -// htmlPropertiesWidget.setHtml("None"); -// } + // else{ + // htmlPropertiesWidget.setHeight(20); + // htmlPropertiesWidget.setHtml("None"); + // } } }); } - - private void loadSize(final String itemId){ + private void loadSize(final String itemId) { GWT.log("Load size"); txtSize.mask(); AppControllerExplorer.rpcWorkspaceService.loadSizeByItemId(itemId, new AsyncCallback() { @Override public void onFailure(Throwable caught) { - GWT.log("an error occured in load creation date by Id "+itemId + " "+caught.getMessage()); + GWT.log("an error occured in load creation date by Id " + itemId + " " + caught.getMessage()); txtSize.unmask(); } @Override public void onSuccess(Long result) { - GWT.log("Loaded size="+result); - textFieldSetValue(txtSize,getFormattedSize(result)); - txtSize.unmask(); + GWT.log("Loaded size=" + result); + textFieldSetValue(txtSize, getFormattedSize(result)); + txtSize.unmask(); } }); } - - private void loadCreationDate(final String itemId){ + private void loadCreationDate(final String itemId) { txtCreated.mask(); AppControllerExplorer.rpcWorkspaceService.getItemCreationDateById(itemId, new AsyncCallback() { @Override public void onFailure(Throwable caught) { - GWT.log("an error occured in load creation date by Id "+itemId + " "+caught.getMessage()); + GWT.log("an error occured in load creation date by Id " + itemId + " " + caught.getMessage()); txtCreated.unmask(); } @Override public void onSuccess(Date result) { - if(result!=null) - textFieldSetValue(txtCreated,result.toString()); + if (result != null) + textFieldSetValue(txtCreated, result.toString()); txtCreated.unmask(); } }); } - private void loadACLsDescriptionForSharedFolder(String sharedId){ + private void loadACLsDescriptionForSharedFolder(String sharedId) { htmlUsersWidget.mask(); - AppControllerExplorer.rpcWorkspaceService.getACLsDescriptionForWorkspaceItemById(sharedId, new AsyncCallback() { + WorkspaceSharingServiceAsync.INSTANCE.getACLsDescriptionForWorkspaceItemById(sharedId, + new AsyncCallback() { - @Override - public void onFailure(Throwable caught) { - htmlUsersWidget.unmask(); - htmlUsersWidget.setHtml("Error on recovering users"); + @Override + public void onFailure(Throwable caught) { + htmlUsersWidget.unmask(); + htmlUsersWidget.setHtml("Error on recovering users"); - } + } - @Override - public void onSuccess(String result) { - htmlUsersWidget.unmask(); - GWT.log("Loaded ACLs: "+result); - htmlUsersWidget.setHtml(result); - } - }); + @Override + public void onSuccess(String result) { + htmlUsersWidget.unmask(); + GWT.log("Loaded ACLs: " + result); + htmlUsersWidget.setHtml(result); + } + }); } - private String getFormattedSize(long value){ + private String getFormattedSize(long value) { - if(value>0){ - double kb = value/1024; - if(kb<1) - kb=1; + if (value > 0) { + double kb = value / 1024; + if (kb < 1) + kb = 1; return number.format(kb); - }else if(value==0){ + } else if (value == 0) { return EMPTY; - }else + } else return ""; } - private void loadLocation(String itemId){ + private void loadLocation(String itemId) { txtLocation.mask(); - AppControllerExplorer.rpcWorkspaceService.getListParentsByItemIdentifier(itemId, false, new AsyncCallback>() { + AppControllerExplorer.rpcWorkspaceService.getListParentsByItemIdentifier(itemId, false, + new AsyncCallback>() { - @Override - public void onFailure(Throwable caught) { - GWT.log("failure get list parents by item identifier "+caught); - txtLocation.unmask(); - } - - @Override - public void onSuccess(List result) { - - String location=""; - if(result!=null){ - for (FileModel fileModel : result) { - if(fileModel!=null) - location+="/"+fileModel.getName(); + @Override + public void onFailure(Throwable caught) { + GWT.log("failure get list parents by item identifier " + caught); + txtLocation.unmask(); } - } - if(location.isEmpty()) - location ="/"; - txtLocation.setValue(location); - txtLocation.unmask(); - } - }); + @Override + public void onSuccess(List result) { + + String location = ""; + if (result != null) { + for (FileModel fileModel : result) { + if (fileModel != null) + location += "/" + fileModel.getName(); + } + } + if (location.isEmpty()) + location = "/"; + + txtLocation.setValue(location); + txtLocation.unmask(); + } + }); } } \ No newline at end of file diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/view/windows/DialogGetLink.java b/src/main/java/org/gcube/portlets/user/workspace/client/view/windows/DialogGetLink.java index d09568b..0bec476 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/client/view/windows/DialogGetLink.java +++ b/src/main/java/org/gcube/portlets/user/workspace/client/view/windows/DialogGetLink.java @@ -5,9 +5,11 @@ import org.gcube.portlets.user.workspace.client.event.RefreshFolderEvent; import org.gcube.portlets.user.workspace.client.event.SessionExpiredEvent; import org.gcube.portlets.user.workspace.client.model.FileModel; import org.gcube.portlets.user.workspace.client.resources.Resources; -import org.gcube.portlets.user.workspace.shared.AllowAccess; + import org.gcube.portlets.user.workspace.shared.PublicLink; import org.gcube.portlets.user.workspace.shared.SessionExpiredException; +import org.gcube.portlets.widgets.workspacesharingwidget.client.rpc.WorkspaceSharingServiceAsync; +import org.gcube.portlets.widgets.workspacesharingwidget.shared.AllowAccess; import com.extjs.gxt.ui.client.Style.HorizontalAlignment; import com.extjs.gxt.ui.client.Style.Scroll; @@ -23,12 +25,10 @@ import com.google.gwt.core.client.GWT; import com.google.gwt.dom.client.Style.Unit; import com.google.gwt.user.client.rpc.AsyncCallback; - /** * The Class DialogGetLink. * - * @author Francesco Mangiacrapa francesco.mangiacrapa@isti.cnr.it - * Sep 13, 2016 + * @author Francesco Mangiacrapa francesco.mangiacrapaATisti.cnr.it Sep 13, 2016 */ public class DialogGetLink extends Dialog { @@ -43,20 +43,26 @@ public class DialogGetLink extends Dialog { /** * The Enum Link_Type. * - * @author Francesco Mangiacrapa francesco.mangiacrapa@isti.cnr.it - * Sep 13, 2016 + * @author Francesco Mangiacrapa francesco.mangiacrapaATisti.cnr.it Sep 13, + * 2016 */ - public enum Link_Type {PUBLIC_LINK, FOLDER_LINK}; - + public enum Link_Type { + PUBLIC_LINK, FOLDER_LINK + }; /** * Instantiates a new dialog get link. * - * @param headingTxt the heading txt - * @param item the item - * @param version the version - * @param type the type - * @param setAsPublic the set as public + * @param headingTxt + * the heading txt + * @param item + * the item + * @param version + * the version + * @param type + * the type + * @param setAsPublic + * the set as public */ public DialogGetLink(String headingTxt, final FileModel item, String version, Link_Type type, boolean setAsPublic) { this.item = item; @@ -74,15 +80,15 @@ public class DialogGetLink extends Dialog { setButtons(Dialog.CLOSE); setScrollMode(Scroll.AUTOY); -// label.setText(msgTitle); -// label.setStyleName("myWebDavStyle"); + // label.setText(msgTitle); + // label.setStyleName("myWebDavStyle"); VerticalPanel vp1 = new VerticalPanel(); vp1.setStyleAttribute("margin-top", "8px"); txtCompleteURL = new TextField(); txtCompleteURL.setStyleAttribute("margin-top", "1px"); - txtCompleteURL.setWidth(widht-20); + txtCompleteURL.setWidth(widht - 20); txtCompleteURL.setReadOnly(true); -// txtCompleteURL.mask("Getting Link..."); + // txtCompleteURL.mask("Getting Link..."); vp1.add(new Label("Link")); vp1.add(txtCompleteURL); @@ -90,69 +96,70 @@ public class DialogGetLink extends Dialog { vp2.setStyleAttribute("margin-top", "8px"); txtShortURL = new TextField(); txtShortURL.setStyleAttribute("margin-top", "1px"); - txtShortURL.setWidth(widht-20); -// txtShortURL.mask("Getting Link..."); + txtShortURL.setWidth(widht - 20); + // txtShortURL.mask("Getting Link..."); vp2.add(new Label("Short Link")); vp2.add(txtShortURL); - switch (type) { case PUBLIC_LINK: vp.mask("Getting Public Link..."); setIcon(Resources.getIconPublicLink()); - if(item.getIdentifier()!=null && !item.getIdentifier().isEmpty()){ + if (item.getIdentifier() != null && !item.getIdentifier().isEmpty()) { - if(version==null || version.isEmpty()){ + if (version == null || version.isEmpty()) { - AppControllerExplorer.rpcWorkspaceService.getPublicLinkForFileItemId(item.getIdentifier(), true, new AsyncCallback() { + AppControllerExplorer.rpcWorkspaceService.getPublicLinkForFileItemId(item.getIdentifier(), true, + new AsyncCallback() { - @Override - public void onSuccess(PublicLink publicLink) { - vp.unmask(); - txtCompleteURL.setValue(publicLink.getCompleteURL()); - txtShortURL.setValue(publicLink.getShortURL()); - selectTxt(); - } + @Override + public void onSuccess(PublicLink publicLink) { + vp.unmask(); + txtCompleteURL.setValue(publicLink.getCompleteURL()); + txtShortURL.setValue(publicLink.getShortURL()); + selectTxt(); + } - @Override - public void onFailure(Throwable caught) { - vp.unmask(); - if(caught instanceof SessionExpiredException){ - GWT.log("Session expired"); - AppControllerExplorer.getEventBus().fireEvent(new SessionExpiredEvent()); - return; - } - new MessageBoxAlert("Error", caught.getMessage(), null); - } - }); - }else{ + @Override + public void onFailure(Throwable caught) { + vp.unmask(); + if (caught instanceof SessionExpiredException) { + GWT.log("Session expired"); + AppControllerExplorer.getEventBus().fireEvent(new SessionExpiredEvent()); + return; + } + new MessageBoxAlert("Error", caught.getMessage(), null); + } + }); + } else { - AppControllerExplorer.rpcWorkspaceService.getPublicLinkForFileItemIdToVersion(item.getIdentifier(), version, true, new AsyncCallback() { + AppControllerExplorer.rpcWorkspaceService.getPublicLinkForFileItemIdToVersion(item.getIdentifier(), + version, true, new AsyncCallback() { - @Override - public void onSuccess(PublicLink publicLink) { - vp.unmask(); - txtCompleteURL.setValue(publicLink.getCompleteURL()); - txtShortURL.setValue(publicLink.getShortURL()); - selectTxt(); - } + @Override + public void onSuccess(PublicLink publicLink) { + vp.unmask(); + txtCompleteURL.setValue(publicLink.getCompleteURL()); + txtShortURL.setValue(publicLink.getShortURL()); + selectTxt(); + } - @Override - public void onFailure(Throwable caught) { - vp.unmask(); - if(caught instanceof SessionExpiredException){ - GWT.log("Session expired"); - AppControllerExplorer.getEventBus().fireEvent(new SessionExpiredEvent()); - return; - } - new MessageBoxAlert("Error", caught.getMessage(), null); - } - }); + @Override + public void onFailure(Throwable caught) { + vp.unmask(); + if (caught instanceof SessionExpiredException) { + GWT.log("Session expired"); + AppControllerExplorer.getEventBus().fireEvent(new SessionExpiredEvent()); + return; + } + new MessageBoxAlert("Error", caught.getMessage(), null); + } + }); } - }else{ + } else { txtCompleteURL.unmask(); new MessageBoxAlert("Error", "The item identifier is null", null); } @@ -162,41 +169,44 @@ public class DialogGetLink extends Dialog { case FOLDER_LINK: vp.mask("Updating Folder Link... checking permissions"); - if(item.isShared()){ + if (item.isShared()) { setIcon(Resources.getIconFolderSharedPublic()); - }else + } else setIcon(Resources.getIconFolderPublic()); - if(item.getIdentifier()!=null && !item.getIdentifier().isEmpty()){ - AppControllerExplorer.rpcWorkspaceService.accessToFolderLink(item.getIdentifier(), new AsyncCallback() { + if (item.getIdentifier() != null && !item.getIdentifier().isEmpty()) { - @Override - public void onFailure(Throwable caught) { + WorkspaceSharingServiceAsync.INSTANCE.accessToFolderLink(item.getIdentifier(), + new AsyncCallback() { - vp.unmask(); - if(caught instanceof SessionExpiredException){ - GWT.log("Session expired"); - AppControllerExplorer.getEventBus().fireEvent(new SessionExpiredEvent()); - return; - } - new MessageBoxAlert("Error", caught.getMessage(), null); + @Override + public void onFailure(Throwable caught) { - } + vp.unmask(); + if (caught instanceof SessionExpiredException) { + GWT.log("Session expired"); + AppControllerExplorer.getEventBus().fireEvent(new SessionExpiredEvent()); + return; + } + new MessageBoxAlert("Error", caught.getMessage(), null); - @Override - public void onSuccess(AllowAccess result) { - GWT.log("AllowAccess? "+result); - vp.unmask(); - if(result.getAccessGranted()){ - String msg = DialogGetLink.this.setAsPublic?"Getting":"Removing"; - msg=msg+" Folder Link... permissions granted"; - vp.mask(msg); - allowAccessToFolderLink(item.getIdentifier(), DialogGetLink.this.setAsPublic); - }else - new MessageBoxAlert("Permission Denied", result.getAccessAllowDenyMotivation(), null); + } - } - }); + @Override + public void onSuccess(AllowAccess result) { + GWT.log("AllowAccess? " + result); + vp.unmask(); + if (result.getAccessGranted()) { + String msg = DialogGetLink.this.setAsPublic ? "Getting" : "Removing"; + msg = msg + " Folder Link... permissions granted"; + vp.mask(msg); + allowAccessToFolderLink(item.getIdentifier(), DialogGetLink.this.setAsPublic); + } else + new MessageBoxAlert("Permission Denied", result.getAccessAllowDenyMotivation(), + null); + + } + }); } break; @@ -208,13 +218,12 @@ public class DialogGetLink extends Dialog { @Override public void componentSelected(ButtonEvent ce) { - hide(); + hide(); } }); - -// vp.add(label); + // vp.add(label); vp.add(vp1); vp.add(vp2); @@ -226,41 +235,47 @@ public class DialogGetLink extends Dialog { /** * Allow access to folder link. * - * @param folderId the folder id - * @param setIsPublic the set is public + * @param folderId + * the folder id + * @param setIsPublic + * the set is public */ - protected void allowAccessToFolderLink(String folderId, final boolean setIsPublic){ + protected void allowAccessToFolderLink(String folderId, final boolean setIsPublic) { - AppControllerExplorer.rpcWorkspaceService.markFolderAsPublicForFolderItemId(folderId, setIsPublic, new AsyncCallback() { + AppControllerExplorer.rpcWorkspaceService.markFolderAsPublicForFolderItemId(folderId, setIsPublic, + new AsyncCallback() { - @Override - public void onSuccess(PublicLink publicLink) { + @Override + public void onSuccess(PublicLink publicLink) { - if(!setIsPublic && publicLink==null){ - DialogGetLink.this.hide(); - MessageBox.info("Folder Link Removed", "Folder Link to the folder: "+item.getName()+ " removed correctly", null); - AppControllerExplorer.getEventBus().fireEvent(new RefreshFolderEvent(item.getParentFileModel(), true, false, false)); - return; - } + if (!setIsPublic && publicLink == null) { + DialogGetLink.this.hide(); + MessageBox.info("Folder Link Removed", + "Folder Link to the folder: " + item.getName() + " removed correctly", null); + AppControllerExplorer.getEventBus() + .fireEvent(new RefreshFolderEvent(item.getParentFileModel(), true, false, false)); + return; + } - vp.unmask(); - txtCompleteURL.setValue(publicLink.getCompleteURL()); - txtShortURL.setValue(publicLink.getShortURL()); - selectTxt(); - AppControllerExplorer.getEventBus().fireEvent(new RefreshFolderEvent(item.getParentFileModel(), true, false, false)); - } + vp.unmask(); + txtCompleteURL.setValue(publicLink.getCompleteURL()); + txtShortURL.setValue(publicLink.getShortURL()); + selectTxt(); + AppControllerExplorer.getEventBus() + .fireEvent(new RefreshFolderEvent(item.getParentFileModel(), true, false, false)); + } - @Override - public void onFailure(Throwable caught) { - vp.unmask(); - if(caught instanceof SessionExpiredException){ - GWT.log("Session expired"); - AppControllerExplorer.getEventBus().fireEvent(new SessionExpiredEvent()); - return; - } - new MessageBoxAlert("Error", caught.getMessage(), null); - } - }); + @Override + public void onFailure(Throwable caught) { + vp.unmask(); + if (caught instanceof SessionExpiredException) { + GWT.log("Session expired"); + AppControllerExplorer.getEventBus().fireEvent(new SessionExpiredEvent()); + return; + } + new MessageBoxAlert("Error", caught.getMessage(), null); + } + }); } /** @@ -276,9 +291,9 @@ public class DialogGetLink extends Dialog { /** * Select txt. */ - public void selectTxt(){ + public void selectTxt() { - if(txtCompleteURL.getValue()!=null) + if (txtCompleteURL.getValue() != null) txtCompleteURL.select(0, txtCompleteURL.getValue().length()); } } \ No newline at end of file diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/view/windows/DialogShareLink.java b/src/main/java/org/gcube/portlets/user/workspace/client/view/windows/DialogShareLink.java index 8673ca0..38cc0df 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/client/view/windows/DialogShareLink.java +++ b/src/main/java/org/gcube/portlets/user/workspace/client/view/windows/DialogShareLink.java @@ -15,7 +15,7 @@ import com.google.gwt.dom.client.Style.Unit; import com.google.gwt.user.client.rpc.AsyncCallback; /** - * @author Francesco Mangiacrapa francesco.mangiacrapa@isti.cnr.it + * @author Francesco Mangiacrapa francesco.mangiacrapaATisti.cnr.it * */ public class DialogShareLink extends Dialog { diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/view/windows/DialogText.java b/src/main/java/org/gcube/portlets/user/workspace/client/view/windows/DialogText.java index bce5876..174e522 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/client/view/windows/DialogText.java +++ b/src/main/java/org/gcube/portlets/user/workspace/client/view/windows/DialogText.java @@ -17,7 +17,7 @@ import com.extjs.gxt.ui.client.widget.layout.FormLayout; /** * The Class DialogText. * - * @author Francesco Mangiacrapa francesco.mangiacrapa@isti.cnr.it + * @author Francesco Mangiacrapa francesco.mangiacrapaATisti.cnr.it * Jul 10, 2017 */ public class DialogText extends Dialog { diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/view/windows/DialogWebDavUrl.java b/src/main/java/org/gcube/portlets/user/workspace/client/view/windows/DialogWebDavUrl.java index d4f3e84..8073844 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/client/view/windows/DialogWebDavUrl.java +++ b/src/main/java/org/gcube/portlets/user/workspace/client/view/windows/DialogWebDavUrl.java @@ -15,7 +15,7 @@ import com.google.gwt.dom.client.Style.Unit; import com.google.gwt.user.client.ui.Anchor; /** - * @author Francesco Mangiacrapa francesco.mangiacrapa@isti.cnr.it + * @author Francesco Mangiacrapa francesco.mangiacrapaATisti.cnr.it * */ public class DialogWebDavUrl extends Dialog { diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/view/windows/ImagesPreviewController.java b/src/main/java/org/gcube/portlets/user/workspace/client/view/windows/ImagesPreviewController.java index ef6f74b..7bc6433 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/client/view/windows/ImagesPreviewController.java +++ b/src/main/java/org/gcube/portlets/user/workspace/client/view/windows/ImagesPreviewController.java @@ -22,7 +22,7 @@ import com.google.gwt.user.client.ui.Image; /** * The Class ImagesPreviewController. * - * @author Francesco Mangiacrapa francesco.mangiacrapa@isti.cnr.it + * @author Francesco Mangiacrapa francesco.mangiacrapaATisti.cnr.it * May 24, 2017 */ public class ImagesPreviewController { diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/view/windows/InfoDisplay.java b/src/main/java/org/gcube/portlets/user/workspace/client/view/windows/InfoDisplay.java index 662cf80..93d0b48 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/client/view/windows/InfoDisplay.java +++ b/src/main/java/org/gcube/portlets/user/workspace/client/view/windows/InfoDisplay.java @@ -4,7 +4,7 @@ import com.extjs.gxt.ui.client.widget.Info; import com.extjs.gxt.ui.client.widget.InfoConfig; /** - * @author Francesco Mangiacrapa francesco.mangiacrapa@isti.cnr.it + * @author Francesco Mangiacrapa francesco.mangiacrapaATisti.cnr.it * */ public class InfoDisplay extends Info{ diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/view/windows/InfoDisplayMessage.java b/src/main/java/org/gcube/portlets/user/workspace/client/view/windows/InfoDisplayMessage.java index 2f6b34b..45fde6a 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/client/view/windows/InfoDisplayMessage.java +++ b/src/main/java/org/gcube/portlets/user/workspace/client/view/windows/InfoDisplayMessage.java @@ -4,8 +4,8 @@ package org.gcube.portlets.user.workspace.client.view.windows; /** * - * @author Francesco Mangiacrapa francesco.mangiacrapa@isti.cnr.it - * @Jun 25, 2013 + * @author Francesco Mangiacrapa francesco.mangiacrapaATisti.cnr.it + * Jun 25, 2013 * */ public class InfoDisplayMessage extends InfoDisplay{ diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/view/windows/MessageBoxAlert.java b/src/main/java/org/gcube/portlets/user/workspace/client/view/windows/MessageBoxAlert.java index 7ebccfd..44e5605 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/client/view/windows/MessageBoxAlert.java +++ b/src/main/java/org/gcube/portlets/user/workspace/client/view/windows/MessageBoxAlert.java @@ -5,7 +5,7 @@ import com.extjs.gxt.ui.client.event.MessageBoxEvent; import com.extjs.gxt.ui.client.widget.MessageBox; /** - * @author Francesco Mangiacrapa francesco.mangiacrapa@isti.cnr.it + * @author Francesco Mangiacrapa francesco.mangiacrapaATisti.cnr.it * */ public class MessageBoxAlert { diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/view/windows/MessageBoxConfirm.java b/src/main/java/org/gcube/portlets/user/workspace/client/view/windows/MessageBoxConfirm.java index 59fba32..ed462ec 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/client/view/windows/MessageBoxConfirm.java +++ b/src/main/java/org/gcube/portlets/user/workspace/client/view/windows/MessageBoxConfirm.java @@ -5,7 +5,7 @@ import com.extjs.gxt.ui.client.event.MessageBoxEvent; import com.extjs.gxt.ui.client.widget.MessageBox; /** - * @author Francesco Mangiacrapa francesco.mangiacrapa@isti.cnr.it + * @author Francesco Mangiacrapa francesco.mangiacrapaATisti.cnr.it * */ public class MessageBoxConfirm { diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/view/windows/MessageBoxWait.java b/src/main/java/org/gcube/portlets/user/workspace/client/view/windows/MessageBoxWait.java index 0b3fde2..c8a079d 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/client/view/windows/MessageBoxWait.java +++ b/src/main/java/org/gcube/portlets/user/workspace/client/view/windows/MessageBoxWait.java @@ -3,7 +3,7 @@ package org.gcube.portlets.user.workspace.client.view.windows; import com.extjs.gxt.ui.client.widget.MessageBox; /** - * @author Francesco Mangiacrapa francesco.mangiacrapa@isti.cnr.it + * @author Francesco Mangiacrapa francesco.mangiacrapaATisti.cnr.it * */ public class MessageBoxWait { diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/view/windows/NewBrowserWindow.java b/src/main/java/org/gcube/portlets/user/workspace/client/view/windows/NewBrowserWindow.java index 7c4f2f2..015ad7e 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/client/view/windows/NewBrowserWindow.java +++ b/src/main/java/org/gcube/portlets/user/workspace/client/view/windows/NewBrowserWindow.java @@ -3,8 +3,8 @@ package org.gcube.portlets.user.workspace.client.view.windows; import com.google.gwt.core.client.JavaScriptObject; /** - * @author Francesco Mangiacrapa francesco.mangiacrapa@isti.cnr.it - * @Sep 4, 2013 + * @author Francesco Mangiacrapa francesco.mangiacrapaATisti.cnr.it + * Sep 4, 2013 * */ public final class NewBrowserWindow extends JavaScriptObject { diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/view/windows/accounting/AccoutingInfoContainer.java b/src/main/java/org/gcube/portlets/user/workspace/client/view/windows/accounting/AccoutingInfoContainer.java index 9e3d663..19415f4 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/client/view/windows/accounting/AccoutingInfoContainer.java +++ b/src/main/java/org/gcube/portlets/user/workspace/client/view/windows/accounting/AccoutingInfoContainer.java @@ -40,7 +40,7 @@ import com.extjs.gxt.ui.client.widget.toolbar.ToolBar; /** * The Class AccoutingInfoContainer. * - * @author Francesco Mangiacrapa francesco.mangiacrapa@isti.cnr.it + * @author Francesco Mangiacrapa francesco.mangiacrapaATisti.cnr.it * Sep 28, 2016 */ public class AccoutingInfoContainer extends LayoutContainer { diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/view/windows/accounting/WindowAccountingInfo.java b/src/main/java/org/gcube/portlets/user/workspace/client/view/windows/accounting/WindowAccountingInfo.java index 0eff40b..176bdfb 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/client/view/windows/accounting/WindowAccountingInfo.java +++ b/src/main/java/org/gcube/portlets/user/workspace/client/view/windows/accounting/WindowAccountingInfo.java @@ -16,7 +16,7 @@ import com.extjs.gxt.ui.client.widget.layout.FitLayout; /** * The Class WindowAccountingInfo. * - * @author Francesco Mangiacrapa francesco.mangiacrapa@isti.cnr.it + * @author Francesco Mangiacrapa francesco.mangiacrapaATisti.cnr.it * Nov 10, 2015 */ public class WindowAccountingInfo extends Window { diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/workspace/exceptions/WrongItemTypeException.java b/src/main/java/org/gcube/portlets/user/workspace/client/workspace/exceptions/WrongItemTypeException.java index 28fc709..c1fd337 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/client/workspace/exceptions/WrongItemTypeException.java +++ b/src/main/java/org/gcube/portlets/user/workspace/client/workspace/exceptions/WrongItemTypeException.java @@ -7,7 +7,7 @@ package org.gcube.portlets.user.workspace.client.workspace.exceptions; /** * The Class WrongItemTypeException. * - * @author Francesco Mangiacrapa francesco.mangiacrapa@isti.cnr.it + * @author Francesco Mangiacrapa francesco.mangiacrapaATisti.cnr.it * Jun 11, 2015 */ public class WrongItemTypeException extends Exception{ diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/workspace/folder/item/gcube/WorkspaceHandledException.java b/src/main/java/org/gcube/portlets/user/workspace/client/workspace/folder/item/gcube/WorkspaceHandledException.java index a738a3b..38c82ab 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/client/workspace/folder/item/gcube/WorkspaceHandledException.java +++ b/src/main/java/org/gcube/portlets/user/workspace/client/workspace/folder/item/gcube/WorkspaceHandledException.java @@ -4,8 +4,8 @@ package org.gcube.portlets.user.workspace.client.workspace.folder.item.gcube; /** - * @author Francesco Mangiacrapa francesco.mangiacrapa@isti.cnr.it - * @Feb 16, 2015 + * @author Francesco Mangiacrapa francesco.mangiacrapaATisti.cnr.it + * Feb 16, 2015 * */ public class WorkspaceHandledException extends Exception{ diff --git a/src/main/java/org/gcube/portlets/user/workspace/server/notifications/NotificationsProducer.java b/src/main/java/org/gcube/portlets/user/workspace/server/notifications/NotificationsProducer.java index 747cb6c..b5d2a8b 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/server/notifications/NotificationsProducer.java +++ b/src/main/java/org/gcube/portlets/user/workspace/server/notifications/NotificationsProducer.java @@ -15,16 +15,16 @@ import org.gcube.common.homelibrary.home.exceptions.InternalErrorException; import org.gcube.common.homelibrary.home.workspace.WorkspaceItem; import org.gcube.common.homelibrary.home.workspace.WorkspaceSharedFolder; import org.gcube.common.scope.impl.ScopeBean; -import org.gcube.portlets.user.workspace.client.model.InfoContactModel; import org.gcube.portlets.user.workspace.server.util.DifferenceBetweenInfoContactModel; import org.gcube.portlets.user.workspace.server.util.PortalContextInfo; import org.gcube.portlets.user.workspace.server.util.UserUtil; import org.gcube.portlets.user.workspace.server.util.WsUtil; +import org.gcube.portlets.widgets.workspacesharingwidget.shared.InfoContactModel; /** * The Class NotificationsProducer. * - * @author Francesco Mangiacrapa francesco.mangiacrapa@isti.cnr.it + * @author Francesco Mangiacrapa francesco.mangiacrapaATisti.cnr.it */ public class NotificationsProducer { diff --git a/src/main/java/org/gcube/portlets/user/workspace/server/notifications/NotificationsUtil.java b/src/main/java/org/gcube/portlets/user/workspace/server/notifications/NotificationsUtil.java index a73bdb0..a47abd6 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/server/notifications/NotificationsUtil.java +++ b/src/main/java/org/gcube/portlets/user/workspace/server/notifications/NotificationsUtil.java @@ -14,15 +14,15 @@ import org.gcube.common.homelibary.model.items.type.WorkspaceItemType; import org.gcube.common.homelibrary.home.workspace.Workspace; import org.gcube.common.homelibrary.home.workspace.WorkspaceItem; import org.gcube.common.homelibrary.home.workspace.WorkspaceSharedFolder; -import org.gcube.portlets.user.workspace.client.model.InfoContactModel; import org.gcube.portlets.user.workspace.server.GWTWorkspaceBuilder; import org.gcube.portlets.user.workspace.server.util.WsUtil; +import org.gcube.portlets.widgets.workspacesharingwidget.shared.InfoContactModel; /** * The Class NotificationsUtil. * - * @author Francesco Mangiacrapa francesco.mangiacrapa@isti.cnr.it - * @May 27, 2013 + * @author Francesco Mangiacrapa francesco.mangiacrapaATisti.cnr.it + * May 27, 2013 */ public class NotificationsUtil { diff --git a/src/main/java/org/gcube/portlets/user/workspace/server/notifications/tostoragehub/NotificationMapperToStorageHub.java b/src/main/java/org/gcube/portlets/user/workspace/server/notifications/tostoragehub/NotificationMapperToStorageHub.java index 7d84828..2ed4ad0 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/server/notifications/tostoragehub/NotificationMapperToStorageHub.java +++ b/src/main/java/org/gcube/portlets/user/workspace/server/notifications/tostoragehub/NotificationMapperToStorageHub.java @@ -15,7 +15,7 @@ import org.gcube.common.storagehubwrapper.shared.tohl.WorkspaceSharedFolder; /** * The Class NotificationMapper. * - * @author Francesco Mangiacrapa at ISTI-CNR (francesco.mangiacrapa@isti.cnr.it) + * @author Francesco Mangiacrapa at ISTI-CNR (francesco.mangiacrapaATisti.cnr.it) * Oct 2, 2018 */ public class NotificationMapperToStorageHub { diff --git a/src/main/java/org/gcube/portlets/user/workspace/server/notifications/tostoragehub/NotificationStorageHubUtil.java b/src/main/java/org/gcube/portlets/user/workspace/server/notifications/tostoragehub/NotificationStorageHubUtil.java index 568830e..975dd96 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/server/notifications/tostoragehub/NotificationStorageHubUtil.java +++ b/src/main/java/org/gcube/portlets/user/workspace/server/notifications/tostoragehub/NotificationStorageHubUtil.java @@ -11,15 +11,15 @@ import org.gcube.common.storagehub.model.types.WorkspaceItemType; import org.gcube.common.storagehubwrapper.shared.tohl.WorkspaceFolder; import org.gcube.common.storagehubwrapper.shared.tohl.WorkspaceItem; import org.gcube.common.storagehubwrapper.shared.tohl.WorkspaceSharedFolder; -import org.gcube.portlets.user.workspace.client.model.InfoContactModel; import org.gcube.portlets.user.workspace.server.GWTWorkspaceBuilder; import org.gcube.portlets.user.workspace.server.util.WsUtil; +import org.gcube.portlets.widgets.workspacesharingwidget.shared.InfoContactModel; /** * The Class NotificationFromStorageHub. * - * @author Francesco Mangiacrapa francesco.mangiacrapa@isti.cnr.it + * @author Francesco Mangiacrapa francesco.mangiacrapaATisti.cnr.it * Oct 2, 2018 */ public class NotificationStorageHubUtil { diff --git a/src/main/java/org/gcube/portlets/user/workspace/server/notifications/tostoragehub/NotificationsProducerToStorageHub.java b/src/main/java/org/gcube/portlets/user/workspace/server/notifications/tostoragehub/NotificationsProducerToStorageHub.java index dd99bc0..541460f 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/server/notifications/tostoragehub/NotificationsProducerToStorageHub.java +++ b/src/main/java/org/gcube/portlets/user/workspace/server/notifications/tostoragehub/NotificationsProducerToStorageHub.java @@ -13,15 +13,15 @@ import org.gcube.applicationsupportlayer.social.NotificationsManager; import org.gcube.common.scope.impl.ScopeBean; import org.gcube.common.storagehubwrapper.shared.tohl.WorkspaceItem; import org.gcube.common.storagehubwrapper.shared.tohl.WorkspaceSharedFolder; -import org.gcube.portlets.user.workspace.client.model.InfoContactModel; import org.gcube.portlets.user.workspace.server.util.PortalContextInfo; import org.gcube.portlets.user.workspace.server.util.WsUtil; +import org.gcube.portlets.widgets.workspacesharingwidget.shared.InfoContactModel; /** * The Class NotificationsProducerToStorageHub. * - * @author Francesco Mangiacrapa at ISTI-CNR (francesco.mangiacrapa@isti.cnr.it) + * @author Francesco Mangiacrapa at ISTI-CNR (francesco.mangiacrapaATisti.cnr.it) * Oct 5, 2018 */ public class NotificationsProducerToStorageHub { diff --git a/src/main/java/org/gcube/portlets/user/workspace/server/util/AclTypeComparator.java b/src/main/java/org/gcube/portlets/user/workspace/server/util/AclTypeComparator.java index 49bf249..ffa84e6 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/server/util/AclTypeComparator.java +++ b/src/main/java/org/gcube/portlets/user/workspace/server/util/AclTypeComparator.java @@ -14,7 +14,7 @@ import org.gcube.common.homelibrary.home.workspace.accessmanager.ACLType; /** * The Class AclTypeComparator. * - * @author Francesco Mangiacrapa francesco.mangiacrapa@isti.cnr.it + * @author Francesco Mangiacrapa francesco.mangiacrapaATisti.cnr.it * Mar 5, 2015 */ public class AclTypeComparator implements Comparator{ diff --git a/src/main/java/org/gcube/portlets/user/workspace/server/util/DifferenceBetweenInfoContactModel.java b/src/main/java/org/gcube/portlets/user/workspace/server/util/DifferenceBetweenInfoContactModel.java index 36dfd6a..59236e7 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/server/util/DifferenceBetweenInfoContactModel.java +++ b/src/main/java/org/gcube/portlets/user/workspace/server/util/DifferenceBetweenInfoContactModel.java @@ -3,7 +3,9 @@ package org.gcube.portlets.user.workspace.server.util; import java.util.ArrayList; import java.util.List; -import org.gcube.portlets.user.workspace.client.model.InfoContactModel; +import org.gcube.portlets.widgets.workspacesharingwidget.shared.InfoContactModel; + + @@ -11,7 +13,7 @@ import org.gcube.portlets.user.workspace.client.model.InfoContactModel; /** * The Class DifferenceBetweenInfoContactModel. * - * @author Francesco Mangiacrapa francesco.mangiacrapa@isti.cnr.it + * @author Francesco Mangiacrapa francesco.mangiacrapaATisti.cnr.it * Nov 19, 2015 */ public class DifferenceBetweenInfoContactModel { diff --git a/src/main/java/org/gcube/portlets/user/workspace/server/util/HttpRequestUtil.java b/src/main/java/org/gcube/portlets/user/workspace/server/util/HttpRequestUtil.java index 88fd6d0..88d1d82 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/server/util/HttpRequestUtil.java +++ b/src/main/java/org/gcube/portlets/user/workspace/server/util/HttpRequestUtil.java @@ -11,7 +11,7 @@ import org.apache.log4j.Logger; /** - * @author Francesco Mangiacrapa francesco.mangiacrapa@isti.cnr.it + * @author Francesco Mangiacrapa francesco.mangiacrapaATisti.cnr.it * @Apr 26, 2013 * */ diff --git a/src/main/java/org/gcube/portlets/user/workspace/server/util/PortalContextInfo.java b/src/main/java/org/gcube/portlets/user/workspace/server/util/PortalContextInfo.java index 359cc59..43d3c04 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/server/util/PortalContextInfo.java +++ b/src/main/java/org/gcube/portlets/user/workspace/server/util/PortalContextInfo.java @@ -9,7 +9,7 @@ import java.io.Serializable; /** * The Class PortalContextInfo. * - * @author Francesco Mangiacrapa francesco.mangiacrapa@isti.cnr.it + * @author Francesco Mangiacrapa francesco.mangiacrapaATisti.cnr.it * Nov 25, 2016 */ public class PortalContextInfo implements Serializable{ diff --git a/src/main/java/org/gcube/portlets/user/workspace/server/util/StringUtil.java b/src/main/java/org/gcube/portlets/user/workspace/server/util/StringUtil.java index f4d845a..7d80391 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/server/util/StringUtil.java +++ b/src/main/java/org/gcube/portlets/user/workspace/server/util/StringUtil.java @@ -12,8 +12,8 @@ import org.apache.log4j.Logger; /** * The Class StringUtil. * - * @author Francesco Mangiacrapa francesco.mangiacrapa@isti.cnr.it - * @Jul 9, 2013 + * @author Francesco Mangiacrapa francesco.mangiacrapaATisti.cnr.it + * Jul 9, 2013 */ public class StringUtil { diff --git a/src/main/java/org/gcube/portlets/user/workspace/server/util/ThumbnailGenerator.java b/src/main/java/org/gcube/portlets/user/workspace/server/util/ThumbnailGenerator.java index 44dbd26..5e400be 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/server/util/ThumbnailGenerator.java +++ b/src/main/java/org/gcube/portlets/user/workspace/server/util/ThumbnailGenerator.java @@ -25,7 +25,7 @@ import org.apache.commons.io.IOUtils; /** * The Class ThumbnailGenerator. * - * @author Francesco Mangiacrapa at ISTI-CNR (francesco.mangiacrapa@isti.cnr.it) + * @author Francesco Mangiacrapa at ISTI-CNR (francesco.mangiacrapaATisti.cnr.it) * Oct 18, 2018 */ public class ThumbnailGenerator { diff --git a/src/main/java/org/gcube/portlets/user/workspace/server/util/UrlEncoderUtil.java b/src/main/java/org/gcube/portlets/user/workspace/server/util/UrlEncoderUtil.java index ee40ec1..0db2691 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/server/util/UrlEncoderUtil.java +++ b/src/main/java/org/gcube/portlets/user/workspace/server/util/UrlEncoderUtil.java @@ -12,7 +12,7 @@ import org.apache.log4j.Logger; /** * The Class UrlEncoderUtil. * - * @author Francesco Mangiacrapa francesco.mangiacrapa@isti.cnr.it + * @author Francesco Mangiacrapa francesco.mangiacrapaATisti.cnr.it * Sep 14, 2016 */ public class UrlEncoderUtil { diff --git a/src/main/java/org/gcube/portlets/user/workspace/server/util/UserUtil.java b/src/main/java/org/gcube/portlets/user/workspace/server/util/UserUtil.java index 0df2460..6e23261 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/server/util/UserUtil.java +++ b/src/main/java/org/gcube/portlets/user/workspace/server/util/UserUtil.java @@ -4,7 +4,7 @@ import java.util.ArrayList; import java.util.List; import org.apache.log4j.Logger; -import org.gcube.portlets.user.workspace.client.model.InfoContactModel; +import org.gcube.portlets.widgets.workspacesharingwidget.shared.InfoContactModel; import org.gcube.vomanagement.usermanagement.UserManager; import org.gcube.vomanagement.usermanagement.exception.UserManagementSystemException; import org.gcube.vomanagement.usermanagement.exception.UserRetrievalFault; @@ -16,7 +16,7 @@ import org.gcube.vomanagement.usermanagement.model.GCubeUser; /** * The Class UserUtil. * - * @author Francesco Mangiacrapa francesco.mangiacrapa@isti.cnr.it + * @author Francesco Mangiacrapa francesco.mangiacrapaATisti.cnr.it * Sep 14, 2016 */ public class UserUtil { diff --git a/src/main/java/org/gcube/portlets/user/workspace/server/util/WsUtil.java b/src/main/java/org/gcube/portlets/user/workspace/server/util/WsUtil.java index 28ccc00..cf2129b 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/server/util/WsUtil.java +++ b/src/main/java/org/gcube/portlets/user/workspace/server/util/WsUtil.java @@ -22,7 +22,6 @@ import org.gcube.common.storagehubwrapper.shared.tohl.exceptions.InternalErrorEx import org.gcube.common.storagehubwrapper.shared.tohl.exceptions.WorkspaceFolderNotFoundException; import org.gcube.portlets.user.urlshortener.UrlShortener; import org.gcube.portlets.user.workspace.client.model.FileModel; -import org.gcube.portlets.user.workspace.client.model.InfoContactModel; import org.gcube.portlets.user.workspace.server.GWTWorkspaceBuilder; import org.gcube.portlets.user.workspace.server.notifications.NotificationsProducer; import org.gcube.portlets.user.workspace.server.notifications.tostoragehub.NotificationsProducerToStorageHub; @@ -32,14 +31,14 @@ import org.gcube.portlets.user.workspace.server.tostoragehub.StorageHubToWorkpac import org.gcube.portlets.user.workspace.server.util.resource.PropertySpecialFolderReader; import org.gcube.portlets.user.workspace.server.util.scope.ScopeUtilFilter; import org.gcube.vomanagement.usermanagement.model.GCubeUser; - +import org.gcube.portlets.widgets.workspacesharingwidget.shared.InfoContactModel; import com.liferay.portal.service.UserLocalServiceUtil; /** * The Class WsUtil. * - * @author Francesco Mangiacrapa francesco.mangiacrapa@isti.cnr.it + * @author Francesco Mangiacrapa francesco.mangiacrapaATisti.cnr.it * Nov 25, 2016 */ public class WsUtil { diff --git a/src/main/java/org/gcube/portlets/user/workspace/server/util/resource/PropertySpecialFolderReader.java b/src/main/java/org/gcube/portlets/user/workspace/server/util/resource/PropertySpecialFolderReader.java index 14f0427..aae2e97 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/server/util/resource/PropertySpecialFolderReader.java +++ b/src/main/java/org/gcube/portlets/user/workspace/server/util/resource/PropertySpecialFolderReader.java @@ -11,8 +11,8 @@ import org.apache.log4j.Logger; import org.gcube.portlets.user.workspace.client.ConstantsExplorer; /** - * @author Francesco Mangiacrapa francesco.mangiacrapa@isti.cnr.it - * @Mar 5, 2014 + * @author Francesco Mangiacrapa francesco.mangiacrapaATisti.cnr.it + * Mar 5, 2014 * */ public class PropertySpecialFolderReader { diff --git a/src/main/java/org/gcube/portlets/user/workspace/shared/AllowAccess.java b/src/main/java/org/gcube/portlets/user/workspace/shared/AllowAccess.java deleted file mode 100644 index 1f4656e..0000000 --- a/src/main/java/org/gcube/portlets/user/workspace/shared/AllowAccess.java +++ /dev/null @@ -1,147 +0,0 @@ -/** - * - */ -package org.gcube.portlets.user.workspace.shared; - -import java.io.Serializable; - - -/** - * - * @author Francesco Mangiacrapa francesco.mangiacrapa@isti.cnr.it - * Nov 29, 2016 - */ -public class AllowAccess implements Serializable{ - - /** - * - */ - private static final long serialVersionUID = -2180345568585856822L; - - private String itemId; - private Boolean accessGranted = false; - private String accessAllowDenyMotivation; - private String error; - - /** - * - */ - public AllowAccess() { - } - - public AllowAccess(String itemId){ - - } - - /** - * @param itemId - * @param accessGranted - * @param accessAllowDenyMotivation - * @param error - */ - public AllowAccess( - String itemId, Boolean accessGranted, String accessAllowDenyMotivation, - String error) { - - super(); - this.itemId = itemId; - this.accessGranted = accessGranted; - this.accessAllowDenyMotivation = accessAllowDenyMotivation; - this.error = error; - } - - - /** - * @return the itemId - */ - public String getItemId() { - - return itemId; - } - - - /** - * @return the accessGranted - */ - public Boolean getAccessGranted() { - - return accessGranted; - } - - - /** - * @return the accessAllowDenyMotivation - */ - public String getAccessAllowDenyMotivation() { - - return accessAllowDenyMotivation; - } - - - /** - * @return the error - */ - public String getError() { - - return error; - } - - - /** - * @param itemId the itemId to set - */ - public void setItemId(String itemId) { - - this.itemId = itemId; - } - - - /** - * @param accessGranted the accessGranted to set - */ - public void setAccessGranted(Boolean accessGranted) { - - this.accessGranted = accessGranted; - } - - - /** - * @param accessAllowDenyMotivation the accessAllowDenyMotivation to set - */ - public void setAccessAllowDenyMotivation(String accessAllowDenyMotivation) { - - this.accessAllowDenyMotivation = accessAllowDenyMotivation; - } - - - /** - * @param error the error to set - */ - public void setError(String error) { - - this.error = error; - } - - /* (non-Javadoc) - * @see java.lang.Object#toString() - */ - @Override - public String toString() { - - StringBuilder builder = new StringBuilder(); - builder.append("AllowAccess [itemId="); - builder.append(itemId); - builder.append(", accessGranted="); - builder.append(accessGranted); - builder.append(", accessAllowDenyMotivation="); - builder.append(accessAllowDenyMotivation); - builder.append(", error="); - builder.append(error); - builder.append("]"); - return builder.toString(); - } - - - - -} diff --git a/src/main/java/org/gcube/portlets/user/workspace/shared/ContactLogin.java b/src/main/java/org/gcube/portlets/user/workspace/shared/ContactLogin.java index 91a3825..f7e7e71 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/shared/ContactLogin.java +++ b/src/main/java/org/gcube/portlets/user/workspace/shared/ContactLogin.java @@ -6,7 +6,7 @@ package org.gcube.portlets.user.workspace.shared; /** * The Interface ContactLogin. * - * @author Francesco Mangiacrapa francesco.mangiacrapa@isti.cnr.it + * @author Francesco Mangiacrapa francesco.mangiacrapaATisti.cnr.it * Nov 4, 2015 */ public interface ContactLogin { diff --git a/src/main/java/org/gcube/portlets/user/workspace/shared/ExtendedWorkspaceACL.java b/src/main/java/org/gcube/portlets/user/workspace/shared/ExtendedWorkspaceACL.java deleted file mode 100644 index ebcb4e0..0000000 --- a/src/main/java/org/gcube/portlets/user/workspace/shared/ExtendedWorkspaceACL.java +++ /dev/null @@ -1,84 +0,0 @@ -package org.gcube.portlets.user.workspace.shared; - -/** - * - * @author Francesco Mangiacrapa francesco.mangiacrapa@isti.cnr.it - * @Feb 21, 2014 - * - */ -public class ExtendedWorkspaceACL extends WorkspaceACL{ - - /** - * - */ - private static final long serialVersionUID = 5272059977475806564L; - - - private String loginOwner; - private String workspaceItemId; - - - private boolean isBaseSharedFolder; - - /** - * - */ - public ExtendedWorkspaceACL() { - } - - /** - * @param id - * @param label - * @param defaultValue - * @param userType - * @param description - * @param loginOwner - * @param workspaceItemId - */ - public ExtendedWorkspaceACL(String id, String label, boolean defaultValue, USER_TYPE userType, String description, String loginOwner, String workspaceItemId, boolean isBaseSharedFolder) { - super(id, label, defaultValue, userType, description); - this.loginOwner = loginOwner; - this.workspaceItemId = workspaceItemId; - this.isBaseSharedFolder = isBaseSharedFolder; - } - - - - - public String getLoginOwner() { - return loginOwner; - } - - public String getWorkspaceItemId() { - return workspaceItemId; - } - - public void setLoginOwner(String loginOwner) { - this.loginOwner = loginOwner; - } - - public void setWorkspaceItemId(String workspaceItemId) { - this.workspaceItemId = workspaceItemId; - } - - public boolean isBaseSharedFolder() { - return isBaseSharedFolder; - } - - public void setBaseSharedFolder(boolean isBaseSharedFolder) { - this.isBaseSharedFolder = isBaseSharedFolder; - } - - @Override - public String toString() { - StringBuilder builder = new StringBuilder(); - builder.append("ExtendedWorkspaceACL [loginOwner="); - builder.append(loginOwner); - builder.append(", workspaceItemId="); - builder.append(workspaceItemId); - builder.append(", isBaseSharedFolder="); - builder.append(isBaseSharedFolder); - builder.append("]"); - return builder.toString(); - } -} diff --git a/src/main/java/org/gcube/portlets/user/workspace/shared/GarbageItem.java b/src/main/java/org/gcube/portlets/user/workspace/shared/GarbageItem.java index ba96073..40eb1ae 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/shared/GarbageItem.java +++ b/src/main/java/org/gcube/portlets/user/workspace/shared/GarbageItem.java @@ -8,7 +8,7 @@ import java.io.Serializable; /** * The Class GarbageItem. * - * @author Francesco Mangiacrapa francesco.mangiacrapa@isti.cnr.it Oct 23, 2015 + * @author Francesco Mangiacrapa francesco.mangiacrapaATisti.cnr.it Oct 23, 2015 * * USED TO SEND NOTIFICATION AFTER DELETE */ diff --git a/src/main/java/org/gcube/portlets/user/workspace/shared/ListContact.java b/src/main/java/org/gcube/portlets/user/workspace/shared/ListContact.java index cdcea88..0b70e05 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/shared/ListContact.java +++ b/src/main/java/org/gcube/portlets/user/workspace/shared/ListContact.java @@ -6,44 +6,35 @@ package org.gcube.portlets.user.workspace.shared; import java.io.Serializable; import java.util.ArrayList; +import org.gcube.portlets.widgets.workspacesharingwidget.shared.InfoContactModel; + /** * - * @author Francesco Mangiacrapa francesco.mangiacrapa@isti.cnr.it + * @author Francesco Mangiacrapa francesco.mangiacrapaATisti.cnr.it * Nov 4, 2015 */ -public class ListContact extends ArrayList implements Serializable{ +public class ListContact extends ArrayList implements Serializable{ - /** - * - */ private static final long serialVersionUID = 544202687567940083L; - /** - * - */ public ListContact() { } - - /* (non-Javadoc) - * @see java.util.ArrayList#contains(java.lang.Object) - */ - @Override - public boolean contains(Object o) { + + public boolean contains(InfoContactModel infoContactModel) { - if(o==null) + if(infoContactModel==null) return false; - ContactLogin contact = (ContactLogin) o; - if(contact.getLogin()==null) + if(infoContactModel.getLogin()==null) return false; for (int i = 0; i < this.size(); i++){ - ContactLogin log = get(i); - if (log.getLogin()!=null && log.getLogin().compareTo(contact.getLogin())==0) + InfoContactModel log = get(i); + if (log.getLogin()!=null && log.getLogin().compareTo(infoContactModel.getLogin())==0) return true; } diff --git a/src/main/java/org/gcube/portlets/user/workspace/shared/PublicLink.java b/src/main/java/org/gcube/portlets/user/workspace/shared/PublicLink.java index 6e286c4..d259397 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/shared/PublicLink.java +++ b/src/main/java/org/gcube/portlets/user/workspace/shared/PublicLink.java @@ -9,7 +9,7 @@ import java.io.Serializable; /** * The Class PublicLink. * - * @author Francesco Mangiacrapa francesco.mangiacrapa@isti.cnr.it + * @author Francesco Mangiacrapa francesco.mangiacrapaATisti.cnr.it * Sep 13, 2016 */ public class PublicLink implements Serializable { diff --git a/src/main/java/org/gcube/portlets/user/workspace/shared/ReportAssignmentACL.java b/src/main/java/org/gcube/portlets/user/workspace/shared/ReportAssignmentACL.java deleted file mode 100644 index cd8fd06..0000000 --- a/src/main/java/org/gcube/portlets/user/workspace/shared/ReportAssignmentACL.java +++ /dev/null @@ -1,88 +0,0 @@ -/** - * - */ -package org.gcube.portlets.user.workspace.shared; - -import java.io.Serializable; -import java.util.List; - -/** - * - * @author Francesco Mangiacrapa francesco.mangiacrapa@isti.cnr.it - * Mar 6, 2015 - */ -public class ReportAssignmentACL implements Serializable{ - - /** - * - */ - private static final long serialVersionUID = -7218122043660957432L; - - private List validLogins; - private List errors; - private String aclType; - - /** - * - */ - public ReportAssignmentACL() { - } - - /** - * @return the validLogins - */ - public List getValidLogins() { - return validLogins; - } - - /** - * @param validLogins the validLogins to set - */ - public void setValidLogins(List validLogins) { - this.validLogins = validLogins; - } - - /** - * @return the errors - */ - public List getErrors() { - return errors; - } - - /** - * @param errors the errors to set - */ - public void setErrors(List errors) { - this.errors = errors; - } - - /** - * @return the aclType - */ - public String getAclType() { - return aclType; - } - - /** - * @param aclType the aclType to set - */ - public void setAclType(String aclType) { - this.aclType = aclType; - } - - /* (non-Javadoc) - * @see java.lang.Object#toString() - */ - @Override - public String toString() { - StringBuilder builder = new StringBuilder(); - builder.append("ReportValidationACL [validLogins="); - builder.append(validLogins); - builder.append(", errors="); - builder.append(errors); - builder.append(", aclType="); - builder.append(aclType); - builder.append("]"); - return builder.toString(); - } -} diff --git a/src/main/java/org/gcube/portlets/user/workspace/shared/SessionExpiredException.java b/src/main/java/org/gcube/portlets/user/workspace/shared/SessionExpiredException.java index 36639a8..33c7208 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/shared/SessionExpiredException.java +++ b/src/main/java/org/gcube/portlets/user/workspace/shared/SessionExpiredException.java @@ -4,8 +4,8 @@ package org.gcube.portlets.user.workspace.shared; /** - * @author Francesco Mangiacrapa francesco.mangiacrapa@isti.cnr.it - * @Sep 4, 2013 + * @author Francesco Mangiacrapa francesco.mangiacrapaATisti.cnr.it + * Sep 4, 2013 * */ public class SessionExpiredException extends Exception{ diff --git a/src/main/java/org/gcube/portlets/user/workspace/shared/TrashContent.java b/src/main/java/org/gcube/portlets/user/workspace/shared/TrashContent.java index da49bc1..ef56a16 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/shared/TrashContent.java +++ b/src/main/java/org/gcube/portlets/user/workspace/shared/TrashContent.java @@ -9,8 +9,8 @@ import java.util.List; import org.gcube.portlets.user.workspace.client.model.FileTrashedModel; /** - * @author Francesco Mangiacrapa francesco.mangiacrapa@isti.cnr.it - * @Feb 17, 2014 + * @author Francesco Mangiacrapa francesco.mangiacrapaATisti.cnr.it + * Feb 17, 2014 * */ public class TrashContent implements Serializable{ diff --git a/src/main/java/org/gcube/portlets/user/workspace/shared/TrashOperationContent.java b/src/main/java/org/gcube/portlets/user/workspace/shared/TrashOperationContent.java index 2c381d7..9743f4e 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/shared/TrashOperationContent.java +++ b/src/main/java/org/gcube/portlets/user/workspace/shared/TrashOperationContent.java @@ -6,8 +6,8 @@ package org.gcube.portlets.user.workspace.shared; import java.util.List; /** - * @author Francesco Mangiacrapa francesco.mangiacrapa@isti.cnr.it - * @Feb 17, 2014 + * @author Francesco Mangiacrapa francesco.mangiacrapaATisti.cnr.it + * Feb 17, 2014 * */ public class TrashOperationContent extends TrashContent{ diff --git a/src/main/java/org/gcube/portlets/user/workspace/shared/WorkspaceACL.java b/src/main/java/org/gcube/portlets/user/workspace/shared/WorkspaceACL.java deleted file mode 100644 index 05cfad2..0000000 --- a/src/main/java/org/gcube/portlets/user/workspace/shared/WorkspaceACL.java +++ /dev/null @@ -1,100 +0,0 @@ -package org.gcube.portlets.user.workspace.shared; - -import java.io.Serializable; - - -/** - * - * @author Francesco Mangiacrapa francesco.mangiacrapa@isti.cnr.it - * @Feb 21, 2014 - * - */ -public class WorkspaceACL implements Serializable{ - - /** - * - */ - private static final long serialVersionUID = -1682851324671600049L; - - private String id; - private String label; - private boolean defaultValue; - private USER_TYPE userType; - - private String description; - - - public enum USER_TYPE{ADMINISTRATOR, GROUP, OWNER, OTHER}; - - public WorkspaceACL(String id, String label, boolean defaultValue, USER_TYPE userType, String description) { - super(); - this.id = id; - this.label = label; - this.defaultValue = defaultValue; - this.userType = userType; - this.description = description; - } - - - public WorkspaceACL() { - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getLabel() { - return label; - } - - public void setLabel(String label) { - this.label = label; - } - - public boolean getDefaultValue() { - return defaultValue; - } - - public void setDefaultValue(boolean defaultValue) { - this.defaultValue = defaultValue; - } - - public USER_TYPE getUserType() { - return userType; - } - - public void setUserType(USER_TYPE userType) { - this.userType = userType; - } - - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - - @Override - public String toString() { - StringBuilder builder = new StringBuilder(); - builder.append("WorkspaceACL [id="); - builder.append(id); - builder.append(", label="); - builder.append(label); - builder.append(", defaultValue="); - builder.append(defaultValue); - builder.append(", userType="); - builder.append(userType); - builder.append(", description="); - builder.append(description); - builder.append("]"); - return builder.toString(); - } -} diff --git a/src/main/java/org/gcube/portlets/user/workspace/shared/WorkspaceOperationResult.java b/src/main/java/org/gcube/portlets/user/workspace/shared/WorkspaceOperationResult.java index 77fdf39..c1ae7b0 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/shared/WorkspaceOperationResult.java +++ b/src/main/java/org/gcube/portlets/user/workspace/shared/WorkspaceOperationResult.java @@ -12,7 +12,7 @@ import com.google.gwt.user.client.rpc.IsSerializable; /** * The Class WorkspaceOperationResult. * - * @author Francesco Mangiacrapa at ISTI-CNR (francesco.mangiacrapa@isti.cnr.it) + * @author Francesco Mangiacrapa at ISTI-CNR (francesco.mangiacrapaATisti.cnr.it) * Oct 8, 2018 */ public class WorkspaceOperationResult implements Serializable, IsSerializable{ diff --git a/src/main/java/org/gcube/portlets/user/workspace/shared/WorkspaceTrashOperation.java b/src/main/java/org/gcube/portlets/user/workspace/shared/WorkspaceTrashOperation.java index 3ab8c63..e27c1db 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/shared/WorkspaceTrashOperation.java +++ b/src/main/java/org/gcube/portlets/user/workspace/shared/WorkspaceTrashOperation.java @@ -8,8 +8,8 @@ import java.util.List; /** * - * @author Francesco Mangiacrapa francesco.mangiacrapa@isti.cnr.it - * @Feb 17, 2014 + * @author Francesco Mangiacrapa francesco.mangiacrapaATisti.cnr.it + * Feb 17, 2014 * */ public enum WorkspaceTrashOperation { diff --git a/src/main/java/org/gcube/portlets/user/workspace/shared/WorkspaceUserQuote.java b/src/main/java/org/gcube/portlets/user/workspace/shared/WorkspaceUserQuote.java index f58d582..9c3eea0 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/shared/WorkspaceUserQuote.java +++ b/src/main/java/org/gcube/portlets/user/workspace/shared/WorkspaceUserQuote.java @@ -6,8 +6,8 @@ package org.gcube.portlets.user.workspace.shared; import java.io.Serializable; /** - * @author Francesco Mangiacrapa francesco.mangiacrapa@isti.cnr.it - * @Oct 31, 2014 + * @author Francesco Mangiacrapa francesco.mangiacrapaATisti.cnr.it + * Oct 31, 2014 * */ public class WorkspaceUserQuote implements Serializable{ diff --git a/src/main/java/org/gcube/portlets/user/workspace/shared/WorkspaceVersioningOperation.java b/src/main/java/org/gcube/portlets/user/workspace/shared/WorkspaceVersioningOperation.java index 353a1e3..c9713b1 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/shared/WorkspaceVersioningOperation.java +++ b/src/main/java/org/gcube/portlets/user/workspace/shared/WorkspaceVersioningOperation.java @@ -8,8 +8,8 @@ import java.util.List; /** * - * @author Francesco Mangiacrapa francesco.mangiacrapa@isti.cnr.it - * @Feb 17, 2014 + * @author Francesco Mangiacrapa francesco.mangiacrapaATisti.cnr.it + * Feb 17, 2014 * */ public enum WorkspaceVersioningOperation { diff --git a/src/main/java/org/gcube/portlets/user/workspace/shared/accounting/GxtAccountingEntryType.java b/src/main/java/org/gcube/portlets/user/workspace/shared/accounting/GxtAccountingEntryType.java index 27aa182..4ceaeb9 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/shared/accounting/GxtAccountingEntryType.java +++ b/src/main/java/org/gcube/portlets/user/workspace/shared/accounting/GxtAccountingEntryType.java @@ -7,7 +7,7 @@ package org.gcube.portlets.user.workspace.shared.accounting; /** * The Enum GxtAccountingEntryType. * - * @author Francesco Mangiacrapa francesco.mangiacrapa@isti.cnr.it + * @author Francesco Mangiacrapa francesco.mangiacrapaATisti.cnr.it * Sep 28, 2016 */ public enum GxtAccountingEntryType { diff --git a/src/main/java/org/gcube/portlets/user/workspace/shared/accounting/GxtAccountingField.java b/src/main/java/org/gcube/portlets/user/workspace/shared/accounting/GxtAccountingField.java index 594460c..0f790f1 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/shared/accounting/GxtAccountingField.java +++ b/src/main/java/org/gcube/portlets/user/workspace/shared/accounting/GxtAccountingField.java @@ -3,12 +3,14 @@ package org.gcube.portlets.user.workspace.shared.accounting; import java.io.Serializable; import java.util.Date; -import org.gcube.portlets.user.workspace.client.model.InfoContactModel; +import org.gcube.portlets.widgets.workspacesharingwidget.shared.InfoContactModel; + + /** * - * @author Francesco Mangiacrapa francesco.mangiacrapa@isti.cnr.it - * @May 23, 2013 + * @author Francesco Mangiacrapa francesco.mangiacrapaATisti.cnr.it + * May 23, 2013 * */ public class GxtAccountingField implements Serializable { diff --git a/src/test/java/org/gcube/portlets/user/workspace/BasicDNDExample.java b/src/test/java/org/gcube/portlets/user/workspace/BasicDNDExample.java index 0e2660d..9e6af65 100644 --- a/src/test/java/org/gcube/portlets/user/workspace/BasicDNDExample.java +++ b/src/test/java/org/gcube/portlets/user/workspace/BasicDNDExample.java @@ -17,7 +17,7 @@ import com.extjs.gxt.ui.client.widget.treepanel.TreePanel; import com.google.gwt.user.client.Element; /** - * @author Francesco Mangiacrapa francesco.mangiacrapa@isti.cnr.it + * @author Francesco Mangiacrapa francesco.mangiacrapaATisti.cnr.it * */ public class BasicDNDExample extends LayoutContainer { diff --git a/src/test/java/org/gcube/portlets/user/workspace/CreateSharedFolder.java b/src/test/java/org/gcube/portlets/user/workspace/CreateSharedFolder.java index cbdfa65..e5be62a 100644 --- a/src/test/java/org/gcube/portlets/user/workspace/CreateSharedFolder.java +++ b/src/test/java/org/gcube/portlets/user/workspace/CreateSharedFolder.java @@ -23,7 +23,7 @@ import org.gcube.common.scope.impl.ScopeBean; /** * - * @author Francesco Mangiacrapa francesco.mangiacrapa@isti.cnr.it Jul 14, 2015 + * @author Francesco Mangiacrapa francesco.mangiacrapaATisti.cnr.it Jul 14, 2015 */ public class CreateSharedFolder { diff --git a/src/test/java/org/gcube/portlets/user/workspace/DataMinerTest.java b/src/test/java/org/gcube/portlets/user/workspace/DataMinerTest.java index f526186..7c56ae5 100644 --- a/src/test/java/org/gcube/portlets/user/workspace/DataMinerTest.java +++ b/src/test/java/org/gcube/portlets/user/workspace/DataMinerTest.java @@ -10,7 +10,7 @@ import java.net.URL; /** * - * @author Francesco Mangiacrapa francesco.mangiacrapa@isti.cnr.it + * @author Francesco Mangiacrapa francesco.mangiacrapaATisti.cnr.it * May 9, 2016 */ public class DataMinerTest { diff --git a/src/test/java/org/gcube/portlets/user/workspace/DeleteTest.java b/src/test/java/org/gcube/portlets/user/workspace/DeleteTest.java index 08816b2..7e9cb65 100644 --- a/src/test/java/org/gcube/portlets/user/workspace/DeleteTest.java +++ b/src/test/java/org/gcube/portlets/user/workspace/DeleteTest.java @@ -22,7 +22,7 @@ import org.gcube.portlets.user.workspace.server.GWTWorkspaceBuilder; /** * - * @author Francesco Mangiacrapa francesco.mangiacrapa@isti.cnr.it + * @author Francesco Mangiacrapa francesco.mangiacrapaATisti.cnr.it * Oct 28, 2015 */ public class DeleteTest { diff --git a/src/test/java/org/gcube/portlets/user/workspace/DephtVisitDonwloadFilesTester.java b/src/test/java/org/gcube/portlets/user/workspace/DephtVisitDonwloadFilesTester.java index 8bd2508..32a5f07 100644 --- a/src/test/java/org/gcube/portlets/user/workspace/DephtVisitDonwloadFilesTester.java +++ b/src/test/java/org/gcube/portlets/user/workspace/DephtVisitDonwloadFilesTester.java @@ -24,7 +24,7 @@ import org.gcube.common.scope.api.ScopeProvider; import org.gcube.common.scope.impl.ScopeBean; /** - * @author Francesco Mangiacrapa francesco.mangiacrapa@isti.cnr.it + * @author Francesco Mangiacrapa francesco.mangiacrapaATisti.cnr.it * @Dec 17, 2013 * */ diff --git a/src/test/java/org/gcube/portlets/user/workspace/DonwloadServletTest.java b/src/test/java/org/gcube/portlets/user/workspace/DonwloadServletTest.java index 23acfab..c89bc57 100644 --- a/src/test/java/org/gcube/portlets/user/workspace/DonwloadServletTest.java +++ b/src/test/java/org/gcube/portlets/user/workspace/DonwloadServletTest.java @@ -16,8 +16,8 @@ import org.gcube.common.homelibrary.home.workspace.folder.FolderItem; import org.gcube.common.homelibrary.home.workspace.folder.items.ExternalFile; /** - * @author Francesco Mangiacrapa francesco.mangiacrapa@isti.cnr.it - * @Jun 18, 2013 + * @author Francesco Mangiacrapa francesco.mangiacrapaATisti.cnr.it + * Jun 18, 2013 * */ public class DonwloadServletTest { diff --git a/src/test/java/org/gcube/portlets/user/workspace/EditPermissionsTest.java b/src/test/java/org/gcube/portlets/user/workspace/EditPermissionsTest.java deleted file mode 100644 index 1f70a81..0000000 --- a/src/test/java/org/gcube/portlets/user/workspace/EditPermissionsTest.java +++ /dev/null @@ -1,174 +0,0 @@ -/** - * - */ -package org.gcube.portlets.user.workspace; - -import java.util.ArrayList; -import java.util.List; -import java.util.Map; - -import org.gcube.common.homelibrary.home.HomeLibrary; -import org.gcube.common.homelibrary.home.exceptions.HomeNotFoundException; -import org.gcube.common.homelibrary.home.exceptions.InternalErrorException; -import org.gcube.common.homelibrary.home.exceptions.UserNotFoundException; -import org.gcube.common.homelibrary.home.workspace.Workspace; -import org.gcube.common.homelibrary.home.workspace.WorkspaceFolder; -import org.gcube.common.homelibrary.home.workspace.accessmanager.ACLType; -import org.gcube.common.homelibrary.home.workspace.exceptions.ItemNotFoundException; -import org.gcube.common.homelibrary.home.workspace.exceptions.WorkspaceFolderNotFoundException; -import org.gcube.common.scope.api.ScopeProvider; -import org.gcube.common.scope.impl.ScopeBean; -import org.gcube.portlets.user.workspace.server.util.AclTypeComparator; -import org.gcube.portlets.user.workspace.shared.ReportAssignmentACL; - -/** - * - * @author Francesco Mangiacrapa francesco.mangiacrapa@isti.cnr.it - * @Jan 29, 2014 - * - */ -public class EditPermissionsTest { - - -// public static String DEFAULT_SCOPE = "/d4science.research-infrastructures.eu/gCubeApps"; //PRODUCTION - public static String DEFAULT_SCOPE = "/gcube/devsec"; //DEV - public static String TEST_USER = "francesco.mangiacrapa"; -// public static String ITEMID = "63832213-098d-42d1-8774-89b6349764c0"; //Activity T3.4 working drafts/T2-EC-IMAR-HO-14-015 iMarine Sustainability WP - Business Model tools.pdf -// public static String ITEMID = "42fa2601-39d0-4951-aabf-27d2a2f1dca7"; - -// protected static Logger logger = Logger.getLogger(EditPermissionsTest.class); - - - public static void main(String[] args) { - - ScopeBean scope = new ScopeBean(DEFAULT_SCOPE); - ScopeProvider.instance.set(scope.toString()); - - System.out.println("init HL"); - try { - - Workspace ws = HomeLibrary - .getHomeManagerFactory() - .getHomeManager() - .getHome(TEST_USER) - .getWorkspace(); - - WorkspaceFolder sharedFolder = (WorkspaceFolder) ws.getItem("bd5fa899-225d-4547-a3c5-79b5333cde20"); - - System.out.println(sharedFolder.getACLOwner()); - - ArrayList list = new ArrayList(); - list.add("francesco.mangiacrapa"); - list.add("massimiliano.assante"); - list.add("pasquale.pagano"); - list.add("valentina.marioli"); - - validateACLToUser(sharedFolder, list, ACLType.READ_ONLY.toString()); - - } catch (WorkspaceFolderNotFoundException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (InternalErrorException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (HomeNotFoundException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (UserNotFoundException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (ItemNotFoundException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (Exception e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - - } - - - private static ReportAssignmentACL validateACLToUser(WorkspaceFolder folder, List listLogins, String aclType) throws Exception { - - ReportAssignmentACL reportValidation = new ReportAssignmentACL(); - - try { - - Map> mapACL = folder.getACLOwner(); - - ACLType settingACL = ACLType.valueOf(aclType); - - System.out.println("Tentative setting: "+settingACL); - System.out.println("For Logins: "+listLogins); - - AclTypeComparator comparator = new AclTypeComparator(); - - List admins = mapACL.get(ACLType.ADMINISTRATOR); - - for (String admin : admins) { - listLogins.remove(admin); - System.out.println("Reject username: "+admin +" as "+ACLType.ADMINISTRATOR); - } - - List validLogins = new ArrayList(listLogins); - List errors = new ArrayList(); - - - for (String username : listLogins) { - System.out.println("\nChecking username: "+username); - for (ACLType aclHL : mapACL.keySet()) { - - if(!aclHL.equals(ACLType.ADMINISTRATOR)){ - List loginsHL = mapACL.get(aclHL); - System.out.println("to ACLType: "+aclHL +", logins found: "+loginsHL); - - if(loginsHL.contains(username)){ - int cmp = comparator.compare(settingACL, aclHL); - System.out.println("Compare result between "+aclHL + " and "+settingACL +": "+cmp); - if(cmp==-1){ - //CHANGE ACL IS NOT VALID - System.out.println("Reject ACL: "+settingACL+ " to "+username); - validLogins.remove(username); - //TODO FULL NAME - errors.add("Unable for "+username+ " the grant of the privilege '"+settingACL+", it's lower than (already assigned) "+ aclHL); - break; - }else if(cmp==0){ - //SAME ACL - System.out.println("Skipping ACL: "+settingACL+ " to "+username); - //TODO FULL NAME - errors.add("Ignoring for "+username+ " the grant of the privilege '"+settingACL+", it's already assigned"); - validLogins.remove(username); - break; - }else if(cmp==1){ - //CHANGE ACL IS VALID - System.out.println("Valid ACL: "+settingACL+ " to "+username); - } - }else{ - //CHANGE ACL IS VALID - System.out.println("[Login not found], Set ACL: "+settingACL+ " to "+username); - } - } - } - } - - System.out.println("\n"); - for (String username : validLogins) { - System.out.println("Set ACL: "+settingACL+ " to "+username); - } - - - System.out.println("\n"); - for (String error : errors) { - System.out.println(error); - } - reportValidation.setAclType(aclType); - reportValidation.setErrors(errors); - reportValidation.setValidLogins(validLogins); - return reportValidation; - - } catch (InternalErrorException e) { - throw new Exception("Sorry, an error occurred when validating ACL assignment, try again later"); - } - } - -} diff --git a/src/test/java/org/gcube/portlets/user/workspace/GcubeProperties.java b/src/test/java/org/gcube/portlets/user/workspace/GcubeProperties.java index 33324df..01647e8 100644 --- a/src/test/java/org/gcube/portlets/user/workspace/GcubeProperties.java +++ b/src/test/java/org/gcube/portlets/user/workspace/GcubeProperties.java @@ -15,7 +15,7 @@ import org.gcube.common.scope.impl.ScopeBean; /** * - * @author Francesco Mangiacrapa francesco.mangiacrapa@isti.cnr.it + * @author Francesco Mangiacrapa francesco.mangiacrapaATisti.cnr.it * Jun 12, 2015 */ public class GcubeProperties { diff --git a/src/test/java/org/gcube/portlets/user/workspace/GoogleUrlShortener.java b/src/test/java/org/gcube/portlets/user/workspace/GoogleUrlShortener.java index 1a50dac..66d5a75 100644 --- a/src/test/java/org/gcube/portlets/user/workspace/GoogleUrlShortener.java +++ b/src/test/java/org/gcube/portlets/user/workspace/GoogleUrlShortener.java @@ -4,8 +4,8 @@ package org.gcube.portlets.user.workspace; /** - * @author Francesco Mangiacrapa francesco.mangiacrapa@isti.cnr.it - * @Jun 28, 2013 + * @author Francesco Mangiacrapa francesco.mangiacrapaATisti.cnr.it + * Jun 28, 2013 * */ import java.io.BufferedReader; diff --git a/src/test/java/org/gcube/portlets/user/workspace/HttpCallerUtil.java b/src/test/java/org/gcube/portlets/user/workspace/HttpCallerUtil.java index d6fd273..ffbaa12 100644 --- a/src/test/java/org/gcube/portlets/user/workspace/HttpCallerUtil.java +++ b/src/test/java/org/gcube/portlets/user/workspace/HttpCallerUtil.java @@ -20,8 +20,8 @@ import org.apache.commons.httpclient.methods.PostMethod; import org.apache.commons.httpclient.params.HttpMethodParams; /** - * @author Francesco Mangiacrapa francesco.mangiacrapa@isti.cnr.it - * @Jun 4, 2013 + * @author Francesco Mangiacrapa francesco.mangiacrapaATisti.cnr.it + * Jun 4, 2013 * */ public class HttpCallerUtil { diff --git a/src/test/java/org/gcube/portlets/user/workspace/ItemCreate.java b/src/test/java/org/gcube/portlets/user/workspace/ItemCreate.java index 3533368..989578b 100644 --- a/src/test/java/org/gcube/portlets/user/workspace/ItemCreate.java +++ b/src/test/java/org/gcube/portlets/user/workspace/ItemCreate.java @@ -23,8 +23,8 @@ import org.gcube.common.scope.impl.ScopeBean; /** * - * @author Francesco Mangiacrapa francesco.mangiacrapa@isti.cnr.it - * @Jan 29, 2014 + * @author Francesco Mangiacrapa francesco.mangiacrapaATisti.cnr.it + * Jan 29, 2014 * */ public class ItemCreate { diff --git a/src/test/java/org/gcube/portlets/user/workspace/ItemRetrieve.java b/src/test/java/org/gcube/portlets/user/workspace/ItemRetrieve.java index e30352b..53868c4 100644 --- a/src/test/java/org/gcube/portlets/user/workspace/ItemRetrieve.java +++ b/src/test/java/org/gcube/portlets/user/workspace/ItemRetrieve.java @@ -22,8 +22,8 @@ import org.gcube.common.scope.impl.ScopeBean; /** * - * @author Francesco Mangiacrapa francesco.mangiacrapa@isti.cnr.it - * @Jan 29, 2014 + * @author Francesco Mangiacrapa francesco.mangiacrapaATisti.cnr.it + * Jan 29, 2014 * */ public class ItemRetrieve { diff --git a/src/test/java/org/gcube/portlets/user/workspace/PublicLinkTest.java b/src/test/java/org/gcube/portlets/user/workspace/PublicLinkTest.java index 34779e3..c00e1c4 100644 --- a/src/test/java/org/gcube/portlets/user/workspace/PublicLinkTest.java +++ b/src/test/java/org/gcube/portlets/user/workspace/PublicLinkTest.java @@ -21,8 +21,8 @@ import org.gcube.common.scope.api.ScopeProvider; import org.gcube.common.scope.impl.ScopeBean; /** - * @author Francesco Mangiacrapa francesco.mangiacrapa@isti.cnr.it - * @Jul 3, 2013 + * @author Francesco Mangiacrapa francesco.mangiacrapaATisti.cnr.it + * Jul 3, 2013 * */ public class PublicLinkTest { diff --git a/src/test/java/org/gcube/portlets/user/workspace/SearchTextTest.java b/src/test/java/org/gcube/portlets/user/workspace/SearchTextTest.java index 29d52c3..51049b8 100644 --- a/src/test/java/org/gcube/portlets/user/workspace/SearchTextTest.java +++ b/src/test/java/org/gcube/portlets/user/workspace/SearchTextTest.java @@ -15,8 +15,8 @@ import org.gcube.portlets.user.workspace.client.model.FileGridModel; import org.gcube.portlets.user.workspace.server.GWTWorkspaceBuilder; /** - * @author Francesco Mangiacrapa francesco.mangiacrapa@isti.cnr.it - * @Jul 3, 2013 + * @author Francesco Mangiacrapa francesco.mangiacrapaATisti.cnr.it + * Jul 3, 2013 * */ public class SearchTextTest { diff --git a/src/test/java/org/gcube/portlets/user/workspace/SinglePublicLinkTest.java b/src/test/java/org/gcube/portlets/user/workspace/SinglePublicLinkTest.java index be9e63f..2b7f774 100644 --- a/src/test/java/org/gcube/portlets/user/workspace/SinglePublicLinkTest.java +++ b/src/test/java/org/gcube/portlets/user/workspace/SinglePublicLinkTest.java @@ -23,8 +23,8 @@ import org.gcube.portlets.user.workspace.server.util.HttpRequestUtil; import org.gcube.portlets.user.workspace.server.util.StringUtil; /** - * @author Francesco Mangiacrapa francesco.mangiacrapa@isti.cnr.it - * @Jul 3, 2013 + * @author Francesco Mangiacrapa francesco.mangiacrapaATisti.cnr.it + * Jul 3, 2013 * */ public class SinglePublicLinkTest { diff --git a/src/test/java/org/gcube/portlets/user/workspace/SizeRetrieving.java b/src/test/java/org/gcube/portlets/user/workspace/SizeRetrieving.java index fa01eeb..5fc5239 100644 --- a/src/test/java/org/gcube/portlets/user/workspace/SizeRetrieving.java +++ b/src/test/java/org/gcube/portlets/user/workspace/SizeRetrieving.java @@ -17,8 +17,8 @@ import org.gcube.portlets.user.workspace.server.GWTWorkspaceBuilder; /** * - * @author Francesco Mangiacrapa francesco.mangiacrapa@isti.cnr.it - * @Jan 29, 2014 + * @author Francesco Mangiacrapa francesco.mangiacrapaATisti.cnr.it + * Jan 29, 2014 * */ public class SizeRetrieving { diff --git a/src/test/java/org/gcube/portlets/user/workspace/SmartFolderTest.java b/src/test/java/org/gcube/portlets/user/workspace/SmartFolderTest.java index 8a4f505..21b3d7e 100644 --- a/src/test/java/org/gcube/portlets/user/workspace/SmartFolderTest.java +++ b/src/test/java/org/gcube/portlets/user/workspace/SmartFolderTest.java @@ -20,7 +20,7 @@ import org.gcube.portlets.user.workspace.server.GWTWorkspaceBuilder; /** * The Class SmartFolderTest. * - * @author Francesco Mangiacrapa francesco.mangiacrapa@isti.cnr.it + * @author Francesco Mangiacrapa francesco.mangiacrapaATisti.cnr.it * Sep 29, 2016 */ public class SmartFolderTest { diff --git a/src/test/java/org/gcube/portlets/user/workspace/TestEncodeDecodeBase64.java b/src/test/java/org/gcube/portlets/user/workspace/TestEncodeDecodeBase64.java index a569337..4aaa61a 100644 --- a/src/test/java/org/gcube/portlets/user/workspace/TestEncodeDecodeBase64.java +++ b/src/test/java/org/gcube/portlets/user/workspace/TestEncodeDecodeBase64.java @@ -11,7 +11,7 @@ import org.gcube.portlets.user.workspace.server.util.StringUtil; /** * The Class TestEncodeDecodeBase64. * - * @author Francesco Mangiacrapa francesco.mangiacrapa@isti.cnr.it + * @author Francesco Mangiacrapa francesco.mangiacrapaATisti.cnr.it * Sep 19, 2016 */ public class TestEncodeDecodeBase64 { diff --git a/src/test/java/org/gcube/portlets/user/workspace/TestSync.java b/src/test/java/org/gcube/portlets/user/workspace/TestSync.java index b8a08b8..8f3eeba 100644 --- a/src/test/java/org/gcube/portlets/user/workspace/TestSync.java +++ b/src/test/java/org/gcube/portlets/user/workspace/TestSync.java @@ -20,8 +20,8 @@ import org.gcube.common.scope.impl.ScopeBean; /** * - * @author Francesco Mangiacrapa francesco.mangiacrapa@isti.cnr.it - * @Jan 29, 2014 + * @author Francesco Mangiacrapa francesco.mangiacrapaATisti.cnr.it + * Jan 29, 2014 * */ public class TestSync { diff --git a/src/test/java/org/gcube/portlets/user/workspace/TestWithTime.java b/src/test/java/org/gcube/portlets/user/workspace/TestWithTime.java index 5a975e4..0efd6e0 100644 --- a/src/test/java/org/gcube/portlets/user/workspace/TestWithTime.java +++ b/src/test/java/org/gcube/portlets/user/workspace/TestWithTime.java @@ -13,8 +13,8 @@ import org.gcube.common.scope.api.ScopeProvider; import org.junit.Test; /** - * @author Francesco Mangiacrapa francesco.mangiacrapa@isti.cnr.it - * @May 15, 2014 + * @author Francesco Mangiacrapa francesco.mangiacrapaATisti.cnr.it + * May 15, 2014 * */ public class TestWithTime { diff --git a/src/test/java/org/gcube/portlets/user/workspace/UploadServletTest.java b/src/test/java/org/gcube/portlets/user/workspace/UploadServletTest.java index 1c66a99..372f02f 100644 --- a/src/test/java/org/gcube/portlets/user/workspace/UploadServletTest.java +++ b/src/test/java/org/gcube/portlets/user/workspace/UploadServletTest.java @@ -29,7 +29,7 @@ import org.gcube.common.scope.impl.ScopeBean; /** * The Class UploadServletTest. * - * @author Francesco Mangiacrapa at ISTI-CNR (francesco.mangiacrapa@isti.cnr.it) + * @author Francesco Mangiacrapa at ISTI-CNR (francesco.mangiacrapaATisti.cnr.it) * Jul 23, 2018 */ public class UploadServletTest { diff --git a/src/test/java/org/gcube/portlets/user/workspace/UploadServletTestToken.java b/src/test/java/org/gcube/portlets/user/workspace/UploadServletTestToken.java index 775e6f5..4d69ee0 100644 --- a/src/test/java/org/gcube/portlets/user/workspace/UploadServletTestToken.java +++ b/src/test/java/org/gcube/portlets/user/workspace/UploadServletTestToken.java @@ -26,8 +26,8 @@ import org.gcube.common.scope.api.ScopeProvider; import org.gcube.common.scope.impl.ScopeBean; /** - * @author Francesco Mangiacrapa francesco.mangiacrapa@isti.cnr.it - * @Jun 20, 2013 + * @author Francesco Mangiacrapa francesco.mangiacrapaATisti.cnr.it + * Jun 20, 2013 * */ public class UploadServletTestToken { diff --git a/src/test/java/org/gcube/portlets/user/workspace/UriResolverReaderRR.java b/src/test/java/org/gcube/portlets/user/workspace/UriResolverReaderRR.java index de37351..dfa280e 100644 --- a/src/test/java/org/gcube/portlets/user/workspace/UriResolverReaderRR.java +++ b/src/test/java/org/gcube/portlets/user/workspace/UriResolverReaderRR.java @@ -30,8 +30,8 @@ import org.gcube.resources.discovery.client.api.DiscoveryClient; import org.gcube.resources.discovery.client.queries.impl.XQuery; /** - * @author Francesco Mangiacrapa francesco.mangiacrapa@isti.cnr.it - * @Jun 26, 2013 + * @author Francesco Mangiacrapa francesco.mangiacrapaATisti.cnr.it + * Jun 26, 2013 * */ public class UriResolverReaderRR { diff --git a/src/test/java/org/gcube/portlets/user/workspace/UrlEncoderUtil.java b/src/test/java/org/gcube/portlets/user/workspace/UrlEncoderUtil.java index d8e0323..99390c6 100644 --- a/src/test/java/org/gcube/portlets/user/workspace/UrlEncoderUtil.java +++ b/src/test/java/org/gcube/portlets/user/workspace/UrlEncoderUtil.java @@ -11,8 +11,8 @@ import java.util.Map; import org.apache.log4j.Logger; /** - * @author Francesco Mangiacrapa francesco.mangiacrapa@isti.cnr.it - * @Jun 4, 2013 + * @author Francesco Mangiacrapa francesco.mangiacrapaATisti.cnr.it + * Jun 4, 2013 * */ public class UrlEncoderUtil { diff --git a/src/test/java/org/gcube/portlets/user/workspace/UrlShortener.java b/src/test/java/org/gcube/portlets/user/workspace/UrlShortener.java index 4390659..e2f5949 100644 --- a/src/test/java/org/gcube/portlets/user/workspace/UrlShortener.java +++ b/src/test/java/org/gcube/portlets/user/workspace/UrlShortener.java @@ -4,8 +4,8 @@ package org.gcube.portlets.user.workspace; /** - * @author Francesco Mangiacrapa francesco.mangiacrapa@isti.cnr.it - * @Jun 28, 2013 + * @author Francesco Mangiacrapa francesco.mangiacrapaATisti.cnr.it + * Jun 28, 2013 * */ import static org.gcube.resources.discovery.icclient.ICFactory.clientFor; diff --git a/src/test/java/org/gcube/portlets/user/workspace/UrlShortenerReaderRR.java b/src/test/java/org/gcube/portlets/user/workspace/UrlShortenerReaderRR.java index 642d6e5..1654d5f 100644 --- a/src/test/java/org/gcube/portlets/user/workspace/UrlShortenerReaderRR.java +++ b/src/test/java/org/gcube/portlets/user/workspace/UrlShortenerReaderRR.java @@ -16,8 +16,8 @@ import org.gcube.resources.discovery.client.api.DiscoveryClient; import org.gcube.resources.discovery.client.queries.impl.XQuery; /** - * @author Francesco Mangiacrapa francesco.mangiacrapa@isti.cnr.it - * @Jun 26, 2013 + * @author Francesco Mangiacrapa francesco.mangiacrapaATisti.cnr.it + * Jun 26, 2013 * */ public class UrlShortenerReaderRR {