From 2bb5be9ffc6f416b4000662a9a1f269ebd22c2ce Mon Sep 17 00:00:00 2001 From: Francesco Mangiacrapa Date: Mon, 3 Nov 2014 13:45:36 +0000 Subject: [PATCH] updated: GetInfo, Uploader in case of error git-svn-id: http://svn.d4science-ii.research-infrastructures.eu/gcube/trunk/portlets/user/workspace-tree-widget@101368 82a268e6-3cf1-43bd-a215-b396298e98cf --- .gwt/.gwt-log | 32 +++++++++++++++++++ .../uploader/UpdateServiceUploader.java | 9 ++++-- .../client/view/windows/DialogGetInfo.java | 8 ++++- .../server/GWTWorkspaceServiceImpl.java | 24 +++++--------- 4 files changed, 53 insertions(+), 20 deletions(-) diff --git a/.gwt/.gwt-log b/.gwt/.gwt-log index 353922a..c8952b2 100644 --- a/.gwt/.gwt-log +++ b/.gwt/.gwt-log @@ -48661,3 +48661,35 @@ Compiling... Compilation completed in 0.00 seconds Removing invalidated units Finding entry point classes +Public resources found in... +Translatable source found in... +Found 0 cached/archived units. Used 0 / 2719 units from cache. +Compiling... + 10% complete (ETR: 45 seconds) + 10% complete (ETR: 45 seconds) + 20% complete (ETR: 30 seconds) + 30% complete (ETR: 20 seconds) + 40% complete (ETR: 15 seconds) + 50% complete (ETR: 11 seconds) + 60% complete (ETR: 8 seconds) + 70% complete (ETR: 6 seconds) + 80% complete (ETR: 3 seconds) + 90% complete (ETR: 2 seconds) + 100% complete (ETR: 0 seconds) + Compilation completed in 17.94 seconds +Removing invalidated units +Finding entry point classes +Public resources found in... +Translatable source found in... +Found 2719 cached/archived units. Used 2719 / 2719 units from cache. +Compiling... + Compilation completed in 0.00 seconds +Removing invalidated units +Finding entry point classes +Public resources found in... +Translatable source found in... +Found 2719 cached/archived units. Used 2719 / 2719 units from cache. +Compiling... + Compilation completed in 0.00 seconds +Removing invalidated units +Finding entry point classes diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/uploader/UpdateServiceUploader.java b/src/main/java/org/gcube/portlets/user/workspace/client/uploader/UpdateServiceUploader.java index babd637..8945516 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/client/uploader/UpdateServiceUploader.java +++ b/src/main/java/org/gcube/portlets/user/workspace/client/uploader/UpdateServiceUploader.java @@ -136,17 +136,20 @@ public class UpdateServiceUploader extends Window{ case ERROR: // new MessageBoxAlert("Error during upload", resultMessage.getMessage(), null); GWT.log("Error during upload: "+resultMessage.getMessage()); - fileUploaderDlg.getDlg().showRegisteringResult(false); +// fileUploaderDlg.getDlg().showRegisteringResult(false); + fileUploaderDlg.getDlg().showRegisteringResult(false, resultMessage.getMessage()); break; case UNKNOWN: // new MessageBoxAlert("Error during upload", resultMessage.getMessage(), null); GWT.log("Error during upload: "+resultMessage.getMessage()); - fileUploaderDlg.getDlg().showRegisteringResult(false); +// fileUploaderDlg.getDlg().showRegisteringResult(false); + fileUploaderDlg.getDlg().showRegisteringResult(false, "Error during upload: "+resultMessage.getMessage()); break; case WARN: { // new MessageBoxAlert("Upload completed with warnings", resultMessage.getMessage(), null); GWT.log("Upload completed with warnings: "+resultMessage.getMessage()); - fileUploaderDlg.getDlg().showRegisteringResult(false); +// fileUploaderDlg.getDlg().showRegisteringResult(false); + fileUploaderDlg.getDlg().showRegisteringResult(false, "Upload completed with warnings: "+resultMessage.getMessage()); break; } case OK: { 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 d03a493..f540960 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 @@ -30,7 +30,11 @@ import com.google.gwt.user.client.rpc.AsyncCallback; */ public class DialogGetInfo extends Dialog { - protected static final String UNKNOWN = "unknown"; + /** + * + */ + public static final String EMPTY = "empty"; + public static final String UNKNOWN = "unknown"; private int widthDialog = 450; private int heightTextArea = 50; private TextField txtName = new TextField(); @@ -349,6 +353,8 @@ public class DialogGetInfo extends Dialog { if(kb<1) kb=1; return number.format(kb); + }else if(value==0){ + return EMPTY; }else return ""; } 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 3559ccd..53216d0 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 @@ -2355,8 +2355,8 @@ public class GWTWorkspaceServiceImpl extends RemoteServiceServlet implements GWT System.out.println("get itemExistsInWorkpace by parentId: "+parentId); try { + Workspace workspace = getWorkspace(); - WorkspaceItem wsItem = workspace.getItem(parentId); //GET PARENT if(wsItem.getType().equals(WorkspaceItemType.FOLDER) || wsItem.getType().equals(WorkspaceItemType.SHARED_FOLDER)){ @@ -2371,15 +2371,10 @@ public class GWTWorkspaceServiceImpl extends RemoteServiceServlet implements GWT else throw new Exception("Invalid Folder parent"); - } catch (InternalErrorException e) { - return null; - } catch (ItemNotFoundException e) { - return null; - } catch (Exception e) { String error = "an error occurred on search item in folder "; workspaceLogger.error(error, e); @@ -2393,9 +2388,7 @@ public class GWTWorkspaceServiceImpl extends RemoteServiceServlet implements GWT try { Workspace workspace = getWorkspace(); - WorkspaceItem wsItem = workspace.getItem(itemId); - Calendar cl = wsItem.getCreationTime(); if(cl!=null) @@ -2412,25 +2405,24 @@ public class GWTWorkspaceServiceImpl extends RemoteServiceServlet implements GWT @Override public Long loadSizeByItemId(String itemId) throws Exception { - workspaceLogger.trace("get Size By ItemId "+ itemId); + workspaceLogger.info("get Size By ItemId "+ itemId); try { Workspace workspace = getWorkspace(); - WorkspaceItem wsItem = workspace.getItem(itemId); - Long size = new Long(-1); - if(wsItem instanceof FolderItem){ - + if(wsItem instanceof FolderItem){ //ITEM FolderItem folderItem = (FolderItem) wsItem; - size = new Long(folderItem.getLength()); - } else if (wsItem instanceof WorkspaceFolder ){ + } else if (wsItem instanceof WorkspaceFolder ){ //FOLDER WorkspaceFolder theFolder = (WorkspaceFolder) wsItem; size = theFolder.getSize(); + } else if (wsItem instanceof WorkspaceSharedFolder){ //SHARED FOLDER + WorkspaceSharedFolder theFolder = (WorkspaceSharedFolder) wsItem; + size = theFolder.getSize(); } - + workspaceLogger.info("returning size: " +size); return size; } catch (Exception e) {