[41844 svn/public] client/trunk

[<am...@vu...>]

Revision: 41844
Author:   amogge
Date:     2015-03-26 19:28:49 +0000 (Thu, 26 Mar 2015)
Log Message:
-----------
deregisterEntry

Modified Paths:
--------------
    client/trunk/azureus2/src/com/aelitis/azureus/ui/mdi/MultipleDocumentInterface.java
    client/trunk/azureus3/src/com/aelitis/azureus/ui/swt/mdi/BaseMDI.java

Modified: client/trunk/azureus2/src/com/aelitis/azureus/ui/mdi/MultipleDocumentInterface.java
===================================================================
--- client/trunk/azureus2/src/com/aelitis/azureus/ui/mdi/MultipleDocumentInterface.java	2015-03-26 19:27:22 UTC (rev 41843)
+++ client/trunk/azureus2/src/com/aelitis/azureus/ui/mdi/MultipleDocumentInterface.java	2015-03-26 19:28:49 UTC (rev 41844)
@@ -135,6 +135,11 @@
 	public void registerEntry(String id,
 			MdiEntryCreationListener2 mdiEntryCreationListener2);
 
+	public void deregisterEntry(String id, MdiEntryCreationListener l);
+	
+	public void deregisterEntry(String id,
+			MdiEntryCreationListener2 mdiEntryCreationListener2);
+
 	public boolean entryExists(String id);
 
 	public void removeItem(MdiEntry entry);

Modified: client/trunk/azureus3/src/com/aelitis/azureus/ui/swt/mdi/BaseMDI.java
===================================================================
--- client/trunk/azureus3/src/com/aelitis/azureus/ui/swt/mdi/BaseMDI.java	2015-03-26 19:27:22 UTC (rev 41843)
+++ client/trunk/azureus3/src/com/aelitis/azureus/ui/swt/mdi/BaseMDI.java	2015-03-26 19:28:49 UTC (rev 41844)
@@ -279,6 +279,7 @@
 		return currentEntry.getView().getViewID();
 	}
 
+	// @see com.aelitis.azureus.ui.mdi.MultipleDocumentInterface#registerEntry(java.lang.String, com.aelitis.azureus.ui.mdi.MdiEntryCreationListener2)
 	public void registerEntry(String id, MdiEntryCreationListener2 l) {
 		if (mapIdToCreationListener.containsKey(id)) {
 			System.err.println("Warning: MDIEntry " + id
@@ -289,6 +290,14 @@
 		
 		createIfAutoOpen(id);
 	}
+	
+	// @see com.aelitis.azureus.ui.mdi.MultipleDocumentInterface#deregisterEntry(java.lang.String, com.aelitis.azureus.ui.mdi.MdiEntryCreationListener2)
+	public void deregisterEntry(String id, MdiEntryCreationListener2 l) {
+		MdiEntryCreationListener2 l2 = mapIdToCreationListener2.get(id);
+		if (l == l2) {
+			mapIdToCreationListener2.remove(id);
+		}
+	}
 
 	private boolean createIfAutoOpen(String id) {
 		Object o = mapAutoOpen.get(id);
@@ -355,6 +364,7 @@
 		return null;
 	}
 
+	// @see com.aelitis.azureus.ui.mdi.MultipleDocumentInterface#registerEntry(java.lang.String, com.aelitis.azureus.ui.mdi.MdiEntryCreationListener)
 	public void registerEntry(String id, MdiEntryCreationListener l) {
 		if (mapIdToCreationListener.containsKey(id)
 				|| mapIdToCreationListener2.containsKey(id)) {
@@ -367,6 +377,14 @@
 		createIfAutoOpen(id);
 	}
 
+	// @see com.aelitis.azureus.ui.mdi.MultipleDocumentInterface#deregisterEntry(java.lang.String, com.aelitis.azureus.ui.mdi.MdiEntryCreationListener)
+	public void deregisterEntry(String id, MdiEntryCreationListener l) {
+		MdiEntryCreationListener l2 = mapIdToCreationListener.get(id);
+		if (l == l2) {
+			mapIdToCreationListener.remove(id);
+		}
+	}
+	
 	public boolean showEntryByID(String id) {
 		return loadEntryByID(id, true);
 	}