Skip to content

Remove IPropertyChangeListener registration in dispose method of editor #3233

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 1, 2025
Merged

Remove IPropertyChangeListener registration in dispose method of editor #3233

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d76d164
Remove IPropertyChangeListener registration in dispose method of editor
tobias-melcher Aug 29, 2025
d4aecae
Version bump(s) for 4.38 stream
eclipse-platform-bot Sep 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion bundles/org.eclipse.ui.workbench/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.ui.workbench; singleton:=true
Bundle-Version: 3.136.0.qualifier
Bundle-Version: 3.136.100.qualifier
Bundle-Activator: org.eclipse.ui.internal.WorkbenchPlugin
Bundle-ActivationPolicy: lazy
Bundle-Vendor: %providerName
Expand Down
8 changes: 8 additions & 0 deletions bundles/org.eclipse.ui.workbench/eclipseui/org/eclipse/ui/part/EditorPart.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,4 +291,12 @@ protected final void checkSite(IWorkbenchPartSite site) {
Assert.isTrue(site instanceof IEditorSite, "The site for an editor must be an IEditorSite"); //$NON-NLS-1$
}

@Override
public void dispose() {
if (compatibilityTitleListener != null) {
removePropertyListener(compatibilityTitleListener);
compatibilityTitleListener = null;
}
super.dispose();
}
}
12 changes: 10 additions & 2 deletions bundles/org.eclipse.ui.workbench/eclipseui/org/eclipse/ui/part/MultiPageEditorPart.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,18 +153,21 @@ public abstract class MultiPageEditorPart extends EditorPart implements IPageCha

private ListenerList<IPageChangedListener> pageChangeListeners = new ListenerList<>(ListenerList.IDENTITY);

private org.eclipse.jface.util.IPropertyChangeListener propertyChangeListenerToUpdateContainer;

/**
* Creates an empty multi-page editor with no pages and registers a
* {@link PropertyChangeListener} to listen for changes to the editor's
* preference..
*/
protected MultiPageEditorPart() {
super();
getAPIPreferenceStore().addPropertyChangeListener(event -> {
propertyChangeListenerToUpdateContainer = event -> {
if (isUpdateRequired(event)) {
updateContainer();
}
});
};
getAPIPreferenceStore().addPropertyChangeListener(propertyChangeListenerToUpdateContainer);
}

/**
Expand Down Expand Up @@ -526,6 +529,11 @@ protected IEditorSite createSite(IEditorPart editor) {
*/
@Override
public void dispose() {
IPreferenceStore store = getAPIPreferenceStore();
if (propertyChangeListenerToUpdateContainer != null) {
store.removePropertyChangeListener(propertyChangeListenerToUpdateContainer);
propertyChangeListenerToUpdateContainer = null;
}
if (getSite() != null) {
deactivateSite(true, false);
}
Expand Down
Loading