From b42e6878282621f271dc49e3f27b07fe949929d2 Mon Sep 17 00:00:00 2001 From: Sergey Prigogin Date: Mon, 7 Mar 2011 03:14:49 +0000 Subject: [PATCH] Removed use of a deprecated constructor. --- .../cdt/internal/core/CCoreInternals.java | 8 +++--- .../core/CCorePreferenceInitializer.java | 27 +++++++++---------- .../cdt/internal/core/LocalProjectScope.java | 15 +++++------ 3 files changed, 24 insertions(+), 26 deletions(-) diff --git a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/CCoreInternals.java b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/CCoreInternals.java index d211a0a420b..7ef650a194e 100644 --- a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/CCoreInternals.java +++ b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/CCoreInternals.java @@ -7,7 +7,7 @@ * * Contributors: * Markus Schorn - initial API and implementation - *******************************************************************************/ + *******************************************************************************/ package org.eclipse.cdt.internal.core; import org.eclipse.cdt.core.CCorePlugin; @@ -27,10 +27,10 @@ public class CCoreInternals { public static PDOMManager getPDOMManager() { return (PDOMManager) CCorePlugin.getIndexManager(); } - + /** * Saves the local project preferences, shared project preferences and the - * scope preferences for the core plugin. + * scope preferences for the core plugin. * @param project the project for which to save preferences, may be null * @since 4.0 */ @@ -45,7 +45,7 @@ public class CCoreInternals { new ProjectScope(project).getNode(CCorePlugin.PLUGIN_ID).flush(); } } - new InstanceScope().getNode(CCorePlugin.PLUGIN_ID).flush(); + InstanceScope.INSTANCE.getNode(CCorePlugin.PLUGIN_ID).flush(); } catch (BackingStoreException e) { CCorePlugin.log(e); } diff --git a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/CCorePreferenceInitializer.java b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/CCorePreferenceInitializer.java index 6f15162b886..7116634cf09 100644 --- a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/CCorePreferenceInitializer.java +++ b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/CCorePreferenceInitializer.java @@ -14,9 +14,6 @@ *******************************************************************************/ package org.eclipse.cdt.internal.core; -import java.util.HashSet; -import java.util.Map; - import org.eclipse.cdt.core.CCorePlugin; import org.eclipse.cdt.core.CCorePreferenceConstants; import org.eclipse.cdt.core.formatter.DefaultCodeFormatterConstants; @@ -26,7 +23,9 @@ import org.eclipse.cdt.internal.core.pdom.indexer.IndexerPreferences; import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer; import org.eclipse.core.runtime.preferences.DefaultScope; import org.eclipse.core.runtime.preferences.IEclipsePreferences; -import org.eclipse.core.runtime.preferences.IScopeContext; + +import java.util.HashSet; +import java.util.Map; public class CCorePreferenceInitializer extends AbstractPreferenceInitializer { @@ -37,22 +36,22 @@ public class CCorePreferenceInitializer extends AbstractPreferenceInitializer { @Override public void initializeDefaultPreferences() { HashSet optionNames = CModelManager.OptionNames; - + // Formatter settings Map defaultOptionsMap = DefaultCodeFormatterConstants.getDefaultSettings(); // code formatter defaults // Compiler settings - defaultOptionsMap.put(CCorePreferenceConstants.TODO_TASK_TAGS, CCorePreferenceConstants.DEFAULT_TASK_TAGS); - defaultOptionsMap.put(CCorePreferenceConstants.TODO_TASK_PRIORITIES, CCorePreferenceConstants.DEFAULT_TASK_PRIORITY); - defaultOptionsMap.put(CCorePreferenceConstants.TODO_TASK_CASE_SENSITIVE, CCorePreferenceConstants.DEFAULT_TASK_CASE_SENSITIVE); - defaultOptionsMap.put(CCorePreferenceConstants.CODE_FORMATTER, CCorePreferenceConstants.DEFAULT_CODE_FORMATTER); - defaultOptionsMap.put(CCorePreferenceConstants.INDEX_DB_CACHE_SIZE_PCT, CCorePreferenceConstants.DEFAULT_INDEX_DB_CACHE_SIZE_PCT); - defaultOptionsMap.put(CCorePreferenceConstants.MAX_INDEX_DB_CACHE_SIZE_MB, CCorePreferenceConstants.DEFAULT_MAX_INDEX_DB_CACHE_SIZE_MB); + defaultOptionsMap.put(CCorePreferenceConstants.TODO_TASK_TAGS, CCorePreferenceConstants.DEFAULT_TASK_TAGS); + defaultOptionsMap.put(CCorePreferenceConstants.TODO_TASK_PRIORITIES, CCorePreferenceConstants.DEFAULT_TASK_PRIORITY); + defaultOptionsMap.put(CCorePreferenceConstants.TODO_TASK_CASE_SENSITIVE, CCorePreferenceConstants.DEFAULT_TASK_CASE_SENSITIVE); + defaultOptionsMap.put(CCorePreferenceConstants.CODE_FORMATTER, CCorePreferenceConstants.DEFAULT_CODE_FORMATTER); + defaultOptionsMap.put(CCorePreferenceConstants.INDEX_DB_CACHE_SIZE_PCT, CCorePreferenceConstants.DEFAULT_INDEX_DB_CACHE_SIZE_PCT); + defaultOptionsMap.put(CCorePreferenceConstants.MAX_INDEX_DB_CACHE_SIZE_MB, CCorePreferenceConstants.DEFAULT_MAX_INDEX_DB_CACHE_SIZE_MB); defaultOptionsMap.put(CCorePreferenceConstants.WORKSPACE_LANGUAGE_MAPPINGS, CCorePreferenceConstants.DEFAULT_WORKSPACE_LANGUAGE_MAPPINGS); defaultOptionsMap.put(CodeReaderCache.CODE_READER_BUFFER, CodeReaderCache.DEFAULT_CACHE_SIZE_IN_MB_STRING); // Store default values to default preferences - IEclipsePreferences defaultPreferences = ((IScopeContext) new DefaultScope()).getNode(CCorePlugin.PLUGIN_ID); + IEclipsePreferences defaultPreferences = DefaultScope.INSTANCE.getNode(CCorePlugin.PLUGIN_ID); for (Map.Entry entry : defaultOptionsMap.entrySet()) { String optionName = entry.getKey(); defaultPreferences.put(optionName, entry.getValue()); @@ -67,10 +66,10 @@ public class CCorePreferenceInitializer extends AbstractPreferenceInitializer { // build defaults defaultPreferences.putBoolean(CCorePreferenceConstants.PREF_BUILD_ALL_CONFIGS, false); defaultPreferences.putBoolean(CCorePreferenceConstants.PREF_BUILD_CONFIGS_RESOURCE_CHANGES, false); - + // indexer defaults IndexerPreferences.initializeDefaultPreferences(defaultPreferences); - + // content assist defaults defaultPreferences.putBoolean(CCorePreferenceConstants.SHOW_CAMEL_CASE_MATCHES, true); } diff --git a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/LocalProjectScope.java b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/LocalProjectScope.java index 50db7c4428d..12bb864c5ac 100644 --- a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/LocalProjectScope.java +++ b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/LocalProjectScope.java @@ -7,8 +7,7 @@ * * Contributors: * Markus Schorn - initial API and implementation - *******************************************************************************/ - + *******************************************************************************/ package org.eclipse.cdt.internal.core; import org.eclipse.cdt.core.CCorePlugin; @@ -24,7 +23,7 @@ public class LocalProjectScope implements IScopeContext { private static final String QUALIFIER_EXT = ".prj-"; //$NON-NLS-1$ /** - * String constant (value of "project-local") used for the + * String constant (value of "project-local") used for the * scope name for this preference scope. */ public static final String SCOPE = "project-local"; //$NON-NLS-1$ @@ -34,7 +33,7 @@ public class LocalProjectScope implements IScopeContext { /** * Create and return a new local project scope for the given project. The given * project must not be null. - * + * * @param context the project * @exception IllegalArgumentException if the project is null */ @@ -47,7 +46,7 @@ public class LocalProjectScope implements IScopeContext { /** * Create and return a new local project scope for the given project. The given * project must not be null. - * + * * @param projectName the name of the project * @exception IllegalArgumentException if the project is null */ @@ -66,9 +65,9 @@ public class LocalProjectScope implements IScopeContext { } public IEclipsePreferences getNode(String qualifier) { - return new InstanceScope().getNode(qualifier + QUALIFIER_EXT + fContext); + return InstanceScope.INSTANCE.getNode(qualifier + QUALIFIER_EXT + fContext); } - + @Override public boolean equals(Object obj) { if (this == obj) @@ -86,7 +85,7 @@ public class LocalProjectScope implements IScopeContext { return fContext.hashCode(); } - + private static Preferences getPPP(String name) { return new LocalProjectScope(name).getNode(CCorePlugin.PLUGIN_ID); }