From 6226225b781fbbad945b1dca9c9ed611f0f45c42 Mon Sep 17 00:00:00 2001
From: Giancarlo Panichi <giancarlo.panichi@isti.cnr.it>
Date: Mon, 27 Apr 2015 09:28:36 +0000
Subject: [PATCH] Minor Update

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-monitor-widget@114425 82a268e6-3cf1-43bd-a215-b396298e98cf
---
 .../user/td/monitorwidget/client/MonitorDialog.java      | 3 +++
 .../client/background/MonitorBackgroundDialog.java       | 3 +++
 .../client/background/MonitorBackgroundInfoDialog.java   | 4 ++++
 .../client/background/MonitorBackgroundInfoPanel.java    | 7 +++++++
 .../client/background/MonitorBackgroundPanel.java        | 9 ++++++++-
 5 files changed, 25 insertions(+), 1 deletion(-)

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 1b9a95a..b33f225 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
@@ -451,6 +451,9 @@ public class MonitorDialog extends Window implements MonitorUpdaterListener {
 	}
 
 	protected void close() {
+		if(progressUpdater!=null){
+			progressUpdater.cancel();
+		}
 		hide();
 
 	}
diff --git a/src/main/java/org/gcube/portlets/user/td/monitorwidget/client/background/MonitorBackgroundDialog.java b/src/main/java/org/gcube/portlets/user/td/monitorwidget/client/background/MonitorBackgroundDialog.java
index 7ff18eb..70ce59e 100644
--- a/src/main/java/org/gcube/portlets/user/td/monitorwidget/client/background/MonitorBackgroundDialog.java
+++ b/src/main/java/org/gcube/portlets/user/td/monitorwidget/client/background/MonitorBackgroundDialog.java
@@ -78,6 +78,9 @@ public class MonitorBackgroundDialog extends Window {
 	}
 
 	protected void close() {
+		if (monitorBackgroundPanel != null) {
+			monitorBackgroundPanel.cancelMonitorBackgroundUpdater();
+		}
 		hide();
 
 	}
diff --git a/src/main/java/org/gcube/portlets/user/td/monitorwidget/client/background/MonitorBackgroundInfoDialog.java b/src/main/java/org/gcube/portlets/user/td/monitorwidget/client/background/MonitorBackgroundInfoDialog.java
index 9726b17..3a3792e 100644
--- a/src/main/java/org/gcube/portlets/user/td/monitorwidget/client/background/MonitorBackgroundInfoDialog.java
+++ b/src/main/java/org/gcube/portlets/user/td/monitorwidget/client/background/MonitorBackgroundInfoDialog.java
@@ -71,7 +71,11 @@ public class MonitorBackgroundInfoDialog extends Window {
 	}
 
 	protected void close() {
+		if(monitorBackgroundInfoPanel!=null){
+			monitorBackgroundInfoPanel.cancelMonitorBackgroundInfoUpdater();
+		}
 		hide();
+		
 
 	}
 	
diff --git a/src/main/java/org/gcube/portlets/user/td/monitorwidget/client/background/MonitorBackgroundInfoPanel.java b/src/main/java/org/gcube/portlets/user/td/monitorwidget/client/background/MonitorBackgroundInfoPanel.java
index 9876756..ccd19ce 100644
--- a/src/main/java/org/gcube/portlets/user/td/monitorwidget/client/background/MonitorBackgroundInfoPanel.java
+++ b/src/main/java/org/gcube/portlets/user/td/monitorwidget/client/background/MonitorBackgroundInfoPanel.java
@@ -408,6 +408,13 @@ public class MonitorBackgroundInfoPanel extends FramedPanel implements
 		monitorBackgroundInfoUpdater.scheduleRepeating(STATUS_POLLING_DELAY);
 		monitorBackgroundInfoUpdater.run();
 	}
+	
+	public void cancelMonitorBackgroundInfoUpdater(){
+		if(monitorBackgroundInfoUpdater!=null){
+			monitorBackgroundInfoUpdater.cancel();
+		}
+	}
+	
 
 	protected void close() {
 		if (parent != null) {
diff --git a/src/main/java/org/gcube/portlets/user/td/monitorwidget/client/background/MonitorBackgroundPanel.java b/src/main/java/org/gcube/portlets/user/td/monitorwidget/client/background/MonitorBackgroundPanel.java
index 55aea8f..45d8701 100644
--- a/src/main/java/org/gcube/portlets/user/td/monitorwidget/client/background/MonitorBackgroundPanel.java
+++ b/src/main/java/org/gcube/portlets/user/td/monitorwidget/client/background/MonitorBackgroundPanel.java
@@ -236,9 +236,16 @@ public class MonitorBackgroundPanel extends FramedPanel implements
 		if (parent != null) {
 			parent.close();
 		}
-		monitorBackgroundUpdater.cancel();
+		
 
 	}
+	
+	public void cancelMonitorBackgroundUpdater(){
+		if(monitorBackgroundUpdater!=null){
+			monitorBackgroundUpdater.cancel();
+		}
+	}
+	
 
 	private void addChildrensToStore() {
 		if (backgroundOperationMonitorList != null) {