From 1767d2fcfc59f3b3d41a10167cffb4635c41f946 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B0=D0=BD=D0=B4=D1=8A?= =?UTF-8?q?=D1=80=20=D0=9A=D1=83=D1=80=D1=82=D0=B0=D0=BA=D0=BE=D0=B2?= Date: Sat, 3 Jan 2026 17:46:02 +0200 Subject: [PATCH] Deprecate for removal QuickMenuCreator#dispose And stop calling it as it is a no-op anyway. --- .../org/eclipse/ui/internal/ide/actions/QuickMenuAction.java | 3 +-- .../eclipseui/org/eclipse/ui/actions/QuickMenuCreator.java | 2 +- .../eclipse/ui/internal/actions/ModifyWorkingSetDelegate.java | 3 +-- .../org/eclipse/ui/internal/handlers/QuickMenuHandler.java | 3 +-- 4 files changed, 4 insertions(+), 7 deletions(-) diff --git a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/actions/QuickMenuAction.java b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/actions/QuickMenuAction.java index 25135d55937c..005f0423fd37 100644 --- a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/actions/QuickMenuAction.java +++ b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/actions/QuickMenuAction.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2004, 2015 IBM Corporation and others. + * Copyright (c) 2004, 2026 IBM Corporation and others. * * This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -61,7 +61,6 @@ public void run() { */ public void dispose() { if (creator != null) { - creator.dispose(); creator = null; } } diff --git a/bundles/org.eclipse.ui.workbench/eclipseui/org/eclipse/ui/actions/QuickMenuCreator.java b/bundles/org.eclipse.ui.workbench/eclipseui/org/eclipse/ui/actions/QuickMenuCreator.java index 43c22be37a8f..c1fa710c6771 100644 --- a/bundles/org.eclipse.ui.workbench/eclipseui/org/eclipse/ui/actions/QuickMenuCreator.java +++ b/bundles/org.eclipse.ui.workbench/eclipseui/org/eclipse/ui/actions/QuickMenuCreator.java @@ -274,7 +274,7 @@ private int getAverageCharWidth(Control control) { * {@link #createMenu()} will be disposed shortly after the SWT.Hide * event. */ - @Deprecated + @Deprecated(forRemoval = true, since = "2026-03") public void dispose() { } } diff --git a/bundles/org.eclipse.ui.workbench/eclipseui/org/eclipse/ui/internal/actions/ModifyWorkingSetDelegate.java b/bundles/org.eclipse.ui.workbench/eclipseui/org/eclipse/ui/internal/actions/ModifyWorkingSetDelegate.java index fc187bb53f2f..81700289a74b 100644 --- a/bundles/org.eclipse.ui.workbench/eclipseui/org/eclipse/ui/internal/actions/ModifyWorkingSetDelegate.java +++ b/bundles/org.eclipse.ui.workbench/eclipseui/org/eclipse/ui/internal/actions/ModifyWorkingSetDelegate.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2006, 2015 IBM Corporation and others. + * Copyright (c) 2006, 2026 IBM Corporation and others. * * This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -164,7 +164,6 @@ public void init(IWorkbenchWindow window) { public void dispose() { getWindow().getWorkbench().getWorkingSetManager().removePropertyChangeListener(listener); super.dispose(); - contextMenuCreator.dispose(); } @Override diff --git a/bundles/org.eclipse.ui.workbench/eclipseui/org/eclipse/ui/internal/handlers/QuickMenuHandler.java b/bundles/org.eclipse.ui.workbench/eclipseui/org/eclipse/ui/internal/handlers/QuickMenuHandler.java index a2e977ecd70c..de6cb251ab1a 100644 --- a/bundles/org.eclipse.ui.workbench/eclipseui/org/eclipse/ui/internal/handlers/QuickMenuHandler.java +++ b/bundles/org.eclipse.ui.workbench/eclipseui/org/eclipse/ui/internal/handlers/QuickMenuHandler.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008, 2015 IBM Corporation and others. + * Copyright (c) 2008, 2026 IBM Corporation and others. * * This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -65,7 +65,6 @@ public Object execute(ExecutionEvent event) throws ExecutionException { @Override public void dispose() { if (creator != null) { - creator.dispose(); creator = null; } }