25818
diff --git a/bundles/org.eclipse.ui/Eclipse UI/org/eclipse/ui/part/PageBookView.java b/bundles/org.eclipse.ui/Eclipse UI/org/eclipse/ui/part/PageBookView.java
index cc77ba9..70c287a 100644
--- a/bundles/org.eclipse.ui/Eclipse UI/org/eclipse/ui/part/PageBookView.java
+++ b/bundles/org.eclipse.ui/Eclipse UI/org/eclipse/ui/part/PageBookView.java
@@ -1,26 +1,27 @@
+/**********************************************************************
+Copyright (c) 2000, 2002 IBM Corp. and others.
+All rights reserved. This program and the accompanying materials
+are made available under the terms of the Common Public License v1.0
+which accompanies this distribution, and is available at
+http://www.eclipse.org/legal/cpl-v10.html
+
+Contributors:
+ IBM Corporation - Initial implementation
+**********************************************************************/
+
package org.eclipse.ui.part;
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-import org.eclipse.ui.*;
-import org.eclipse.ui.internal.SubActionBars;
-import org.eclipse.ui.part.PageSite;
-import org.eclipse.ui.internal.WorkbenchPlugin;
-import org.eclipse.jface.action.*;
+import java.util.*;
+
+import org.eclipse.jface.action.IAction;
import org.eclipse.jface.util.*;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.jface.viewers.*;
import org.eclipse.swt.SWT;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.events.FocusListener;
-import org.eclipse.swt.events.FocusEvent;
-import java.util.*;
+import org.eclipse.ui.*;
+import org.eclipse.ui.internal.SubActionBars;
+import org.eclipse.ui.internal.WorkbenchPlugin;
/**
* Abstract superclass of all multi-page workbench views.
@@ -360,6 +361,10 @@
Iterator enum = clone.values().iterator();
while (enum.hasNext()) {
PageRec rec = (PageRec) enum.next();
+ // Fix for bug 25818 -- to be cleaned up
+ if (rec.subActionBars != null) {
+ rec.subActionBars.dispose();
+ }
removePage(rec);
}
@@ -533,6 +538,7 @@
* method deal with the closing of the active part. Subclasses may extend.
*/
public void partClosed(IWorkbenchPart part) {
+ PageRec rec = getPageRec(part);
// Update the active part.
if (activeRec != null && activeRec.part == part) {
activeRec.subActionBars.dispose();
@@ -544,9 +550,14 @@
activeRec = null;
showPageRec(defaultPageRec);
}
+ else {
+ // Fix for bug 25818 -- to be cleaned up
+ if (rec != null && rec.subActionBars != null) {
+ rec.subActionBars.dispose();
+ }
+ }
// Find and remove the part page.
- PageRec rec = getPageRec(part);
if (rec != null)
removePage(rec);
}
diff --git a/bundles/org.eclipse.ui/buildnotes_workbench.html b/bundles/org.eclipse.ui/buildnotes_workbench.html
index baab2e7..e77f221 100644
--- a/bundles/org.eclipse.ui/buildnotes_workbench.html
+++ b/bundles/org.eclipse.ui/buildnotes_workbench.html
@@ -11,6 +11,30 @@
<h1>
Eclipse Platform Build Notes<br>
Workbench</h1>
+Eclipse Integration Build 20021107
+<h2>
+What's new in this drop</h2>
+
+<h3>
+API changes</h3>
+
+<h3>
+API additions</h3>
+
+<h3>
+Other highlights</h3>
+
+<h2>
+Known deficiencies</h2>
+
+<h2>
+Problem reports fixed</h2>
+
+<p>
+<a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=25818">Bug 25818</a> [Workbench] PageBookView causes editors to leak
+<p>
+
+<hr SIZE=0 WIDTH="100%">
Eclipse Integration Build 20021023
<h2>
What's new in this drop</h2>
