From 5c677ea4db4c29400400eeff2365f4c34cf3bb1b Mon Sep 17 00:00:00 2001 From: Giancarlo Panichi Date: Fri, 2 May 2014 08:47:59 +0000 Subject: [PATCH] Updated progress bar to support Validation state git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-table-widget@95294 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../ChangeTableTypeProgressBarUpdater.java | 19 +++++++++++++++-- .../ChangeTableTypeProgressDialog.java | 6 ++++++ .../ChangeTableTypeProgressListener.java | 5 +++++ .../ChangeTableTypeProgressUpdater.java | 7 ++++++- .../DeleteRowsProgressBarUpdater.java | 21 ++++++++++++++++--- .../progress/DeleteRowsProgressDialog.java | 6 ++++++ .../progress/DeleteRowsProgressListener.java | 5 +++++ .../progress/DeleteRowsProgressUpdater.java | 7 ++++++- .../DuplicatesRowsProgressBarUpdater.java | 21 ++++++++++++++++--- .../DuplicatesRowsProgressDialog.java | 6 ++++++ .../DuplicatesRowsProgressListener.java | 5 +++++ .../DuplicatesRowsProgressUpdater.java | 7 ++++++- .../progress/RollBackProgressBarUpdater.java | 18 +++++++++++++++- .../progress/RollBackProgressDialog.java | 6 ++++++ .../progress/RollBackProgressListener.java | 5 +++++ .../progress/RollBackProgressUpdater.java | 7 ++++++- 16 files changed, 138 insertions(+), 13 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 1902d66..a49c4f7 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 @@ -33,6 +33,7 @@ public class ChangeTableTypeProgressBarUpdater implements ChangeTableTypeProgres /** * {@inheritDoc} */ + @Override public void operationComplete(TRId trId) { Log.info("Completed"); progressBar.updateProgress(1, "Completed"); @@ -42,18 +43,21 @@ public class ChangeTableTypeProgressBarUpdater implements ChangeTableTypeProgres /** * {@inheritDoc} */ + @Override public void operationFailed(Throwable caught, String reason, String failureDetails) { Log.info("Failed"); progressBar.updateText("Failed"); } + @Override public void operationInitializing() { Log.info("Inizializing"); progressBar.updateProgress(0, "Initializing..."); } + @Override public void operationUpdate(float elaborated) { - Log.info("Import elaborated: "+elaborated); + Log.info("Elaborated: "+elaborated); if (elaborated == 0) progressBar.updateProgress(0, "Initializing..."); if (elaborated>0 && elaborated<1) { Log.trace("progress "+elaborated); @@ -64,7 +68,18 @@ public class ChangeTableTypeProgressBarUpdater implements ChangeTableTypeProgres } - + @Override + public void operationValidate(float elaborated) { + Log.info("Validation Elaborated: "+elaborated); + if (elaborated == 0) progressBar.updateProgress(0, "Start Validation..."); + if (elaborated>0 && elaborated<1) { + Log.trace("Validation progress "+elaborated); + int elab=new Float(elaborated*100).intValue(); + progressBar.updateProgress(elaborated,elab+"% Validation Progress..."); + } + if (elaborated == 1) progressBar.updateProgress(1, "Validation..."); + } + @Override public void operationStopped(TRId trId,String reason, String details) { Log.debug("Operation Stopped: ["+trId.toString()+", "+reason+", "+details+"]"); diff --git a/src/main/java/org/gcube/portlets/user/td/tablewidget/client/progress/ChangeTableTypeProgressDialog.java b/src/main/java/org/gcube/portlets/user/td/tablewidget/client/progress/ChangeTableTypeProgressDialog.java index 1361abf..020edc5 100644 --- a/src/main/java/org/gcube/portlets/user/td/tablewidget/client/progress/ChangeTableTypeProgressDialog.java +++ b/src/main/java/org/gcube/portlets/user/td/tablewidget/client/progress/ChangeTableTypeProgressDialog.java @@ -134,4 +134,10 @@ public class ChangeTableTypeProgressDialog extends Window implements ChangeTable // TODO Auto-generated method stub } + + @Override + public void operationValidate(float elaborated) { + // TODO Auto-generated method stub + + } } diff --git a/src/main/java/org/gcube/portlets/user/td/tablewidget/client/progress/ChangeTableTypeProgressListener.java b/src/main/java/org/gcube/portlets/user/td/tablewidget/client/progress/ChangeTableTypeProgressListener.java index d7e9f8d..ecd023e 100644 --- a/src/main/java/org/gcube/portlets/user/td/tablewidget/client/progress/ChangeTableTypeProgressListener.java +++ b/src/main/java/org/gcube/portlets/user/td/tablewidget/client/progress/ChangeTableTypeProgressListener.java @@ -27,6 +27,11 @@ public interface ChangeTableTypeProgressListener { */ public void operationUpdate(float elaborated); + /** + * Called when there is a validate for the operation. + * @param elaborated the elaborated part. + */ + public void operationValidate(float elaborated); /** * Called when the operation is complete. diff --git a/src/main/java/org/gcube/portlets/user/td/tablewidget/client/progress/ChangeTableTypeProgressUpdater.java b/src/main/java/org/gcube/portlets/user/td/tablewidget/client/progress/ChangeTableTypeProgressUpdater.java index 40887d9..450d879 100644 --- a/src/main/java/org/gcube/portlets/user/td/tablewidget/client/progress/ChangeTableTypeProgressUpdater.java +++ b/src/main/java/org/gcube/portlets/user/td/tablewidget/client/progress/ChangeTableTypeProgressUpdater.java @@ -59,7 +59,7 @@ public class ChangeTableTypeProgressUpdater extends Timer { fireOperationUpdate(result.getProgress()); break; case VALIDATING_RULES: - fireOperationUpdate(result.getProgress()); + fireOperationValidate(result.getProgress()); break; case GENERATING_VIEW: Log.info("Generating View..."); @@ -148,6 +148,11 @@ public class ChangeTableTypeProgressUpdater extends Timer { for (ChangeTableTypeProgressListener listener : listeners) listener.operationUpdate(elaborated); } + + protected void fireOperationValidate(float elaborated) { + for (ChangeTableTypeProgressListener listener : listeners) + listener.operationValidate(elaborated); + } protected void fireOperationComplete(TRId trId) { for (ChangeTableTypeProgressListener listener : listeners) 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 96e8e0b..f4d466f 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 @@ -33,6 +33,7 @@ public class DeleteRowsProgressBarUpdater implements DeleteRowsProgressListener /** * {@inheritDoc} */ + @Override public void operationComplete(TRId trId) { Log.info("Completed"); progressBar.updateProgress(1, "Completed"); @@ -42,16 +43,19 @@ public class DeleteRowsProgressBarUpdater implements DeleteRowsProgressListener /** * {@inheritDoc} */ + @Override public void operationFailed(Throwable caught, String reason, String failureDetails) { Log.info("Failed"); progressBar.updateText("Failed"); } - + + @Override public void operationInitializing() { Log.info("Inizializing"); progressBar.updateProgress(0, "Initializing..."); } - + + @Override public void operationUpdate(float elaborated) { Log.info("Elaborated: "+elaborated); if (elaborated == 0) progressBar.updateProgress(0, "Initializing..."); @@ -63,7 +67,18 @@ public class DeleteRowsProgressBarUpdater implements DeleteRowsProgressListener if (elaborated == 1) progressBar.updateProgress(1, "Completing..."); } - + + @Override + public void operationValidate(float elaborated) { + Log.info("Validation Elaborated: "+elaborated); + if (elaborated == 0) progressBar.updateProgress(0, "Start Validation..."); + if (elaborated>0 && elaborated<1) { + Log.trace("Validation progress "+elaborated); + int elab=new Float(elaborated*100).intValue(); + progressBar.updateProgress(elaborated,elab+"% Validation Progress..."); + } + if (elaborated == 1) progressBar.updateProgress(1, "Validation..."); + } @Override public void operationStopped(TRId trId,String reason, String details) { diff --git a/src/main/java/org/gcube/portlets/user/td/tablewidget/client/progress/DeleteRowsProgressDialog.java b/src/main/java/org/gcube/portlets/user/td/tablewidget/client/progress/DeleteRowsProgressDialog.java index 7862ed4..b7e08c4 100644 --- a/src/main/java/org/gcube/portlets/user/td/tablewidget/client/progress/DeleteRowsProgressDialog.java +++ b/src/main/java/org/gcube/portlets/user/td/tablewidget/client/progress/DeleteRowsProgressDialog.java @@ -135,4 +135,10 @@ public class DeleteRowsProgressDialog extends Window implements DeleteRowsProgre // TODO Auto-generated method stub } + + @Override + public void operationValidate(float elaborated) { + // TODO Auto-generated method stub + + } } diff --git a/src/main/java/org/gcube/portlets/user/td/tablewidget/client/progress/DeleteRowsProgressListener.java b/src/main/java/org/gcube/portlets/user/td/tablewidget/client/progress/DeleteRowsProgressListener.java index 495a6f2..7d01cb1 100644 --- a/src/main/java/org/gcube/portlets/user/td/tablewidget/client/progress/DeleteRowsProgressListener.java +++ b/src/main/java/org/gcube/portlets/user/td/tablewidget/client/progress/DeleteRowsProgressListener.java @@ -27,6 +27,11 @@ public interface DeleteRowsProgressListener { */ public void operationUpdate(float elaborated); + /** + * Called when there is a validate for the operation. + * @param elaborated the elaborated part. + */ + public void operationValidate(float elaborated); /** * Called when the operation is complete. diff --git a/src/main/java/org/gcube/portlets/user/td/tablewidget/client/progress/DeleteRowsProgressUpdater.java b/src/main/java/org/gcube/portlets/user/td/tablewidget/client/progress/DeleteRowsProgressUpdater.java index a20424e..58aca60 100644 --- a/src/main/java/org/gcube/portlets/user/td/tablewidget/client/progress/DeleteRowsProgressUpdater.java +++ b/src/main/java/org/gcube/portlets/user/td/tablewidget/client/progress/DeleteRowsProgressUpdater.java @@ -59,7 +59,7 @@ public class DeleteRowsProgressUpdater extends Timer { fireOperationUpdate(result.getProgress()); break; case VALIDATING_RULES: - fireOperationUpdate(result.getProgress()); + fireOperationValidate(result.getProgress()); break; case GENERATING_VIEW: Log.info("Generating View..."); @@ -148,6 +148,11 @@ public class DeleteRowsProgressUpdater extends Timer { for (DeleteRowsProgressListener listener : listeners) listener.operationUpdate(elaborated); } + + protected void fireOperationValidate(float elaborated) { + for (DeleteRowsProgressListener listener : listeners) + listener.operationValidate(elaborated); + } protected void fireOperationComplete(TRId trId) { for (DeleteRowsProgressListener listener : listeners) 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 a8baa6d..87a7743 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 @@ -33,6 +33,7 @@ public class DuplicatesRowsProgressBarUpdater implements DuplicatesRowsProgressL /** * {@inheritDoc} */ + @Override public void operationComplete(TRId trId) { Log.info("Completed"); progressBar.updateProgress(1, "Completed"); @@ -42,16 +43,19 @@ public class DuplicatesRowsProgressBarUpdater implements DuplicatesRowsProgressL /** * {@inheritDoc} */ + @Override public void operationFailed(Throwable caught, String reason, String failureDetails) { Log.info("Failed"); progressBar.updateText("Failed"); } - + + @Override public void operationInitializing() { Log.info("Inizializing"); progressBar.updateProgress(0, "Initializing..."); } - + + @Override public void operationUpdate(float elaborated) { Log.info("Elaborated: "+elaborated); if (elaborated == 0) progressBar.updateProgress(0, "Initializing..."); @@ -63,7 +67,18 @@ public class DuplicatesRowsProgressBarUpdater implements DuplicatesRowsProgressL if (elaborated == 1) progressBar.updateProgress(1, "Completing..."); } - + + @Override + public void operationValidate(float elaborated) { + Log.info("Validation Elaborated: "+elaborated); + if (elaborated == 0) progressBar.updateProgress(0, "Start Validation..."); + if (elaborated>0 && elaborated<1) { + Log.trace("Validation progress "+elaborated); + int elab=new Float(elaborated*100).intValue(); + progressBar.updateProgress(elaborated,elab+"% Validation Progress..."); + } + if (elaborated == 1) progressBar.updateProgress(1, "Validation..."); + } @Override public void operationStopped(TRId trId,String reason, String details) { diff --git a/src/main/java/org/gcube/portlets/user/td/tablewidget/client/progress/DuplicatesRowsProgressDialog.java b/src/main/java/org/gcube/portlets/user/td/tablewidget/client/progress/DuplicatesRowsProgressDialog.java index 599d624..c6951a0 100644 --- a/src/main/java/org/gcube/portlets/user/td/tablewidget/client/progress/DuplicatesRowsProgressDialog.java +++ b/src/main/java/org/gcube/portlets/user/td/tablewidget/client/progress/DuplicatesRowsProgressDialog.java @@ -133,4 +133,10 @@ public class DuplicatesRowsProgressDialog extends Window implements DuplicatesRo // TODO Auto-generated method stub } + + @Override + public void operationValidate(float elaborated) { + // TODO Auto-generated method stub + + } } diff --git a/src/main/java/org/gcube/portlets/user/td/tablewidget/client/progress/DuplicatesRowsProgressListener.java b/src/main/java/org/gcube/portlets/user/td/tablewidget/client/progress/DuplicatesRowsProgressListener.java index 2367165..eec7805 100644 --- a/src/main/java/org/gcube/portlets/user/td/tablewidget/client/progress/DuplicatesRowsProgressListener.java +++ b/src/main/java/org/gcube/portlets/user/td/tablewidget/client/progress/DuplicatesRowsProgressListener.java @@ -27,6 +27,11 @@ public interface DuplicatesRowsProgressListener { */ public void operationUpdate(float elaborated); + /** + * Called when there is a validate for the operation. + * @param elaborated the elaborated part. + */ + public void operationValidate(float elaborated); /** * Called when the operation is complete. diff --git a/src/main/java/org/gcube/portlets/user/td/tablewidget/client/progress/DuplicatesRowsProgressUpdater.java b/src/main/java/org/gcube/portlets/user/td/tablewidget/client/progress/DuplicatesRowsProgressUpdater.java index 39e7c5c..91ba1e7 100644 --- a/src/main/java/org/gcube/portlets/user/td/tablewidget/client/progress/DuplicatesRowsProgressUpdater.java +++ b/src/main/java/org/gcube/portlets/user/td/tablewidget/client/progress/DuplicatesRowsProgressUpdater.java @@ -59,7 +59,7 @@ public class DuplicatesRowsProgressUpdater extends Timer { fireOperationUpdate(result.getProgress()); break; case VALIDATING_RULES: - fireOperationUpdate(result.getProgress()); + fireOperationValidate(result.getProgress()); break; case GENERATING_VIEW: Log.info("Generating View..."); @@ -148,6 +148,11 @@ public class DuplicatesRowsProgressUpdater extends Timer { for (DuplicatesRowsProgressListener listener : listeners) listener.operationUpdate(elaborated); } + + protected void fireOperationValidate(float elaborated) { + for (DuplicatesRowsProgressListener listener : listeners) + listener.operationValidate(elaborated); + } protected void fireOperationComplete(TRId trId) { for (DuplicatesRowsProgressListener listener : listeners) 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 2f85391..e41021a 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 @@ -33,6 +33,7 @@ public class RollBackProgressBarUpdater implements RollBackProgressListener { /** * {@inheritDoc} */ + @Override public void operationComplete(TRId trId) { Log.info("Completed"); progressBar.updateProgress(1, "Completed"); @@ -42,16 +43,19 @@ public class RollBackProgressBarUpdater implements RollBackProgressListener { /** * {@inheritDoc} */ + @Override public void operationFailed(Throwable caught, String reason, String failureDetails) { Log.info("Failed"); progressBar.updateText("Failed"); } - + + @Override public void operationInitializing() { Log.info("Inizializing"); progressBar.updateProgress(0, "Initializing..."); } + @Override public void operationUpdate(float elaborated) { Log.info("Elaborated: "+elaborated); if (elaborated == 0) progressBar.updateProgress(0, "Initializing..."); @@ -63,6 +67,18 @@ public class RollBackProgressBarUpdater implements RollBackProgressListener { if (elaborated == 1) progressBar.updateProgress(1, "Completing..."); } + + @Override + public void operationValidate(float elaborated) { + Log.info("Validation Elaborated: "+elaborated); + if (elaborated == 0) progressBar.updateProgress(0, "Start Validation..."); + if (elaborated>0 && elaborated<1) { + Log.trace("Validation progress "+elaborated); + int elab=new Float(elaborated*100).intValue(); + progressBar.updateProgress(elaborated,elab+"% Validation Progress..."); + } + if (elaborated == 1) progressBar.updateProgress(1, "Validation..."); + } @Override diff --git a/src/main/java/org/gcube/portlets/user/td/tablewidget/client/progress/RollBackProgressDialog.java b/src/main/java/org/gcube/portlets/user/td/tablewidget/client/progress/RollBackProgressDialog.java index 42b2026..d929d8f 100644 --- a/src/main/java/org/gcube/portlets/user/td/tablewidget/client/progress/RollBackProgressDialog.java +++ b/src/main/java/org/gcube/portlets/user/td/tablewidget/client/progress/RollBackProgressDialog.java @@ -132,4 +132,10 @@ public class RollBackProgressDialog extends Window implements RollBackProgressLi // TODO Auto-generated method stub } + + @Override + public void operationValidate(float elaborated) { + // TODO Auto-generated method stub + + } } diff --git a/src/main/java/org/gcube/portlets/user/td/tablewidget/client/progress/RollBackProgressListener.java b/src/main/java/org/gcube/portlets/user/td/tablewidget/client/progress/RollBackProgressListener.java index 210a610..bddb93e 100644 --- a/src/main/java/org/gcube/portlets/user/td/tablewidget/client/progress/RollBackProgressListener.java +++ b/src/main/java/org/gcube/portlets/user/td/tablewidget/client/progress/RollBackProgressListener.java @@ -27,6 +27,11 @@ public interface RollBackProgressListener { */ public void operationUpdate(float elaborated); + /** + * Called when there is a validate for the operation. + * @param elaborated the elaborated part. + */ + public void operationValidate(float elaborated); /** * Called when the operation is complete. diff --git a/src/main/java/org/gcube/portlets/user/td/tablewidget/client/progress/RollBackProgressUpdater.java b/src/main/java/org/gcube/portlets/user/td/tablewidget/client/progress/RollBackProgressUpdater.java index 93de1e9..c9b4e0e 100644 --- a/src/main/java/org/gcube/portlets/user/td/tablewidget/client/progress/RollBackProgressUpdater.java +++ b/src/main/java/org/gcube/portlets/user/td/tablewidget/client/progress/RollBackProgressUpdater.java @@ -59,7 +59,7 @@ public class RollBackProgressUpdater extends Timer { fireOperationUpdate(result.getProgress()); break; case VALIDATING_RULES: - fireOperationUpdate(result.getProgress()); + fireOperationValidate(result.getProgress()); break; case GENERATING_VIEW: Log.info("Generating View..."); @@ -148,6 +148,11 @@ public class RollBackProgressUpdater extends Timer { for (RollBackProgressListener listener : listeners) listener.operationUpdate(elaborated); } + + protected void fireOperationValidate(float elaborated) { + for (RollBackProgressListener listener : listeners) + listener.operationValidate(elaborated); + } protected void fireOperationComplete(TRId trId) { for (RollBackProgressListener listener : listeners)