Show correct key sequence affordance for source hovers
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/java/hover/AbstractJavaEditorTextHover.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/java/hover/AbstractJavaEditorTextHover.java
index 1e00b3e..466b6f3 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/java/hover/AbstractJavaEditorTextHover.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/java/hover/AbstractJavaEditorTextHover.java
@@ -141,10 +141,7 @@
public IInformationControlCreator getInformationControlCreator() {
return new IInformationControlCreator() {
public IInformationControl createInformationControl(Shell parent) {
- String affordanceString= null;
- if (JavaPlugin.getDefault().getPreferenceStore().getBoolean(PreferenceConstants.EDITOR_SHOW_TEXT_HOVER_AFFORDANCE))
- affordanceString= getTooltipAffordanceString(); //$NON-NLS-1$
- return new DefaultInformationControl(parent, SWT.NONE, new HTMLTextPresenter(true), affordanceString);
+ return new DefaultInformationControl(parent, SWT.NONE, new HTMLTextPresenter(true), getTooltipAffordanceString());
}
};
}
@@ -152,10 +149,13 @@
/**
* Returns the tool tip affordance string.
*
- * @return the affordance string or <code>null</code> if no key binding is defined
+ * @return the affordance string or <code>null</code> if disabled or no key binding is defined
* @since 3.0
*/
- private String getTooltipAffordanceString() {
+ protected String getTooltipAffordanceString() {
+ if (!JavaPlugin.getDefault().getPreferenceStore().getBoolean(PreferenceConstants.EDITOR_SHOW_TEXT_HOVER_AFFORDANCE))
+ return null;
+
KeySequence[] sequences= getKeySequences();
if (sequences == null)
return null;
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/java/hover/JavaSourceHover.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/java/hover/JavaSourceHover.java
index afd79e1..131d459 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/java/hover/JavaSourceHover.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/java/hover/JavaSourceHover.java
@@ -29,8 +29,6 @@
import org.eclipse.jdt.core.ISourceReference;
import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.ui.PreferenceConstants;
-
import org.eclipse.jdt.internal.corext.codemanipulation.StubUtility;
import org.eclipse.jdt.internal.corext.util.CodeFormatterUtil;
import org.eclipse.jdt.internal.corext.util.Strings;
@@ -123,10 +121,7 @@
public IInformationControlCreator getInformationControlCreator() {
return new IInformationControlCreator() {
public IInformationControl createInformationControl(Shell parent) {
- String affordanceString= null;
- if (JavaPlugin.getDefault().getPreferenceStore().getBoolean(PreferenceConstants.EDITOR_SHOW_TEXT_HOVER_AFFORDANCE))
- affordanceString= JavaHoverMessages.getString("JavaTextHover.makeStickyHint"); //$NON-NLS-1$
- return new SourceViewerInformationControl(parent, affordanceString);
+ return new SourceViewerInformationControl(parent, getTooltipAffordanceString());
}
};
}
