diff options
| author | crogers | 2011-09-26 21:44:42 +0000 |
|---|---|---|
| committer | crogers | 2011-09-26 21:44:42 +0000 |
| commit | 8e44340760099dce2f9e08732825cdf7d981f4d1 (patch) | |
| tree | cd4ce5ec60cf45884e8b1125ac2c5aba52db944b | |
| parent | b037241ea67d728fede89bd20080962440ebdd6e (diff) | |
| download | webtools.jsf-8e44340760099dce2f9e08732825cdf7d981f4d1.tar.gz webtools.jsf-8e44340760099dce2f9e08732825cdf7d981f4d1.tar.xz webtools.jsf-8e44340760099dce2f9e08732825cdf7d981f4d1.zip | |
[Bug 358342] additional clean up of referenced objects during editor dispose.
2 files changed, 6 insertions, 1 deletions
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/SimpleGraphicalEditor.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/SimpleGraphicalEditor.java index 8d3bdecb9..885bb4f3f 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/SimpleGraphicalEditor.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/SimpleGraphicalEditor.java @@ -186,6 +186,11 @@ public class SimpleGraphicalEditor extends GraphicalEditorWithFlyoutPalette impl _model.getUndoManager().disconnect(this); } + _paletteViewerPage = null; + _palette = null; + _model = null; + _viewer = null; + super.dispose(); } diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/actions/DesignPageActionContributor.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/actions/DesignPageActionContributor.java index a1782ec5d..09989f2da 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/actions/DesignPageActionContributor.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/actions/DesignPageActionContributor.java @@ -232,6 +232,6 @@ public class DesignPageActionContributor extends EditorActionBarContributor { * @see org.eclipse.ui.IEditorActionBarContributor#dispose() */ public void dispose() { - // TODO: anything to dispose? + _editorPart = null; } } |