From 28b8e7b5c90d9e0bb62d60f90d7ce3b4e2c308ea Mon Sep 17 00:00:00 2001 From: Giancarlo Panichi Date: Fri, 2 May 2014 08:16:44 +0000 Subject: [PATCH] Minor Update git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-column-widget@95288 82a268e6-3cf1-43bd-a215-b396298e98cf --- .gwt/.gwt-log | 32 +++++++++++++++++++ .../ChangeColumnTypeProgressBarUpdater.java | 24 ++++++++++++-- .../ChangeColumnTypeProgressDialog.java | 6 ++++ .../ChangeColumnTypeProgressListener.java | 7 ++++ .../ChangeColumnTypeProgressUpdater.java | 8 +++-- .../DeleteColumnProgressBarUpdater.java | 16 +++++++++- .../progress/DeleteColumnProgressDialog.java | 6 ++++ .../DeleteColumnProgressListener.java | 7 ++++ .../progress/DeleteColumnProgressUpdater.java | 8 +++-- .../LabelColumnProgressBarUpdater.java | 14 +++++++- .../progress/LabelColumnProgressDialog.java | 6 ++++ .../progress/LabelColumnProgressListener.java | 7 ++++ .../progress/LabelColumnProgressUpdater.java | 8 +++-- .../ReplaceBatchColumnProgressBarUpdater.java | 14 +++++++- .../ReplaceBatchColumnProgressDialog.java | 6 ++++ .../ReplaceBatchColumnProgressListener.java | 5 +++ .../ReplaceBatchColumnProgressUpdater.java | 8 +++-- .../ReplaceColumnProgressBarUpdater.java | 13 ++++++++ .../progress/ReplaceColumnProgressDialog.java | 6 ++++ .../ReplaceColumnProgressListener.java | 5 +++ .../ReplaceColumnProgressUpdater.java | 8 +++-- 21 files changed, 198 insertions(+), 16 deletions(-) diff --git a/.gwt/.gwt-log b/.gwt/.gwt-log index f796bc2..02f3149 100644 --- a/.gwt/.gwt-log +++ b/.gwt/.gwt-log @@ -3016,3 +3016,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... + 60% complete (ETR: 3 seconds) + 60% complete (ETR: 3 seconds) + 60% complete (ETR: 3 seconds) + 60% complete (ETR: 3 seconds) + 60% complete (ETR: 3 seconds) + 60% complete (ETR: 3 seconds) + 60% complete (ETR: 3 seconds) + 70% complete (ETR: 2 seconds) + 80% complete (ETR: 1 seconds) + 90% complete (ETR: 1 seconds) + 100% complete (ETR: 0 seconds) + Compilation completed in 10.49 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/td/columnwidget/client/progress/ChangeColumnTypeProgressBarUpdater.java b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/progress/ChangeColumnTypeProgressBarUpdater.java index 97a7b33..6289725 100644 --- a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/progress/ChangeColumnTypeProgressBarUpdater.java +++ b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/progress/ChangeColumnTypeProgressBarUpdater.java @@ -42,18 +42,21 @@ public class ChangeColumnTypeProgressBarUpdater implements ChangeColumnTypeProgr /** * {@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,6 +67,18 @@ public class ChangeColumnTypeProgressBarUpdater implements ChangeColumnTypeProgr } + @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+"]"); @@ -79,4 +94,7 @@ public class ChangeColumnTypeProgressBarUpdater implements ChangeColumnTypeProgr } + + + } diff --git a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/progress/ChangeColumnTypeProgressDialog.java b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/progress/ChangeColumnTypeProgressDialog.java index 56962eb..cc8e61d 100644 --- a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/progress/ChangeColumnTypeProgressDialog.java +++ b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/progress/ChangeColumnTypeProgressDialog.java @@ -133,4 +133,10 @@ public class ChangeColumnTypeProgressDialog extends Window implements ChangeColu // 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/columnwidget/client/progress/ChangeColumnTypeProgressListener.java b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/progress/ChangeColumnTypeProgressListener.java index f29c2ed..38c5423 100644 --- a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/progress/ChangeColumnTypeProgressListener.java +++ b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/progress/ChangeColumnTypeProgressListener.java @@ -27,6 +27,13 @@ public interface ChangeColumnTypeProgressListener { 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/columnwidget/client/progress/ChangeColumnTypeProgressUpdater.java b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/progress/ChangeColumnTypeProgressUpdater.java index d0adb62..7a6cca1 100644 --- a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/progress/ChangeColumnTypeProgressUpdater.java +++ b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/progress/ChangeColumnTypeProgressUpdater.java @@ -58,8 +58,7 @@ public class ChangeColumnTypeProgressUpdater extends Timer { fireOperationUpdate(result.getProgress()); break; case VALIDATING_RULES: - Log.info("Validating Rules..."); - fireOperationUpdate(result.getProgress()); + fireOperationValidate(result.getProgress()); break; case GENERATING_VIEW: Log.info("Generating View..."); @@ -146,6 +145,11 @@ public class ChangeColumnTypeProgressUpdater extends Timer { for (ChangeColumnTypeProgressListener listener : listeners) listener.operationUpdate(elaborated); } + + protected void fireOperationValidate(float elaborated) { + for (ChangeColumnTypeProgressListener listener : listeners) + listener.operationValidate(elaborated); + } protected void fireOperationComplete(TRId trId) { for (ChangeColumnTypeProgressListener listener : listeners) diff --git a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/progress/DeleteColumnProgressBarUpdater.java b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/progress/DeleteColumnProgressBarUpdater.java index d0d8c9b..e2ceb6b 100644 --- a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/progress/DeleteColumnProgressBarUpdater.java +++ b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/progress/DeleteColumnProgressBarUpdater.java @@ -53,7 +53,7 @@ public class DeleteColumnProgressBarUpdater implements DeleteColumnProgressListe } 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,6 +64,20 @@ public class DeleteColumnProgressBarUpdater implements DeleteColumnProgressListe } + @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/columnwidget/client/progress/DeleteColumnProgressDialog.java b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/progress/DeleteColumnProgressDialog.java index 2594ad3..d2a34e2 100644 --- a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/progress/DeleteColumnProgressDialog.java +++ b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/progress/DeleteColumnProgressDialog.java @@ -133,5 +133,11 @@ public class DeleteColumnProgressDialog extends Window implements DeleteColumnPr // 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/columnwidget/client/progress/DeleteColumnProgressListener.java b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/progress/DeleteColumnProgressListener.java index 4983d45..675b6d9 100644 --- a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/progress/DeleteColumnProgressListener.java +++ b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/progress/DeleteColumnProgressListener.java @@ -28,6 +28,13 @@ public interface DeleteColumnProgressListener { 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/columnwidget/client/progress/DeleteColumnProgressUpdater.java b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/progress/DeleteColumnProgressUpdater.java index 5065d2d..3731cfd 100644 --- a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/progress/DeleteColumnProgressUpdater.java +++ b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/progress/DeleteColumnProgressUpdater.java @@ -59,8 +59,7 @@ public class DeleteColumnProgressUpdater extends Timer { fireOperationUpdate(result.getProgress()); break; case VALIDATING_RULES: - Log.info("Validating Rules..."); - fireOperationUpdate(result.getProgress()); + fireOperationValidate(result.getProgress()); break; case GENERATING_VIEW: Log.info("Generating View..."); @@ -150,6 +149,11 @@ public class DeleteColumnProgressUpdater extends Timer { for (DeleteColumnProgressListener listener : listeners) listener.operationUpdate(elaborated); } + + protected void fireOperationValidate(float elaborated) { + for (DeleteColumnProgressListener listener : listeners) + listener.operationValidate(elaborated); + } protected void fireOperationComplete(TRId trId) { for (DeleteColumnProgressListener listener : listeners) diff --git a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/progress/LabelColumnProgressBarUpdater.java b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/progress/LabelColumnProgressBarUpdater.java index a963345..af85f8e 100644 --- a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/progress/LabelColumnProgressBarUpdater.java +++ b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/progress/LabelColumnProgressBarUpdater.java @@ -53,7 +53,7 @@ public class LabelColumnProgressBarUpdater implements LabelColumnProgressListene } 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,6 +64,18 @@ public class LabelColumnProgressBarUpdater implements LabelColumnProgressListene } + @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/columnwidget/client/progress/LabelColumnProgressDialog.java b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/progress/LabelColumnProgressDialog.java index f90dab4..c02ba5a 100644 --- a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/progress/LabelColumnProgressDialog.java +++ b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/progress/LabelColumnProgressDialog.java @@ -134,4 +134,10 @@ public class LabelColumnProgressDialog extends Window implements LabelColumnProg // 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/columnwidget/client/progress/LabelColumnProgressListener.java b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/progress/LabelColumnProgressListener.java index 98767f2..eed88f7 100644 --- a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/progress/LabelColumnProgressListener.java +++ b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/progress/LabelColumnProgressListener.java @@ -26,7 +26,14 @@ public interface LabelColumnProgressListener { * @param elaborated the elaborated part. */ 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/columnwidget/client/progress/LabelColumnProgressUpdater.java b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/progress/LabelColumnProgressUpdater.java index d226dc1..94417c9 100644 --- a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/progress/LabelColumnProgressUpdater.java +++ b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/progress/LabelColumnProgressUpdater.java @@ -59,8 +59,7 @@ public class LabelColumnProgressUpdater extends Timer { fireOperationUpdate(result.getProgress()); break; case VALIDATING_RULES: - Log.info("Validating Rules..."); - fireOperationUpdate(result.getProgress()); + fireOperationValidate(result.getProgress()); break; case GENERATING_VIEW: Log.info("Generating View..."); @@ -150,6 +149,11 @@ public class LabelColumnProgressUpdater extends Timer { for (LabelColumnProgressListener listener : listeners) listener.operationUpdate(elaborated); } + + protected void fireOperationValidate(float elaborated) { + for (LabelColumnProgressListener listener : listeners) + listener.operationValidate(elaborated); + } protected void fireOperationComplete(TRId trId) { for (LabelColumnProgressListener listener : listeners) diff --git a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/progress/ReplaceBatchColumnProgressBarUpdater.java b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/progress/ReplaceBatchColumnProgressBarUpdater.java index 4f024c9..8e674ca 100644 --- a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/progress/ReplaceBatchColumnProgressBarUpdater.java +++ b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/progress/ReplaceBatchColumnProgressBarUpdater.java @@ -53,7 +53,7 @@ public class ReplaceBatchColumnProgressBarUpdater implements ReplaceBatchColumnP } 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,6 +64,18 @@ public class ReplaceBatchColumnProgressBarUpdater implements ReplaceBatchColumnP } + @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/columnwidget/client/progress/ReplaceBatchColumnProgressDialog.java b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/progress/ReplaceBatchColumnProgressDialog.java index 5fc2de8..aaec1ed 100644 --- a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/progress/ReplaceBatchColumnProgressDialog.java +++ b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/progress/ReplaceBatchColumnProgressDialog.java @@ -136,4 +136,10 @@ public class ReplaceBatchColumnProgressDialog extends Window implements ReplaceB // 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/columnwidget/client/progress/ReplaceBatchColumnProgressListener.java b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/progress/ReplaceBatchColumnProgressListener.java index bc303a0..27d4589 100644 --- a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/progress/ReplaceBatchColumnProgressListener.java +++ b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/progress/ReplaceBatchColumnProgressListener.java @@ -27,6 +27,11 @@ public interface ReplaceBatchColumnProgressListener { */ 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/columnwidget/client/progress/ReplaceBatchColumnProgressUpdater.java b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/progress/ReplaceBatchColumnProgressUpdater.java index d40d356..66d27a0 100644 --- a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/progress/ReplaceBatchColumnProgressUpdater.java +++ b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/progress/ReplaceBatchColumnProgressUpdater.java @@ -59,8 +59,7 @@ public class ReplaceBatchColumnProgressUpdater extends Timer { fireOperationUpdate(result.getProgress()); break; case VALIDATING_RULES: - Log.info("Validating Rules..."); - fireOperationUpdate(result.getProgress()); + fireOperationValidate(result.getProgress()); break; case GENERATING_VIEW: Log.info("Generating View..."); @@ -149,6 +148,11 @@ public class ReplaceBatchColumnProgressUpdater extends Timer { for (ReplaceBatchColumnProgressListener listener : listeners) listener.operationUpdate(elaborated); } + + protected void fireOperationValidate(float elaborated) { + for (ReplaceBatchColumnProgressListener listener : listeners) + listener.operationValidate(elaborated); + } protected void fireOperationComplete(TRId trId) { for (ReplaceBatchColumnProgressListener listener : listeners) diff --git a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/progress/ReplaceColumnProgressBarUpdater.java b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/progress/ReplaceColumnProgressBarUpdater.java index b2287cd..6817efa 100644 --- a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/progress/ReplaceColumnProgressBarUpdater.java +++ b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/progress/ReplaceColumnProgressBarUpdater.java @@ -64,6 +64,19 @@ public class ReplaceColumnProgressBarUpdater implements ReplaceColumnProgressLis } + @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/columnwidget/client/progress/ReplaceColumnProgressDialog.java b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/progress/ReplaceColumnProgressDialog.java index db5e090..6e62f9c 100644 --- a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/progress/ReplaceColumnProgressDialog.java +++ b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/progress/ReplaceColumnProgressDialog.java @@ -136,4 +136,10 @@ public class ReplaceColumnProgressDialog extends Window implements ReplaceColumn // 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/columnwidget/client/progress/ReplaceColumnProgressListener.java b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/progress/ReplaceColumnProgressListener.java index ce7da9b..6e790f9 100644 --- a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/progress/ReplaceColumnProgressListener.java +++ b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/progress/ReplaceColumnProgressListener.java @@ -27,6 +27,11 @@ public interface ReplaceColumnProgressListener { */ 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/columnwidget/client/progress/ReplaceColumnProgressUpdater.java b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/progress/ReplaceColumnProgressUpdater.java index 5d7a2b7..a559061 100644 --- a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/progress/ReplaceColumnProgressUpdater.java +++ b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/progress/ReplaceColumnProgressUpdater.java @@ -59,8 +59,7 @@ public class ReplaceColumnProgressUpdater extends Timer { fireOperationUpdate(result.getProgress()); break; case VALIDATING_RULES: - Log.info("Validating Rules..."); - fireOperationUpdate(result.getProgress()); + fireOperationValidate(result.getProgress()); break; case GENERATING_VIEW: Log.info("Generating View..."); @@ -149,6 +148,11 @@ public class ReplaceColumnProgressUpdater extends Timer { for (ReplaceColumnProgressListener listener : listeners) listener.operationUpdate(elaborated); } + + protected void fireOperationValidate(float elaborated) { + for (ReplaceColumnProgressListener listener : listeners) + listener.operationValidate(elaborated); + } protected void fireOperationComplete(TRId trId) { for (ReplaceColumnProgressListener listener : listeners)