From 4f288d6c8feb3a7fceb832479f4efea258a87ef3 Mon Sep 17 00:00:00 2001 From: Giancarlo Panichi Date: Fri, 18 Jul 2014 13:11:32 +0000 Subject: [PATCH] Updated ProgressBar set Progress 0 git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-table-widget@98795 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../client/progress/ChangeTableTypeProgressBarUpdater.java | 3 +-- .../client/progress/DeleteRowsProgressBarUpdater.java | 3 +-- .../client/progress/DenormalizationProgressBarUpdater.java | 4 +--- .../client/progress/DuplicatesRowsProgressBarUpdater.java | 3 +-- .../client/progress/EditRowProgressBarUpdater.java | 3 +-- .../client/progress/NormalizationProgressBarUpdater.java | 4 +--- .../client/progress/RollBackProgressBarUpdater.java | 3 +-- 7 files changed, 7 insertions(+), 16 deletions(-) diff --git a/src/main/java/org/gcube/portlets/user/td/tablewidget/client/progress/ChangeTableTypeProgressBarUpdater.java b/src/main/java/org/gcube/portlets/user/td/tablewidget/client/progress/ChangeTableTypeProgressBarUpdater.java index a49c4f7..84cd45e 100644 --- a/src/main/java/org/gcube/portlets/user/td/tablewidget/client/progress/ChangeTableTypeProgressBarUpdater.java +++ b/src/main/java/org/gcube/portlets/user/td/tablewidget/client/progress/ChangeTableTypeProgressBarUpdater.java @@ -58,8 +58,7 @@ public class ChangeTableTypeProgressBarUpdater implements ChangeTableTypeProgres @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+"% Progress..."); diff --git a/src/main/java/org/gcube/portlets/user/td/tablewidget/client/progress/DeleteRowsProgressBarUpdater.java b/src/main/java/org/gcube/portlets/user/td/tablewidget/client/progress/DeleteRowsProgressBarUpdater.java index f4d466f..fe5acef 100644 --- a/src/main/java/org/gcube/portlets/user/td/tablewidget/client/progress/DeleteRowsProgressBarUpdater.java +++ b/src/main/java/org/gcube/portlets/user/td/tablewidget/client/progress/DeleteRowsProgressBarUpdater.java @@ -58,8 +58,7 @@ public class DeleteRowsProgressBarUpdater implements DeleteRowsProgressListener @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+"% Progress..."); diff --git a/src/main/java/org/gcube/portlets/user/td/tablewidget/client/progress/DenormalizationProgressBarUpdater.java b/src/main/java/org/gcube/portlets/user/td/tablewidget/client/progress/DenormalizationProgressBarUpdater.java index 8017b49..ee71496 100644 --- a/src/main/java/org/gcube/portlets/user/td/tablewidget/client/progress/DenormalizationProgressBarUpdater.java +++ b/src/main/java/org/gcube/portlets/user/td/tablewidget/client/progress/DenormalizationProgressBarUpdater.java @@ -58,9 +58,7 @@ public class DenormalizationProgressBarUpdater implements @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 + "% Progress..."); diff --git a/src/main/java/org/gcube/portlets/user/td/tablewidget/client/progress/DuplicatesRowsProgressBarUpdater.java b/src/main/java/org/gcube/portlets/user/td/tablewidget/client/progress/DuplicatesRowsProgressBarUpdater.java index 87a7743..8714681 100644 --- a/src/main/java/org/gcube/portlets/user/td/tablewidget/client/progress/DuplicatesRowsProgressBarUpdater.java +++ b/src/main/java/org/gcube/portlets/user/td/tablewidget/client/progress/DuplicatesRowsProgressBarUpdater.java @@ -58,8 +58,7 @@ public class DuplicatesRowsProgressBarUpdater implements DuplicatesRowsProgressL @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+"% Progress..."); diff --git a/src/main/java/org/gcube/portlets/user/td/tablewidget/client/progress/EditRowProgressBarUpdater.java b/src/main/java/org/gcube/portlets/user/td/tablewidget/client/progress/EditRowProgressBarUpdater.java index 870d324..f1c51ba 100644 --- a/src/main/java/org/gcube/portlets/user/td/tablewidget/client/progress/EditRowProgressBarUpdater.java +++ b/src/main/java/org/gcube/portlets/user/td/tablewidget/client/progress/EditRowProgressBarUpdater.java @@ -58,8 +58,7 @@ public class EditRowProgressBarUpdater implements EditRowProgressListener { @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+"% Progress..."); diff --git a/src/main/java/org/gcube/portlets/user/td/tablewidget/client/progress/NormalizationProgressBarUpdater.java b/src/main/java/org/gcube/portlets/user/td/tablewidget/client/progress/NormalizationProgressBarUpdater.java index 307f504..165e885 100644 --- a/src/main/java/org/gcube/portlets/user/td/tablewidget/client/progress/NormalizationProgressBarUpdater.java +++ b/src/main/java/org/gcube/portlets/user/td/tablewidget/client/progress/NormalizationProgressBarUpdater.java @@ -58,9 +58,7 @@ public class NormalizationProgressBarUpdater implements @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 + "% Progress..."); diff --git a/src/main/java/org/gcube/portlets/user/td/tablewidget/client/progress/RollBackProgressBarUpdater.java b/src/main/java/org/gcube/portlets/user/td/tablewidget/client/progress/RollBackProgressBarUpdater.java index e41021a..15aba25 100644 --- a/src/main/java/org/gcube/portlets/user/td/tablewidget/client/progress/RollBackProgressBarUpdater.java +++ b/src/main/java/org/gcube/portlets/user/td/tablewidget/client/progress/RollBackProgressBarUpdater.java @@ -58,8 +58,7 @@ public class RollBackProgressBarUpdater implements RollBackProgressListener { @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+"% Progress...");