Bug 548041: Fix auto activation of content assistants
Backport-of: a55c0a3f49c5cf201571c2a5b85da2019abcc912
Change-Id: I6187f02b7f20c520582004edb53012093581367f
diff --git a/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ecommons/text/ui/settings/AssistPreferences.java b/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ecommons/text/ui/settings/AssistPreferences.java
index 6356946..26c3e74 100644
--- a/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ecommons/text/ui/settings/AssistPreferences.java
+++ b/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ecommons/text/ui/settings/AssistPreferences.java
@@ -35,6 +35,10 @@
public class AssistPreferences {
+ private static final BooleanPref CONTENT_ASSIST_AUTO_ACTIVATION_ENABLED_PREF= new BooleanPref(
+ LTKUIPreferences.ASSIST_PREF_QUALIFIER, "ContentAssist.AutoActivation.enabled"); //$NON-NLS-1$);
+
+
private final String qualifier;
/**
@@ -83,7 +87,7 @@
public AssistPreferences(final String prefQualifier) {
this.qualifier= prefQualifier;
- this.fAutoActivationEnabled= new BooleanPref(prefQualifier, "AutoActivation.enable"); //$NON-NLS-1$
+ this.fAutoActivationEnabled= CONTENT_ASSIST_AUTO_ACTIVATION_ENABLED_PREF;
this.fAutoActivationDelay= LTKUIPreferences.CONTENT_ASSIST_DELAY_PREF;
this.fAutoInsertSingle= new BooleanPref(prefQualifier, "AutoInsert.Single.enable"); //$NON-NLS-1$
this.fAutoInsertPrefix= new BooleanPref(prefQualifier, "AutoInsert.Prefix.enable"); //$NON-NLS-1$
diff --git a/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/internal/ltk/ui/LTKUIPreferenceInitializer.java b/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/internal/ltk/ui/LTKUIPreferenceInitializer.java
index f4617dc..2baafb3 100644
--- a/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/internal/ltk/ui/LTKUIPreferenceInitializer.java
+++ b/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/internal/ltk/ui/LTKUIPreferenceInitializer.java
@@ -44,6 +44,7 @@
theme.getColorPrefValue(IWaThemeConstants.MATCHING_BRACKET_COLOR) );
}
{ final IEclipsePreferences node= context.getNode(LTKUIPreferences.ASSIST_PREF_QUALIFIER);
+ node.putBoolean("ContentAssist.AutoActivation.enabled", true); //$NON-NLS-1$
node.putInt(LTKUIPreferences.CONTENT_ASSIST_DELAY_PREF_KEY, 150);
node.put(LTKUIPreferences.CONTEXT_INFO_BACKGROUND_COLOR_PREF_KEY,
theme.getColorPrefValue(IWaThemeConstants.INFORMATION_BACKGROUND_COLOR) );
