From f793151b812a191aee9485871ad5eec7268109c6 Mon Sep 17 00:00:00 2001 From: Martin Oberhuber < martin.oberhuber@windriver.com> Date: Mon, 7 May 2012 20:37:49 +0000 Subject: [PATCH] Bug 378740 - [terminal] Terminal fails on Eclipse 3.6 and older --- .../preferences/TerminalPreferenceInitializer.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/preferences/TerminalPreferenceInitializer.java b/terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/preferences/TerminalPreferenceInitializer.java index 060a0843e1e..58f17c21318 100644 --- a/terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/preferences/TerminalPreferenceInitializer.java +++ b/terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/preferences/TerminalPreferenceInitializer.java @@ -24,7 +24,8 @@ public class TerminalPreferenceInitializer extends AbstractPreferenceInitializer } public void initializeDefaultPreferences() { - IEclipsePreferences defaultPrefs = DefaultScope.INSTANCE.getNode(TerminalPlugin.PLUGIN_ID); + //DefaultScope.INSTANCE was only added in Eclipse 3.7 - we want to be compatible further back + IEclipsePreferences defaultPrefs = new DefaultScope().getNode(TerminalPlugin.PLUGIN_ID); defaultPrefs.putBoolean(ITerminalConstants.PREF_INVERT_COLORS, ITerminalConstants.DEFAULT_INVERT_COLORS); defaultPrefs.putInt(ITerminalConstants.PREF_BUFFERLINES, ITerminalConstants.DEFAULT_BUFFERLINES); migrateTerminalPreferences(); @@ -34,10 +35,11 @@ public class TerminalPreferenceInitializer extends AbstractPreferenceInitializer * Migrate settings from the older org.eclipse.tm.terminal.view bundle into the o.e.tm.terminal bundle */ public static void migrateTerminalPreferences() { - IEclipsePreferences prefs = InstanceScope.INSTANCE.getNode(TerminalPlugin.PLUGIN_ID); + //InstanceScope.INSTANCE was only added in Eclipse 3.7 - we want to be compatible further back + IEclipsePreferences prefs = new InstanceScope().getNode(TerminalPlugin.PLUGIN_ID); if (!prefs.getBoolean(ITerminalConstants.PREF_HAS_MIGRATED, false)) { prefs.putBoolean(ITerminalConstants.PREF_HAS_MIGRATED, true); - PreferenceModifyListener.migrateTerminalPreferences(InstanceScope.INSTANCE.getNode("")); //$NON-NLS-1$ + PreferenceModifyListener.migrateTerminalPreferences(new InstanceScope().getNode("")); //$NON-NLS-1$ } }