From 04c57c53bc3606bff6c2158adf3e844c772acb86 Mon Sep 17 00:00:00 2001 From: Giancarlo Panichi Date: Wed, 30 Apr 2014 09:43:22 +0000 Subject: [PATCH] Minor Update git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-expression-widget@95255 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../client/progress/ColumnFilterProgressBarUpdater.java | 7 +++++++ .../client/progress/ColumnFilterProgressDialog.java | 6 ++++++ .../client/progress/ColumnFilterProgressListener.java | 4 ++++ .../client/progress/ColumnFilterProgressUpdater.java | 9 +++++++++ .../expressionwidget/server/ExpressionServiceImpl.java | 2 ++ 5 files changed, 28 insertions(+) diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/progress/ColumnFilterProgressBarUpdater.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/progress/ColumnFilterProgressBarUpdater.java index 2f09216..f1f42a1 100644 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/progress/ColumnFilterProgressBarUpdater.java +++ b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/progress/ColumnFilterProgressBarUpdater.java @@ -70,5 +70,12 @@ public class ColumnFilterProgressBarUpdater implements ColumnFilterProgressListe 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/expressionwidget/client/progress/ColumnFilterProgressDialog.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/progress/ColumnFilterProgressDialog.java index eaa5326..36b9606 100644 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/progress/ColumnFilterProgressDialog.java +++ b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/progress/ColumnFilterProgressDialog.java @@ -137,4 +137,10 @@ public class ColumnFilterProgressDialog extends Window implements ColumnFilterPr this.trId=trId; why=ChangeTableWhy.TABLECURATION; } + + @Override + public void operationGeneratingView() { + // TODO Auto-generated method stub + + } } diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/progress/ColumnFilterProgressListener.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/progress/ColumnFilterProgressListener.java index d692a30..9390f3b 100644 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/progress/ColumnFilterProgressListener.java +++ b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/progress/ColumnFilterProgressListener.java @@ -49,5 +49,9 @@ public interface ColumnFilterProgressListener { */ 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/expressionwidget/client/progress/ColumnFilterProgressUpdater.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/progress/ColumnFilterProgressUpdater.java index d1c609e..1c41ef3 100644 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/progress/ColumnFilterProgressUpdater.java +++ b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/progress/ColumnFilterProgressUpdater.java @@ -61,6 +61,10 @@ public class ColumnFilterProgressUpdater extends Timer { case VALIDATING_RULES: fireOperationUpdate(result.getProgress()); break; + case GENERATING_VIEW: + Log.info("Generating View..."); + fireOperationGeneratingView(); + break; case STOPPED: cancel(); stopMessage(result); @@ -135,6 +139,11 @@ public class ColumnFilterProgressUpdater extends Timer { for (ColumnFilterProgressListener listener : listeners) listener.operationInitializing(); } + + protected void fireOperationGeneratingView() { + for (ColumnFilterProgressListener listener : listeners) + listener.operationGeneratingView(); + } protected void fireOperationUpdate(float elaborated) { for (ColumnFilterProgressListener listener : listeners) diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/server/ExpressionServiceImpl.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/server/ExpressionServiceImpl.java index 27057a3..8145e50 100644 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/server/ExpressionServiceImpl.java +++ b/src/main/java/org/gcube/portlets/user/td/expressionwidget/server/ExpressionServiceImpl.java @@ -175,6 +175,8 @@ public class ExpressionServiceImpl extends RemoteServiceServlet implements case VALIDATING_RULES: columnFilterMonitor.setProgress(task.getProgress()); break; + case GENERATING_VIEW: + break; case ABORTED: break; case STOPPED: