gCubeSystem
/
workspace-tree-widget
16
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Added new description and tooltip for "Add archive" 

git-svn-id: http://svn.d4science-ii.research-infrastructures.eu/gcube/trunk/portlets/user/workspace-tree-widget@95552 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Francesco Mangiacrapa 2014-05-12 12:29:29 +00:00
parent f9c805350c
commit e7fd2b7a75
4 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/org/gcube/portlets/user/workspace/client/uploader/FileUploader.java
View File

@ -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();
}

3
src/main/java/org/gcube/portlets/user/workspace/client/view/tree/ContextMenuTree.java
View File

@ -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<MenuEvent>() {

15
src/main/java/org/gcube/portlets/user/workspace/server/GWTWorkspaceServiceImpl.java
View File

@ -228,21 +228,22 @@ public class GWTWorkspaceServiceImpl extends RemoteServiceServlet implements GWT
@Override
public List<FileGridModel> 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<SearchItem> listSearchItems = workspace.searchByName(text);
workspaceLogger.info("HL search returning "+listSearchItems.size()+" items");
workspaceLogger.info("Converting "+listSearchItems.size()+" items");
GWTWorkspaceBuilder builder = getGWTWorkspaceBuilder();
List<FileGridModel> listFileGridModels = new ArrayList<FileGridModel>();
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) {

1
src/main/java/org/gcube/portlets/user/workspace/server/notifications/NotificationsUtil.java
View File

@ -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());