Skip to content

Revert "Remove WS_CARBON check" #3148

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
mickaelistria merged 1 commit into from
Aug 6, 2025
Merged

Revert "Remove WS_CARBON check" #3148

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 7 additions & 1 deletion ...s/org.eclipse.ui.workbench/eclipseui/org/eclipse/ui/internal/keys/BindingPersistence.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -519,7 +519,7 @@ private static final void readBindingsFromPreferences(final IMemento preferences
* @param commandService The command service for the workbench; must
* not be <code>null</code>.
*/

@SuppressWarnings("removal")
private static final void readBindingsFromRegistry(final IConfigurationElement[] configurationElements,
final int configurationElementCount, final BindingManager bindingManager,
final CommandManager commandService) {
Expand Down Expand Up @@ -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);
}
Expand Down
5 changes: 4 additions & 1 deletion ...g.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/keys/BindingPersistenceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}
Expand Down
Loading