From 3a9df56ad1923cc7e8f6707eafadd8cb7f8c4dd7 Mon Sep 17 00:00:00 2001
From: Heng Sin Low <hengsin@gmail.com>
Date: Fri, 22 Mar 2013 18:23:10 +0800
Subject: [PATCH] IDEMPIERE-792 ZK: Memory leak for DPRecentItem and
 DPCalendar.

---
 .../adempiere/webui/dashboard/DPCalendar.java | 20 +++++++++++++++++--
 .../webui/dashboard/DPRecentItems.java        | 20 +++++++++++++++++--
 2 files changed, 36 insertions(+), 4 deletions(-)

diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/dashboard/DPCalendar.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/dashboard/DPCalendar.java
index ccf1911267..4b4e22ea9f 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/dashboard/DPCalendar.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/dashboard/DPCalendar.java
@@ -51,6 +51,7 @@ import org.zkoss.util.Locales;
 import org.zkoss.zk.ui.Component;
 import org.zkoss.zk.ui.Desktop;
 import org.zkoss.zk.ui.Executions;
+import org.zkoss.zk.ui.Page;
 import org.zkoss.zk.ui.event.Event;
 import org.zkoss.zk.ui.event.EventListener;
 import org.zkoss.zk.ui.event.Events;
@@ -123,8 +124,7 @@ public class DPCalendar extends DashboardPanel implements EventListener<Event>,
 
 		calendars.addEventListener("onEventCreate", this);
 		calendars.addEventListener("onEventEdit", this);	
-		
-		EventManager.getInstance().register(ON_REQUEST_CHANGED_TOPIC, this);
+				
 		createStaticListeners();
 	}
 
@@ -464,6 +464,22 @@ public class DPCalendar extends DashboardPanel implements EventListener<Event>,
 		}
 	}
 	
+	@Override
+	public void onPageAttached(Page newpage, Page oldpage) {
+		super.onPageAttached(newpage, oldpage);
+		if (newpage != null) {
+			EventManager.getInstance().register(ON_REQUEST_CHANGED_TOPIC, this);
+			desktop = getDesktop();
+		}
+	}
+	
+	@Override
+	public void onPageDetached(Page page) {
+		super.onPageDetached(page);
+		EventManager.getInstance().unregister(this);
+		desktop = null;
+	}
+	
 	static class TopicSubscriber implements ITopicSubscriber<Map<String, String>> {		
 
 		@Override
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/dashboard/DPRecentItems.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/dashboard/DPRecentItems.java
index 80e6cf9178..8166928945 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/dashboard/DPRecentItems.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/dashboard/DPRecentItems.java
@@ -34,6 +34,7 @@ import org.idempiere.distributed.ITopicSubscriber;
 import org.osgi.service.event.EventHandler;
 import org.zkoss.zk.ui.Component;
 import org.zkoss.zk.ui.Desktop;
+import org.zkoss.zk.ui.Page;
 import org.zkoss.zk.ui.event.DropEvent;
 import org.zkoss.zk.ui.event.Event;
 import org.zkoss.zk.ui.event.EventListener;
@@ -106,8 +107,7 @@ public class DPRecentItems extends DashboardPanel implements EventListener<Event
 		img.setDroppable(DELETE_RECENTITEMS_DROPPABLE);
 		img.setTooltiptext(Util.cleanAmp(Msg.getMsg(ctx, "Delete")));
 		img.addEventListener(Events.ON_DROP, this);
-		//				
-		EventManager.getInstance().register(MRecentItem.ON_RECENT_ITEM_CHANGED_TOPIC, this);
+		//						
 		createTopicSubscriber();
 	}
 
@@ -279,6 +279,22 @@ public class DPRecentItems extends DashboardPanel implements EventListener<Event
 		}
 	}
 
+	@Override
+	public void onPageAttached(Page newpage, Page oldpage) {
+		super.onPageAttached(newpage, oldpage);
+		if (newpage != null) {
+			EventManager.getInstance().register(MRecentItem.ON_RECENT_ITEM_CHANGED_TOPIC, this);
+			desktop = getDesktop();
+		}
+	}
+	
+	@Override
+	public void onPageDetached(Page page) {
+		super.onPageDetached(page);
+		EventManager.getInstance().unregister(this);
+		desktop = null;
+	}
+	
 	static class TopicSubscriber implements ITopicSubscriber<Integer> {
 		@Override
 		public void onMessage(Integer message) {