diff --git a/src/main/java/org/gcube/portlets/user/td/monitorwidget/client/MonitorBarUpdater.java b/src/main/java/org/gcube/portlets/user/td/monitorwidget/client/MonitorBarUpdater.java index 7820492..8bb0a99 100644 --- a/src/main/java/org/gcube/portlets/user/td/monitorwidget/client/MonitorBarUpdater.java +++ b/src/main/java/org/gcube/portlets/user/td/monitorwidget/client/MonitorBarUpdater.java @@ -49,13 +49,14 @@ public class MonitorBarUpdater implements MonitorUpdaterListener { } @Override - public void monitorInitializing() { + public void monitorInitializing(OperationMonitor operationMonitor) { Log.info("Inizializing"); progressBar.updateProgress(0, "Initializing..."); } @Override - public void monitorUpdate(float elaborated) { + public void monitorUpdate(OperationMonitor operationMonitor) { + float elaborated=operationMonitor.getTask().getProgress(); Log.info("Elaborated: "+elaborated); if (elaborated>=0 && elaborated<1) { Log.trace("progress "+elaborated); @@ -67,7 +68,8 @@ public class MonitorBarUpdater implements MonitorUpdaterListener { } @Override - public void monitorValidate(float elaborated) { + public void monitorValidate(OperationMonitor operationMonitor) { + float elaborated=operationMonitor.getTask().getProgress(); Log.info("Validation Elaborated: "+elaborated); if (elaborated == 0) progressBar.updateProgress(0, "Start Validation..."); if (elaborated>0 && elaborated<1) { @@ -86,18 +88,14 @@ public class MonitorBarUpdater implements MonitorUpdaterListener { } @Override - public void monitorGeneratingView() { + public void monitorGeneratingView(OperationMonitor operationMonitor) { Log.info("Generating View..."); progressBar.updateText("Generating View..."); } - @Override - public void monitorChanged(OperationMonitor operationMonitor) { - // TODO Auto-generated method stub - - } + @Override diff --git a/src/main/java/org/gcube/portlets/user/td/monitorwidget/client/MonitorDialog.java b/src/main/java/org/gcube/portlets/user/td/monitorwidget/client/MonitorDialog.java index 5a28f30..cf76df7 100644 --- a/src/main/java/org/gcube/portlets/user/td/monitorwidget/client/MonitorDialog.java +++ b/src/main/java/org/gcube/portlets/user/td/monitorwidget/client/MonitorDialog.java @@ -103,13 +103,13 @@ public class MonitorDialog extends Window implements MonitorUpdaterListener { } @Override - public void monitorInitializing() { + public void monitorInitializing(OperationMonitor result) { // TODO Auto-generated method stub } @Override - public void monitorUpdate(float elaborated) { + public void monitorUpdate(OperationMonitor operationMonitor) { // TODO Auto-generated method stub } @@ -154,22 +154,18 @@ public class MonitorDialog extends Window implements MonitorUpdaterListener { } @Override - public void monitorGeneratingView() { + public void monitorGeneratingView(OperationMonitor operationMonitor) { // TODO Auto-generated method stub } @Override - public void monitorValidate(float elaborated) { + public void monitorValidate(OperationMonitor operationMonitor) { // TODO Auto-generated method stub } - @Override - public void monitorChanged(OperationMonitor operationMonitor) { - // TODO Auto-generated method stub - - } + @Override public void monitorAborted() { diff --git a/src/main/java/org/gcube/portlets/user/td/monitorwidget/client/MonitorUpdater.java b/src/main/java/org/gcube/portlets/user/td/monitorwidget/client/MonitorUpdater.java index 5f19448..b47e160 100644 --- a/src/main/java/org/gcube/portlets/user/td/monitorwidget/client/MonitorUpdater.java +++ b/src/main/java/org/gcube/portlets/user/td/monitorwidget/client/MonitorUpdater.java @@ -61,7 +61,7 @@ public class MonitorUpdater extends Timer implements MonitorDialogEventUIListene switch (result.getTask().getState()) { case INITIALIZING: Log.info("Initializing..."); - fireMonitorInitializing(); + fireMonitorInitializing(result); break; case ABORTED: cancel(); @@ -69,14 +69,15 @@ public class MonitorUpdater extends Timer implements MonitorDialogEventUIListene Log.info("Aborted"); break; case IN_PROGRESS: - fireMonitorUpdate(result.getTask().getProgress()); + fireMonitorUpdate(result); + break; case VALIDATING_RULES: - fireMonitorValidate(result.getTask().getProgress()); + fireMonitorValidate(result); break; case GENERATING_VIEW: Log.info("Generating View..."); - fireMonitorGeneratingView(); + fireMonitorGeneratingView(result); break; case STOPPED: cancel(); @@ -105,6 +106,7 @@ public class MonitorUpdater extends Timer implements MonitorDialogEventUIListene } + protected void errorMessage(OperationMonitor result) { Log.info("Operation Failed"); Throwable th; @@ -147,24 +149,24 @@ public class MonitorUpdater extends Timer implements MonitorDialogEventUIListene return message; } - protected void fireMonitorInitializing() { + protected void fireMonitorInitializing(OperationMonitor result) { for (MonitorUpdaterListener listener : listeners) - listener.monitorInitializing(); + listener.monitorInitializing(result); } - protected void fireMonitorGeneratingView() { + protected void fireMonitorGeneratingView(OperationMonitor result) { for (MonitorUpdaterListener listener : listeners) - listener.monitorGeneratingView(); + listener.monitorGeneratingView(result); } - protected void fireMonitorUpdate(float elaborated) { + protected void fireMonitorUpdate(OperationMonitor result) { for (MonitorUpdaterListener listener : listeners) - listener.monitorUpdate(elaborated); + listener.monitorUpdate(result); } - protected void fireMonitorValidate(float elaborated) { + protected void fireMonitorValidate(OperationMonitor result) { for (MonitorUpdaterListener listener : listeners) - listener.monitorValidate(elaborated); + listener.monitorValidate(result); } protected void fireMonitorComplete(TRId trId) { diff --git a/src/main/java/org/gcube/portlets/user/td/monitorwidget/client/MonitorUpdaterListener.java b/src/main/java/org/gcube/portlets/user/td/monitorwidget/client/MonitorUpdaterListener.java index b83e838..64c3fbc 100644 --- a/src/main/java/org/gcube/portlets/user/td/monitorwidget/client/MonitorUpdaterListener.java +++ b/src/main/java/org/gcube/portlets/user/td/monitorwidget/client/MonitorUpdaterListener.java @@ -18,19 +18,19 @@ public interface MonitorUpdaterListener { /** * Called when the operation is starting. */ - public void monitorInitializing(); + public void monitorInitializing(OperationMonitor operationMonitor); /** * Called when there is a progress for the operation. * @param elaborated the elaborated part. */ - public void monitorUpdate(float elaborated); + public void monitorUpdate(OperationMonitor operationMonitor); /** * Called when there is a validate for the operation. * @param elaborated the elaborated part. */ - public void monitorValidate(float elaborated); + public void monitorValidate(OperationMonitor operationMonitor); /** * Called when the operation is complete. @@ -71,14 +71,9 @@ public interface MonitorUpdaterListener { /** * Called when the operation is generating the view */ - public void monitorGeneratingView(); + public void monitorGeneratingView(OperationMonitor operationMonitor); + - /** - * Called when the operation montor is changed - * - * @param operationMonitor - */ - public void monitorChanged(OperationMonitor operationMonitor); }