From 79c6fdf38585112410b55783aec40ebe601f6952 Mon Sep 17 00:00:00 2001 From: Giancarlo Panichi Date: Fri, 18 Jul 2014 13:02:57 +0000 Subject: [PATCH] git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-csv-import-widget@98789 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../client/progress/CSVImportProgressBarUpdater.java | 3 +-- .../client/progress/FileUploadProgressBarUpdater.java | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/gcube/portlets/user/td/csvimportwidget/client/progress/CSVImportProgressBarUpdater.java b/src/main/java/org/gcube/portlets/user/td/csvimportwidget/client/progress/CSVImportProgressBarUpdater.java index 5eb2c75..3d36bdb 100644 --- a/src/main/java/org/gcube/portlets/user/td/csvimportwidget/client/progress/CSVImportProgressBarUpdater.java +++ b/src/main/java/org/gcube/portlets/user/td/csvimportwidget/client/progress/CSVImportProgressBarUpdater.java @@ -60,8 +60,7 @@ public class CSVImportProgressBarUpdater implements CSVImportProgressListener { @Override public void operationUpdate(float elaborated) { Log.info("Elaborated: "+elaborated); - if (elaborated == 0) progressBar.updateProgress(0, "Initializing..."); - if (elaborated>0 && elaborated<1) { + if (elaborated>=0 && elaborated<1) { Log.trace("progress "+elaborated); int elab=new Float(elaborated*100).intValue(); progressBar.updateProgress(elaborated,elab+"% Importing..."); diff --git a/src/main/java/org/gcube/portlets/user/td/csvimportwidget/client/progress/FileUploadProgressBarUpdater.java b/src/main/java/org/gcube/portlets/user/td/csvimportwidget/client/progress/FileUploadProgressBarUpdater.java index e4b4dbb..b2d1a75 100644 --- a/src/main/java/org/gcube/portlets/user/td/csvimportwidget/client/progress/FileUploadProgressBarUpdater.java +++ b/src/main/java/org/gcube/portlets/user/td/csvimportwidget/client/progress/FileUploadProgressBarUpdater.java @@ -51,8 +51,7 @@ public class FileUploadProgressBarUpdater implements FileUploadProgressListener public void operationUpdate(float elaborated) { Log.info("File upload elaborated: "+elaborated); - if (elaborated == 0) progressBar.updateProgress(0, "Initializing..."); - if (elaborated>0 && elaborated<1) { + if (elaborated>=0 && elaborated<1) { Log.trace("progress "+elaborated); int elab=new Float(elaborated*100).intValue(); progressBar.updateProgress(elaborated,elab+"% Uploading...");