Bug 575354: Adapt to enhanced preference access
Change-Id: I931fca546db3d76dc0b80a163a5351aa8d7b134e
diff --git a/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/internal/ltk/ui/refactoring/ECommonsRefactoring.java b/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/internal/ltk/ui/refactoring/ECommonsRefactoring.java
index bb7279e..99b77a0 100644
--- a/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/internal/ltk/ui/refactoring/ECommonsRefactoring.java
+++ b/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/internal/ltk/ui/refactoring/ECommonsRefactoring.java
@@ -16,8 +16,9 @@
import org.eclipse.core.runtime.preferences.InstanceScope;
+import org.eclipse.statet.ecommons.preferences.core.EPreferences;
import org.eclipse.statet.ecommons.preferences.core.Preference.BooleanPref;
-import org.eclipse.statet.ecommons.preferences.core.util.PreferenceUtils;
+import org.eclipse.statet.ecommons.preferences.core.PreferenceUtils;
import org.eclipse.statet.ltk.ui.LtkUI;
@@ -29,7 +30,7 @@
public static boolean getSaveAllEditors() {
- return PreferenceUtils.getInstancePrefs().getPreferenceValue(PREF_SAVE_ALL_EDITORS);
+ return EPreferences.getInstancePrefs().getPreferenceValue(PREF_SAVE_ALL_EDITORS);
}
public static void setSaveAllEditors(final boolean save) {
diff --git a/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/sourceediting/SourceEditor1.java b/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/sourceediting/SourceEditor1.java
index 580c037..03f479e 100644
--- a/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/sourceediting/SourceEditor1.java
+++ b/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/sourceediting/SourceEditor1.java
@@ -84,8 +84,8 @@
import org.eclipse.statet.ecommons.preferences.PreferencesUtil;
import org.eclipse.statet.ecommons.preferences.SettingsChangeNotifier;
+import org.eclipse.statet.ecommons.preferences.core.EPreferences;
import org.eclipse.statet.ecommons.preferences.core.Preference;
-import org.eclipse.statet.ecommons.preferences.core.util.PreferenceUtils;
import org.eclipse.statet.ecommons.text.ICharPairMatcher;
import org.eclipse.statet.ecommons.text.core.JFaceTextRegion;
import org.eclipse.statet.ecommons.text.core.sections.DocContentSections;
@@ -591,12 +591,12 @@
uninstallFoldingProvider();
}
});
- PreferenceUtils.getInstancePrefs().addPreferenceNodeListener(
+ EPreferences.getInstancePrefs().addPreferenceNodeListener(
this.foldingEnablement.getQualifier(), this);
updateFoldingEnablement();
}
if (this.markOccurrencesEnablement != null) {
- PreferenceUtils.getInstancePrefs().addPreferenceNodeListener(
+ EPreferences.getInstancePrefs().addPreferenceNodeListener(
this.markOccurrencesEnablement.getQualifier(), this);
updateMarkOccurrencesEnablement();
}
@@ -720,8 +720,8 @@
UIAccess.getDisplay().asyncExec(new Runnable() {
@Override
public void run() {
- final Boolean enable= PreferenceUtils.getInstancePrefs().getPreferenceValue(
- SourceEditor1.this.foldingEnablement );
+ final Boolean enable= EPreferences.getInstancePrefs()
+ .getPreferenceValue(SourceEditor1.this.foldingEnablement);
final ProjectionViewer viewer= (ProjectionViewer)getSourceViewer();
if (enable != null && UIAccess.isOkToUse(viewer)) {
if (enable != viewer.isProjectionMode()) {
@@ -751,8 +751,8 @@
UIAccess.getDisplay().asyncExec(new Runnable() {
@Override
public void run() {
- final Boolean enable= PreferenceUtils.getInstancePrefs().getPreferenceValue(
- SourceEditor1.this.markOccurrencesEnablement );
+ final Boolean enable= EPreferences.getInstancePrefs()
+ .getPreferenceValue(SourceEditor1.this.markOccurrencesEnablement);
if (enable) {
var provider= SourceEditor1.this.markOccurrencesProvider;
if (provider == null) {
@@ -1144,14 +1144,14 @@
}
{ final var foldingEnablement= this.foldingEnablement;
if (foldingEnablement != null) {
- PreferenceUtils.getInstancePrefs().removePreferenceNodeListener(
+ EPreferences.getInstancePrefs().removePreferenceNodeListener(
foldingEnablement.getQualifier(), this );
uninstallFoldingProvider();
}
}
{ final var markOccurrencesEnablement= this.markOccurrencesEnablement;
if (markOccurrencesEnablement != null) {
- PreferenceUtils.getInstancePrefs().removePreferenceNodeListener(
+ EPreferences.getInstancePrefs().removePreferenceNodeListener(
markOccurrencesEnablement.getQualifier(), this );
uninstallMarkOccurrencesProvider();
}
diff --git a/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/sourceediting/assist/AssistPreferences.java b/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/sourceediting/assist/AssistPreferences.java
index c42306c..ec612f0 100644
--- a/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/sourceediting/assist/AssistPreferences.java
+++ b/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/sourceediting/assist/AssistPreferences.java
@@ -20,11 +20,11 @@
import org.eclipse.statet.jcommons.lang.NonNullByDefault;
+import org.eclipse.statet.ecommons.preferences.core.EPreferences;
import org.eclipse.statet.ecommons.preferences.core.Preference;
import org.eclipse.statet.ecommons.preferences.core.Preference.BooleanPref;
import org.eclipse.statet.ecommons.preferences.core.Preference.IntPref;
import org.eclipse.statet.ecommons.preferences.core.PreferenceAccess;
-import org.eclipse.statet.ecommons.preferences.core.util.PreferenceUtils;
import org.eclipse.statet.ecommons.preferences.ui.RGBPref;
import org.eclipse.statet.ltk.ui.LtkUIPreferences;
@@ -148,7 +148,7 @@
* Configure the given content assistant according common StatET settings.
*/
public void configure(final ContentAssistant assistant) {
- final PreferenceAccess prefs= PreferenceUtils.getInstancePrefs();
+ final PreferenceAccess prefs= EPreferences.getInstancePrefs();
assistant.enableAutoActivation(prefs.getPreferenceValue(this.autoActivationEnabled));
assistant.setAutoActivationDelay(prefs.getPreferenceValue(this.autoActivationDelay));
diff --git a/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/sourceediting/assist/ContentAssistComputerRegistry.java b/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/sourceediting/assist/ContentAssistComputerRegistry.java
index 860976d..951b65a 100644
--- a/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/sourceediting/assist/ContentAssistComputerRegistry.java
+++ b/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/sourceediting/assist/ContentAssistComputerRegistry.java
@@ -45,11 +45,11 @@
import org.eclipse.statet.ecommons.preferences.PreferencesUtil;
import org.eclipse.statet.ecommons.preferences.SettingsChangeNotifier;
import org.eclipse.statet.ecommons.preferences.SettingsChangeNotifier.ManageListener;
+import org.eclipse.statet.ecommons.preferences.core.EPreferences;
import org.eclipse.statet.ecommons.preferences.core.Preference;
import org.eclipse.statet.ecommons.preferences.core.Preference.StringArrayPref;
import org.eclipse.statet.ecommons.preferences.core.Preference.StringSetPref;
import org.eclipse.statet.ecommons.preferences.core.PreferenceAccess;
-import org.eclipse.statet.ecommons.preferences.core.util.PreferenceUtils;
import org.eclipse.statet.ecommons.ui.SharedUIResources;
import org.eclipse.statet.internal.ltk.ui.AdvancedExtensionsInternal;
@@ -216,7 +216,7 @@
synchronized (this) {
if (this.categories != null) {
this.categories= ImCollections.toList(
- applyPreferences(PreferenceUtils.getInstancePrefs(), this.categories) );
+ applyPreferences(EPreferences.getInstancePrefs(), this.categories) );
}
}
}
@@ -299,7 +299,7 @@
}
this.computers= ImCollections.toList(allComputers);
this.categories= ImCollections.toList(
- applyPreferences(PreferenceUtils.getInstancePrefs(), categories) );
+ applyPreferences(EPreferences.getInstancePrefs(), categories) );
}
List<ContentAssistCategory> applyPreferences(final PreferenceAccess prefAccess,
diff --git a/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/sourceediting/assist/InfoHoverRegistry.java b/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/sourceediting/assist/InfoHoverRegistry.java
index 64753e5..3564846 100644
--- a/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/sourceediting/assist/InfoHoverRegistry.java
+++ b/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/sourceediting/assist/InfoHoverRegistry.java
@@ -37,10 +37,10 @@
import org.eclipse.statet.ecommons.preferences.PreferencesUtil;
import org.eclipse.statet.ecommons.preferences.SettingsChangeNotifier;
import org.eclipse.statet.ecommons.preferences.SettingsChangeNotifier.ManageListener;
+import org.eclipse.statet.ecommons.preferences.core.EPreferences;
import org.eclipse.statet.ecommons.preferences.core.Preference;
import org.eclipse.statet.ecommons.preferences.core.Preference.StringArrayPref;
import org.eclipse.statet.ecommons.preferences.core.PreferenceAccess;
-import org.eclipse.statet.ecommons.preferences.core.util.PreferenceUtils;
import org.eclipse.statet.ecommons.ui.SharedUIResources;
import org.eclipse.statet.internal.ltk.ui.AdvancedExtensionsInternal;
@@ -125,7 +125,7 @@
synchronized (this) {
List<InfoHoverDescriptor> descriptors= this.descriptors;
if (descriptors != null) {
- descriptors= applyPreferences(PreferenceUtils.getInstancePrefs(),
+ descriptors= applyPreferences(EPreferences.getInstancePrefs(),
new ArrayList<>(descriptors) );
this.descriptors= descriptors;
}
@@ -177,7 +177,7 @@
}
}
- return applyPreferences(PreferenceUtils.getInstancePrefs(), descriptors);
+ return applyPreferences(EPreferences.getInstancePrefs(), descriptors);
}
List<InfoHoverDescriptor> applyPreferences(final PreferenceAccess prefAccess, final List<InfoHoverDescriptor> descriptors) {
diff --git a/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/templates/NewDocTemplateGenerateWizardPage.java b/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/templates/NewDocTemplateGenerateWizardPage.java
index 24f639a..1b6a917 100644
--- a/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/templates/NewDocTemplateGenerateWizardPage.java
+++ b/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/templates/NewDocTemplateGenerateWizardPage.java
@@ -26,8 +26,8 @@
import org.eclipse.text.templates.ContextTypeRegistry;
import org.eclipse.text.templates.TemplatePersistenceData;
+import org.eclipse.statet.ecommons.preferences.core.EPreferences;
import org.eclipse.statet.ecommons.preferences.core.Preference;
-import org.eclipse.statet.ecommons.preferences.core.util.PreferenceUtils;
import org.eclipse.statet.ecommons.ui.util.LayoutUtils;
import org.eclipse.statet.internal.ltk.ui.TemplatesMessages;
@@ -73,7 +73,7 @@
if (defaultPref == null) {
return null;
}
- return PreferenceUtils.getInstancePrefs().getPreferenceValue(defaultPref);
+ return EPreferences.getInstancePrefs().getPreferenceValue(defaultPref);
}
protected List<Template> getAvailableTemplates() {
