diff --git a/src/main/java/org/gcube/portlets/user/td/sdmxexportwidget/client/SDMXOperationInProgressCard.java b/src/main/java/org/gcube/portlets/user/td/sdmxexportwidget/client/SDMXOperationInProgressCard.java index ec573cf..7e3f4c7 100644 --- a/src/main/java/org/gcube/portlets/user/td/sdmxexportwidget/client/SDMXOperationInProgressCard.java +++ b/src/main/java/org/gcube/portlets/user/td/sdmxexportwidget/client/SDMXOperationInProgressCard.java @@ -206,4 +206,10 @@ public class SDMXOperationInProgressCard extends WizardCard implements } + @Override + public void operationValidate(float elaborated) { + // TODO Auto-generated method stub + + } + } diff --git a/src/main/java/org/gcube/portlets/user/td/sdmxexportwidget/client/progress/SDMXExportProgressBarUpdater.java b/src/main/java/org/gcube/portlets/user/td/sdmxexportwidget/client/progress/SDMXExportProgressBarUpdater.java index b4b9f01..f676ba0 100644 --- a/src/main/java/org/gcube/portlets/user/td/sdmxexportwidget/client/progress/SDMXExportProgressBarUpdater.java +++ b/src/main/java/org/gcube/portlets/user/td/sdmxexportwidget/client/progress/SDMXExportProgressBarUpdater.java @@ -59,7 +59,7 @@ public class SDMXExportProgressBarUpdater implements SDMXExportProgressListener @Override public void operationUpdate(float elaborated) { - Log.info("Export elaborated: "+elaborated); + Log.info("Elaborated: "+elaborated); if (elaborated == 0) progressBar.updateProgress(0, "Initializing..."); if (elaborated>0 && elaborated<1) { Log.trace("progress "+elaborated); @@ -70,6 +70,18 @@ public class SDMXExportProgressBarUpdater implements SDMXExportProgressListener } + @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/sdmxexportwidget/client/progress/SDMXExportProgressListener.java b/src/main/java/org/gcube/portlets/user/td/sdmxexportwidget/client/progress/SDMXExportProgressListener.java index b10b0ab..021211c 100644 --- a/src/main/java/org/gcube/portlets/user/td/sdmxexportwidget/client/progress/SDMXExportProgressListener.java +++ b/src/main/java/org/gcube/portlets/user/td/sdmxexportwidget/client/progress/SDMXExportProgressListener.java @@ -28,6 +28,11 @@ public interface SDMXExportProgressListener { */ 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/sdmxexportwidget/client/progress/SDMXExportProgressUpdater.java b/src/main/java/org/gcube/portlets/user/td/sdmxexportwidget/client/progress/SDMXExportProgressUpdater.java index 009a09a..d1889f7 100644 --- a/src/main/java/org/gcube/portlets/user/td/sdmxexportwidget/client/progress/SDMXExportProgressUpdater.java +++ b/src/main/java/org/gcube/portlets/user/td/sdmxexportwidget/client/progress/SDMXExportProgressUpdater.java @@ -59,8 +59,7 @@ public class SDMXExportProgressUpdater 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 SDMXExportProgressUpdater extends Timer { for (SDMXExportProgressListener listener : listeners) listener.operationUpdate(elaborated); } + + protected void fireOperationValidate(float elaborated) { + for (SDMXExportProgressListener listener : listeners) + listener.operationValidate(elaborated); + } protected void fireOperationComplete() { for (SDMXExportProgressListener listener : listeners)