| commit | a8dc89f6a2cf8f41d2a13ac38ef9d0911aae5c45 | [log] [tgz] |
|---|---|---|
| author | Chris McLaren <cmclaren> | Wed Oct 29 22:25:46 2003 +0000 |
| committer | Chris McLaren <cmclaren> | Wed Oct 29 22:25:46 2003 +0000 |
| tree | 3172518ecf4c309a4be967ad960f34f2f3e5675c | |
| parent | f1f58a2f6dde8bd2cd22d47135bdb46f83b0ccff [diff] |
*** empty log message ***
diff --git a/bundles/org.eclipse.jface/src/org/eclipse/jface/action/ActionContributionItem.java b/bundles/org.eclipse.jface/src/org/eclipse/jface/action/ActionContributionItem.java index b5f4941..2493247 100644 --- a/bundles/org.eclipse.jface/src/org/eclipse/jface/action/ActionContributionItem.java +++ b/bundles/org.eclipse.jface/src/org/eclipse/jface/action/ActionContributionItem.java
@@ -668,7 +668,10 @@ if (overrides != null) text = getParent().getOverrides().getText(this); - mi.setAccelerator(accelerator != null ? accelerator.intValue() : 0); + if (accelerator == null) + accelerator = new Integer(action.getAccelerator()); + + mi.setAccelerator(accelerator.intValue()); if (text == null) text = action.getText();
diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/commands/KeysPreferencePage.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/commands/KeysPreferencePage.java index 1bfc7de..00f2b58 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/commands/KeysPreferencePage.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/commands/KeysPreferencePage.java
@@ -56,7 +56,6 @@ import org.eclipse.ui.IWorkbenchPreferencePage; import org.eclipse.ui.activities.IActivity; import org.eclipse.ui.activities.IActivityManager; -import org.eclipse.ui.commands.ICommandManager; import org.eclipse.ui.internal.Workbench; import org.eclipse.ui.internal.WorkbenchPlugin; import org.eclipse.ui.internal.keys.KeySequenceText;