From b060d75c78edeb4b6d4c2f2395b257afcd2aee41 Mon Sep 17 00:00:00 2001 From: Elsa Zacharia Date: Fri, 18 Jul 2025 19:34:30 +0530 Subject: [PATCH] This PR removes the only remaining WS_CARBON check from the codebase.The Carbon backend is no longer used or supported in SWT, as all modern macOS environments use the Cocoa backend (WS_COCOA). This check is now obsolete and can be removed. (#2964) --- .../org/eclipse/ui/internal/keys/BindingPersistence.java | 8 +------- .../org/eclipse/ui/tests/keys/BindingPersistenceTest.java | 5 +---- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/bundles/org.eclipse.ui.workbench/eclipseui/org/eclipse/ui/internal/keys/BindingPersistence.java b/bundles/org.eclipse.ui.workbench/eclipseui/org/eclipse/ui/internal/keys/BindingPersistence.java index f7afca45bcb..3249299fa70 100644 --- a/bundles/org.eclipse.ui.workbench/eclipseui/org/eclipse/ui/internal/keys/BindingPersistence.java +++ b/bundles/org.eclipse.ui.workbench/eclipseui/org/eclipse/ui/internal/keys/BindingPersistence.java @@ -519,7 +519,7 @@ private static final void readBindingsFromPreferences(final IMemento preferences * @param commandService The command service for the workbench; must * not be null. */ - @SuppressWarnings("removal") + private static final void readBindingsFromRegistry(final IConfigurationElement[] configurationElements, final int configurationElementCount, final BindingManager bindingManager, final CommandManager commandService) { @@ -608,12 +608,6 @@ private static final void readBindingsFromRegistry(final IConfigurationElement[] if (Util.WS_COCOA.equals(platform)) { cocoaTempList.add(binding); - } else if (Util.WS_CARBON.equals(platform)) { - bindings.add(binding); - // temp work around ... simply honour the carbon - // bindings for cocoa. - cocoaTempList.add(new KeyBinding(keySequence, parameterizedCommand, schemeId, contextId, locale, - Util.WS_COCOA, null, Binding.SYSTEM)); } else { bindings.add(binding); } diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/keys/BindingPersistenceTest.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/keys/BindingPersistenceTest.java index 75465d0260e..6d3ac74812d 100644 --- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/keys/BindingPersistenceTest.java +++ b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/keys/BindingPersistenceTest.java @@ -173,10 +173,7 @@ public final void testSinglePlatform() throws Exception { } } } - if (Util.WS_CARBON.equals(SWT.getPlatform()) - || Util.WS_COCOA.equals(SWT.getPlatform())) { - assertEquals(2, numAboutBindings); - } else { + if (Util.WS_COCOA.equals(SWT.getPlatform())) { assertEquals(1, numAboutBindings); } }