From a517f7420a63d98ff455821e2110a0402fce7466 Mon Sep 17 00:00:00 2001
From: Cedric Brun
Date: Mon, 7 Mar 2011 18:33:12 +0100
Subject: Fix compile error with 3.7 and DefaultScope() being deprecated

---
 .../src/org/eclipse/emf/compare/EMFComparePlugin.java          | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/EMFComparePlugin.java b/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/EMFComparePlugin.java
index ca475b996..49976772f 100644
--- a/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/EMFComparePlugin.java
+++ b/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/EMFComparePlugin.java
@@ -74,15 +74,15 @@ public class EMFComparePlugin extends Plugin {
 			if (blocker) {
 				severity = IStatus.ERROR;
 			}
-			log(new Status(severity, PLUGIN_ID, severity, EMFCompareMessages
-					.getString("EMFComparePlugin.ElementNotFound"), e)); //$NON-NLS-1$
+			log(new Status(severity, PLUGIN_ID, severity,
+					EMFCompareMessages.getString("EMFComparePlugin.ElementNotFound"), e)); //$NON-NLS-1$
 		} else {
 			int severity = IStatus.WARNING;
 			if (blocker) {
 				severity = IStatus.ERROR;
 			}
-			log(new Status(severity, PLUGIN_ID, severity, EMFCompareMessages
-					.getString("EMFComparePlugin.JavaException"), e)); //$NON-NLS-1$
+			log(new Status(severity, PLUGIN_ID, severity,
+					EMFCompareMessages.getString("EMFComparePlugin.JavaException"), e)); //$NON-NLS-1$
 		}
 	}
 
@@ -181,7 +181,7 @@ public class EMFComparePlugin extends Plugin {
 	 * This will initialize the core preferences to their default values.
 	 */
 	private void initializeDefaultPreferences() {
-		final IEclipsePreferences defaultCorePreferences = new DefaultScope().getNode(PLUGIN_ID);
+		final IEclipsePreferences defaultCorePreferences = DefaultScope.INSTANCE.getNode(PLUGIN_ID);
 		defaultCorePreferences.putInt(EMFComparePreferenceConstants.PREFERENCES_KEY_SEARCH_WINDOW,
 				EMFComparePreferenceConstants.PREFERENCES_DEFAULT_SEARCH_WINDOW);
 		/*
-- 
cgit v1.2.3