Bug 544497 - Variables and Breakpoints view: "Content Assist Available"
hover is missing keybinding
Change-Id: I073e469b410321923f49bd91c6eae56bb817312e
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JDIContentAssistPreference.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JDIContentAssistPreference.java
index 994c7f5..4d36c27 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JDIContentAssistPreference.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JDIContentAssistPreference.java
@@ -22,8 +22,6 @@
import org.eclipse.jdt.ui.PreferenceConstants;
import org.eclipse.jdt.ui.text.IColorManager;
import org.eclipse.jdt.ui.text.JavaTextTools;
-import org.eclipse.jface.bindings.keys.KeyStroke;
-import org.eclipse.jface.bindings.keys.ParseException;
import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.jface.preference.PreferenceConverter;
import org.eclipse.jface.text.IDocument;
@@ -33,6 +31,9 @@
import org.eclipse.osgi.util.NLS;
import org.eclipse.swt.graphics.Color;
import org.eclipse.swt.graphics.RGB;
+import org.eclipse.ui.IWorkbenchCommandConstants;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.keys.IBindingService;
public class JDIContentAssistPreference {
@@ -234,16 +235,9 @@
return PreferenceConstants.getPreferenceStore();
}
- private static KeyStroke safeKeyStroke(String keyStrokePattern) {
- try {
- return KeyStroke.getInstance(keyStrokePattern);
- } catch (ParseException e) {
- return null;
- }
- }
-
public static String getContentAssistDescription() {
- KeyStroke triggeringKeyStroke = safeKeyStroke("Ctrl+Space"); //$NON-NLS-1$
- return NLS.bind(DebugUIMessages.JavaVariableContentAssistDescription_Keystroke, triggeringKeyStroke);
+ IBindingService bindingService = PlatformUI
+ .getWorkbench().getService(IBindingService.class);
+ return NLS.bind(DebugUIMessages.JavaVariableContentAssistDescription_Keystroke, bindingService.getBestActiveBindingFormattedFor(IWorkbenchCommandConstants.EDIT_CONTENT_ASSIST));
}
}
