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 3249299fa70..f7afca45bcb 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,6 +608,12 @@ 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 6d3ac74812d..75465d0260e 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,7 +173,10 @@ public final void testSinglePlatform() throws Exception { } } } - if (Util.WS_COCOA.equals(SWT.getPlatform())) { + if (Util.WS_CARBON.equals(SWT.getPlatform()) + || Util.WS_COCOA.equals(SWT.getPlatform())) { + assertEquals(2, numAboutBindings); + } else { assertEquals(1, numAboutBindings); } }