From a2754c67f3aa639eca168b80d3dbc10e00e35e57 Mon Sep 17 00:00:00 2001 From: Francesco Mangiacrapa Date: Tue, 13 Oct 2015 15:24:11 +0000 Subject: [PATCH] 429: Workspace: uploading big files Task-Url: https://support.d4science.org/issues/429 Fixed bug on getProgress git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/widgets/workspace-uploader@119705 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../client/uploader/UploaderProgressView.java | 4 ++-- .../server/WorkspaceUploaderServiceImpl.java | 8 +++++++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/gcube/portlets/widgets/workspaceuploader/client/uploader/UploaderProgressView.java b/src/main/java/org/gcube/portlets/widgets/workspaceuploader/client/uploader/UploaderProgressView.java index 5bdbc2b..384ab49 100644 --- a/src/main/java/org/gcube/portlets/widgets/workspaceuploader/client/uploader/UploaderProgressView.java +++ b/src/main/java/org/gcube/portlets/widgets/workspaceuploader/client/uploader/UploaderProgressView.java @@ -30,7 +30,7 @@ import com.google.gwt.user.client.ui.VerticalPanel; public class UploaderProgressView { private VerticalPanel vp = new VerticalPanel(); - private static final int MAX_CHARS = 55; + private static final int MAX_CHARS = 50; private HorizontalPanel hp = new HorizontalPanel(); private HorizontalPanel hpBar = new HorizontalPanel(); private HTML html = new HTML(); @@ -156,7 +156,7 @@ public class UploaderProgressView { // GWT.log(text); html.setHTML(text); - if(uploader.getUploadProgress().getLastEvent()!=null) + if(uploader.getUploadProgress()!=null && uploader.getUploadProgress().getLastEvent()!=null) bar.update(uploader.getUploadProgress().getLastEvent().getReadPercentage()); else bar.update(0); diff --git a/src/main/java/org/gcube/portlets/widgets/workspaceuploader/server/WorkspaceUploaderServiceImpl.java b/src/main/java/org/gcube/portlets/widgets/workspaceuploader/server/WorkspaceUploaderServiceImpl.java index a1b137c..5f14a20 100644 --- a/src/main/java/org/gcube/portlets/widgets/workspaceuploader/server/WorkspaceUploaderServiceImpl.java +++ b/src/main/java/org/gcube/portlets/widgets/workspaceuploader/server/WorkspaceUploaderServiceImpl.java @@ -43,7 +43,13 @@ public class WorkspaceUploaderServiceImpl extends RemoteServiceServlet implement } // getThreadIds(); - logger.trace("returning uploader: "+uploader.getClientUploadKey() +" status: "+uploader.getUploadStatus() +", progress: "+uploader.getUploadProgress().getLastEvent()); + String progress = ""; + if(uploader.getUploadProgress()!=null && uploader.getUploadProgress().getLastEvent()!=null) + progress = uploader.getUploadProgress().getLastEvent().toString(); + else + progress = "upload progress is null or last event is null"; + + logger.info("returning uploader: "+uploader.getClientUploadKey() +" status: "+uploader.getUploadStatus() +", progress: "+progress); return uploader; }