From 9f03bd1ee25ac8370082fd3aa8f262a6126d4294 Mon Sep 17 00:00:00 2001 From: Alexander Kurtakov Date: Wed, 21 Oct 2015 11:51:08 +0300 Subject: [PATCH] Use *Scope INSTANCE fields. Recommended way is to use e.g. InstanceScope.INSTANCE instead of new InstanceScope() which is deprecated now. Change-Id: I9fa8e53e180a480805bd0a57903e65b5c2de5f75 Signed-off-by: Alexander Kurtakov --- .../cdt/managedbuilder/internal/core/PropertyManager.java | 2 +- .../core/cdtvariables/UserDefinedVariableSupplier.java | 2 +- .../core/lrparser/xlc/preferences/XlcLanguagePreferences.java | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/PropertyManager.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/PropertyManager.java index 6e117bcad92..7e3dc9f488b 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/PropertyManager.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/PropertyManager.java @@ -346,7 +346,7 @@ public class PropertyManager { } protected Preferences getInstNode(IManagedProject mProject){ - Preferences prefs = new InstanceScope().getNode(ManagedBuilderCorePlugin.getUniqueIdentifier()); + Preferences prefs = InstanceScope.INSTANCE.getNode(ManagedBuilderCorePlugin.getUniqueIdentifier()); if(prefs != null){ prefs = prefs.node(NODE_NAME); if(prefs != null) diff --git a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/cdtvariables/UserDefinedVariableSupplier.java b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/cdtvariables/UserDefinedVariableSupplier.java index c098d01fba3..96b4a0634be 100644 --- a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/cdtvariables/UserDefinedVariableSupplier.java +++ b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/cdtvariables/UserDefinedVariableSupplier.java @@ -482,7 +482,7 @@ public class UserDefinedVariableSupplier extends CoreMacroSupplierBase { } private Preferences getWorkspaceNode(){ - Preferences prefNode = new InstanceScope().getNode(CCorePlugin.PLUGIN_ID); + Preferences prefNode = InstanceScope.INSTANCE.getNode(CCorePlugin.PLUGIN_ID); if(prefNode == null) return null; diff --git a/xlc/org.eclipse.cdt.core.lrparser.xlc/parser/org/eclipse/cdt/core/lrparser/xlc/preferences/XlcLanguagePreferences.java b/xlc/org.eclipse.cdt.core.lrparser.xlc/parser/org/eclipse/cdt/core/lrparser/xlc/preferences/XlcLanguagePreferences.java index 1e201483041..fb0719f22eb 100644 --- a/xlc/org.eclipse.cdt.core.lrparser.xlc/parser/org/eclipse/cdt/core/lrparser/xlc/preferences/XlcLanguagePreferences.java +++ b/xlc/org.eclipse.cdt.core.lrparser.xlc/parser/org/eclipse/cdt/core/lrparser/xlc/preferences/XlcLanguagePreferences.java @@ -91,11 +91,11 @@ public class XlcLanguagePreferences { private static Preferences getDefaultPreferences() { - return getPreferences(new DefaultScope()); + return getPreferences(DefaultScope.INSTANCE); } private static Preferences getWorkspacePreferences() { - return getPreferences(new InstanceScope()); + return getPreferences(InstanceScope.INSTANCE); } private static Preferences getProjectPreferences(IProject project) {