diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/uploader/FileUploader.java b/src/main/java/org/gcube/portlets/user/workspace/client/uploader/FileUploader.java index 3d24155..b064413 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/client/uploader/FileUploader.java +++ b/src/main/java/org/gcube/portlets/user/workspace/client/uploader/FileUploader.java @@ -3,6 +3,7 @@ */ package org.gcube.portlets.user.workspace.client.uploader; +import org.gcube.portlets.user.workspace.client.ConstantsExplorer; import org.gcube.portlets.user.workspace.client.model.FileModel; import org.gcube.portlets.widgets.fileupload.client.view.UploadProgressDialog; @@ -36,7 +37,15 @@ public class FileUploader { */ updateServiceUploader = new UpdateServiceUploader(INSTANCE, folderParent, uploadType); - this.dlg = new UploadProgressDialog("Upload File in: "+folderParent.getName(), eventBus, true); + String caption = "Upload "; + if(uploadType.compareTo(ConstantsExplorer.ARCHIVE)==0) + caption+= " a zip Archive"; + else if(uploadType.compareTo(ConstantsExplorer.FILE)==0) + caption+= "File"; + + caption+= " in: "+folderParent.getName(); + + this.dlg = new UploadProgressDialog(caption, eventBus, true); dlg.center(); dlg.show(); } 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 7fd0aa8..28003d0 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 @@ -526,7 +526,8 @@ public class ContextMenuTree { MenuItem uploadArchive = new MenuItem(); uploadArchive.setId(WorkspaceOperation.UPLOAD_ARCHIVE.getId()); - uploadArchive.setText(ConstantsExplorer.MESSAGE_UPLOAD_ARCHIVE); + uploadArchive.setText(ConstantsExplorer.MESSAGE_UPLOAD_ARCHIVE); + uploadArchive.setToolTip("Upload a zip archive into workspace"); uploadArchive.setIcon(Resources.getIconArchiveUpload()); uploadArchive.addSelectionListener(new SelectionListener() { diff --git a/src/main/java/org/gcube/portlets/user/workspace/server/GWTWorkspaceServiceImpl.java b/src/main/java/org/gcube/portlets/user/workspace/server/GWTWorkspaceServiceImpl.java index 47ac3d7..a3ca43b 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/server/GWTWorkspaceServiceImpl.java +++ b/src/main/java/org/gcube/portlets/user/workspace/server/GWTWorkspaceServiceImpl.java @@ -228,21 +228,22 @@ public class GWTWorkspaceServiceImpl extends RemoteServiceServlet implements GWT @Override public List getItemsBySearchName(String text) throws Exception { - workspaceLogger.trace("getting search"); + workspaceLogger.info("searching by name: "+text); try { Workspace workspace = getWorkspace(); - + + workspaceLogger.info("Calling search HL.."); List listSearchItems = workspace.searchByName(text); - + workspaceLogger.info("HL search returning "+listSearchItems.size()+" items"); + + workspaceLogger.info("Converting "+listSearchItems.size()+" items"); GWTWorkspaceBuilder builder = getGWTWorkspaceBuilder(); List listFileGridModels = new ArrayList(); - - workspaceLogger.trace("Call search HL.."); - + listFileGridModels = builder.buildGXTListFileGridModelItemForSearch(listSearchItems); - workspaceLogger.trace("Search converted, completed..."); + workspaceLogger.info("Search objects converted, returning"); return listFileGridModels; } catch (Exception e) { 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 467e989..064a595 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 @@ -42,7 +42,6 @@ public class NotificationsUtil { if(folderDestinationItem!=null){ try{ - //if folder destination is shared folder if(folderDestinationItem.isShared()){ //Notify Added Item To Sharing? logger.trace("checkNotifyAddItemToShare source item: "+sourceItem.getName()+" sourceSharedId: "+sourceSharedId + " folder destination: "+folderDestinationItem.getName() + " folder destination shared folder id: "+folderDestinationItem.getIdSharedFolder());