bug 356300: The constructor InstanceScope() is deprecated, call InstanceScope.INSTANCE insteadI20110912-1300

3 files changed, 6 insertions, 6 deletions

diff --git a/bundles/org.eclipse.core.net/META-INF/MANIFEST.MF b/bundles/org.eclipse.core.net/META-INF/MANIFEST.MF
index 3d0c0ec29..907454b0f 100644
--- a/bundles/org.eclipse.core.net/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.core.net/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %PLUGIN_NAME
 Bundle-SymbolicName: org.eclipse.core.net;singleton:=true
-Bundle-Version: 1.2.100.qualifier
+Bundle-Version: 1.2.200.qualifier
 Bundle-Activator: org.eclipse.core.internal.net.Activator
 Bundle-Vendor: %PLUGIN_PROVIDER
 Bundle-Localization: plugin
diff --git a/bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/PreferenceInitializer.java b/bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/PreferenceInitializer.java
index 1570a6272..10d720514 100644
--- a/bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/PreferenceInitializer.java
+++ b/bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/PreferenceInitializer.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2007, 2010 IBM Corporation and others.
+ * Copyright (c) 2007, 2011 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -29,7 +29,7 @@ public class PreferenceInitializer extends AbstractPreferenceInitializer {
 	}
 
 	public void initializeDefaultPreferences() {
-		IEclipsePreferences node = new DefaultScope().getNode(Activator.ID);
+		IEclipsePreferences node = DefaultScope.INSTANCE.getNode(Activator.ID);
 		node.put(ProxyManager.PREF_NON_PROXIED_HOSTS, DEFAULT_PREF_NON_PROXIED_HOSTS);
 		node.putBoolean(ProxyManager.PREF_ENABLED, DEFAULT_PREF_ENABLED);
 		node.putBoolean(ProxyManager.PREF_OS, DEFAULT_PREF_OS);
diff --git a/bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/PreferenceManager.java b/bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/PreferenceManager.java
index 7039d1071..2e154969e 100644
--- a/bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/PreferenceManager.java
+++ b/bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/PreferenceManager.java
@@ -46,7 +46,7 @@ public class PreferenceManager {
 	private IEclipsePreferences currentScope;
 
 	private PreferenceManager(String id) {
-		this.defaultScope = new DefaultScope().getNode(id);
+		this.defaultScope = DefaultScope.INSTANCE.getNode(id);
 	}
 	
 	/**
@@ -57,7 +57,7 @@ public class PreferenceManager {
 	 */
 	public static PreferenceManager createConfigurationManager(String id) {
 		PreferenceManager manager = new PreferenceManager(id);
-		manager.currentScope = new ConfigurationScope().getNode(id);
+		manager.currentScope = ConfigurationScope.INSTANCE.getNode(id);
 		return manager;
 	}
 	
@@ -257,7 +257,7 @@ public class PreferenceManager {
 			return;
 		}
 		currentScope.putBoolean(PREF_HAS_MIGRATED, true);
-		migrateInstanceScopePreferences(new InstanceScope().getNode(Activator.ID), currentScope, proxies, true);
+		migrateInstanceScopePreferences(InstanceScope.INSTANCE.getNode(Activator.ID), currentScope, proxies, true);
 	}
 
 	void migrateInstanceScopePreferences(Preferences instanceScope, Preferences configuration, ProxyType[] proxies, boolean isInitialize) {