From 8809fcc18af91f04a66beda4a64af7e2794e2ff1 Mon Sep 17 00:00:00 2001 From: Giancarlo Panichi Date: Wed, 30 Apr 2014 09:47:52 +0000 Subject: [PATCH] Updated progress bar git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-sdmx-export-widget@95257 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../client/SDMXOperationInProgressCard.java | 10 +++++++++- .../client/progress/SDMXExportProgressBarUpdater.java | 7 +++++++ .../client/progress/SDMXExportProgressListener.java | 6 ++++++ .../client/progress/SDMXExportProgressUpdater.java | 11 +++++++++++ 4 files changed, 33 insertions(+), 1 deletion(-) 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 9157947..ec573cf 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 @@ -132,11 +132,13 @@ public class SDMXOperationInProgressCard extends WizardCard implements getWizardWindow().setNextButtonToFinish(); exportSDMX(); } - + + @Override public void operationInitializing() { } + @Override public void operationUpdate(float elaborated) { } @@ -198,4 +200,10 @@ public class SDMXOperationInProgressCard extends WizardCard implements } + @Override + public void operationGeneratingView() { + // 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 e08f55f..b4b9f01 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 @@ -76,5 +76,12 @@ public class SDMXExportProgressBarUpdater implements SDMXExportProgressListener progressBar.updateText("Validations failed"); } + + @Override + public void operationGeneratingView() { + Log.info("Generating View..."); + progressBar.updateText("Generating View..."); + + } } 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 4baf539..b10b0ab 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 @@ -49,5 +49,11 @@ public interface SDMXExportProgressListener { * @param details */ public void operationStopped(TRId trId, String reason, String details); + + + /** + * Called when the operation is generating the view + */ + public void operationGeneratingView(); } 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 d768051..009a09a 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,13 @@ public class SDMXExportProgressUpdater extends Timer { fireOperationUpdate(result.getProgress()); break; case VALIDATING_RULES: + Log.info("Validating Rules..."); fireOperationUpdate(result.getProgress()); break; + case GENERATING_VIEW: + Log.info("Generating View..."); + fireOperationGeneratingView(); + break; case FAILED: cancel(); errorMessage(result); @@ -130,7 +135,13 @@ public class SDMXExportProgressUpdater extends Timer { for (SDMXExportProgressListener listener : listeners) listener.operationInitializing(); } + + protected void fireOperationGeneratingView() { + for (SDMXExportProgressListener listener : listeners) + listener.operationGeneratingView(); + } + protected void fireOperationUpdate(float elaborated) { for (SDMXExportProgressListener listener : listeners) listener.operationUpdate(elaborated);