diff options
| author | Lars Vogel | 2014-08-06 16:01:19 +0000 |
|---|---|---|
| committer | Lars Vogel | 2014-08-08 13:08:34 +0000 |
| commit | b0c42db57212dcc861c68c2998a5293e6759ac41 (patch) | |
| tree | f13f9b1796ef1966901a83e38adce142a8d74b5a | |
| parent | 5e9db39615c3dc3b5746fdd841d0c5455668a573 (diff) | |
| download | eclipse.platform.ui-b0c42db57212dcc861c68c2998a5293e6759ac41.tar.gz eclipse.platform.ui-b0c42db57212dcc861c68c2998a5293e6759ac41.tar.xz eclipse.platform.ui-b0c42db57212dcc861c68c2998a5293e6759ac41.zip | |
Bug 441267 - Avoid calling empty dispose() method in ViewRegistry
Change-Id: Ie1b21c054f3e88de5260b2138d274cc1c000f2ee
Signed-off-by: Lars Vogel <Lars.Vogel@gmail.com>
2 files changed, 6 insertions, 4 deletions
diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkbenchPlugin.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkbenchPlugin.java index 4f5934bc15a..aa5ce6c268f 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkbenchPlugin.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkbenchPlugin.java @@ -7,7 +7,7 @@ * * Contributors: * IBM Corporation - initial API and implementation - * Lars Vogel <Lars.Vogel@gmail.com> - Replace deprecated API usage in WorkbenchPlugin#createExtension - http://bugs.eclipse.org/400714 + * Lars Vogel <Lars.Vogel@gmail.com> - Bug 400714, 441267 *******************************************************************************/ package org.eclipse.ui.internal; @@ -241,7 +241,7 @@ public class WorkbenchPlugin extends AbstractUIPlugin { preferenceManager = null; if (viewRegistry != null) { - viewRegistry.dispose(); + // nothing to dispose for viewRegistry viewRegistry = null; } if (perspRegistry != null) { diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/registry/ViewRegistry.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/registry/ViewRegistry.java index da496997ace..751a2a59496 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/registry/ViewRegistry.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/registry/ViewRegistry.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation * Jan-Hendrik Diederich, Bredex GmbH - bug 201052 - * Lars Vogel <Lars.Vogel@gmail.com> - Bug 430616 + * Lars Vogel <Lars.Vogel@gmail.com> - Bug 430616, 441267 *******************************************************************************/ package org.eclipse.ui.internal.registry; @@ -54,7 +54,6 @@ public class ViewRegistry implements IViewRegistry { @Inject private IWorkbench workbench; - private Map<String, IViewDescriptor> descriptors = new HashMap<String, IViewDescriptor>(); private List<IStickyViewDescriptor> stickyDescriptors = new ArrayList<IStickyViewDescriptor>(); @@ -197,8 +196,11 @@ public class ViewRegistry implements IViewRegistry { } /** + * Method does nothing, should not be called anymore * + * @deprecated */ + @Deprecated public void dispose() { } |