Switch o.e.dltk.ruby.debug to non-deprecated prefs setting.
DefaultScope is just what's needed.
Change-Id: I7a0fa3aa7caff10908f4408aef2d15d0d6fca80a
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
diff --git a/plugins/org.eclipse.dltk.ruby.debug/src/org/eclipse/dltk/ruby/debug/RubyDebugPlugin.java b/plugins/org.eclipse.dltk.ruby.debug/src/org/eclipse/dltk/ruby/debug/RubyDebugPlugin.java
index 671774b..16c898d 100644
--- a/plugins/org.eclipse.dltk.ruby.debug/src/org/eclipse/dltk/ruby/debug/RubyDebugPlugin.java
+++ b/plugins/org.eclipse.dltk.ruby.debug/src/org/eclipse/dltk/ruby/debug/RubyDebugPlugin.java
@@ -36,12 +36,8 @@
@Override
public void stop(BundleContext context) throws Exception {
- try {
- savePluginPreferences();
- } finally {
- plugin = null;
- super.stop(context);
- }
+ plugin = null;
+ super.stop(context);
}
/**
diff --git a/plugins/org.eclipse.dltk.ruby.debug/src/org/eclipse/dltk/ruby/debug/RubyDebugPreferenceInitializer.java b/plugins/org.eclipse.dltk.ruby.debug/src/org/eclipse/dltk/ruby/debug/RubyDebugPreferenceInitializer.java
index cf9ec8d..4d0b82b 100644
--- a/plugins/org.eclipse.dltk.ruby.debug/src/org/eclipse/dltk/ruby/debug/RubyDebugPreferenceInitializer.java
+++ b/plugins/org.eclipse.dltk.ruby.debug/src/org/eclipse/dltk/ruby/debug/RubyDebugPreferenceInitializer.java
@@ -10,33 +10,25 @@
*******************************************************************************/
package org.eclipse.dltk.ruby.debug;
-import org.eclipse.core.runtime.Preferences;
import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer;
+import org.eclipse.core.runtime.preferences.DefaultScope;
import org.eclipse.dltk.debug.core.DLTKDebugPreferenceConstants;
+import org.osgi.service.prefs.Preferences;
-public class RubyDebugPreferenceInitializer extends
- AbstractPreferenceInitializer {
+public class RubyDebugPreferenceInitializer extends AbstractPreferenceInitializer {
@Override
public void initializeDefaultPreferences() {
- Preferences store = RubyDebugPlugin.getDefault().getPluginPreferences();
+ Preferences store = DefaultScope.INSTANCE.getNode(RubyDebugPlugin.PLUGIN_ID);
- if (store.getDefaultString(RubyDebugConstants.DEBUGGING_ENGINE_ID_KEY).isEmpty())
- store.setDefault(RubyDebugConstants.DEBUGGING_ENGINE_ID_KEY,
- "org.eclipse.dltk.ruby.basicdebugger"); //$NON-NLS-1$
+ store.put(RubyDebugConstants.DEBUGGING_ENGINE_ID_KEY, "org.eclipse.dltk.ruby.basicdebugger"); //$NON-NLS-1$
- store.setDefault(
- DLTKDebugPreferenceConstants.PREF_DBGP_BREAK_ON_FIRST_LINE,
- false);
- store.setDefault(DLTKDebugPreferenceConstants.PREF_DBGP_ENABLE_LOGGING,
- false);
+ store.putBoolean(DLTKDebugPreferenceConstants.PREF_DBGP_BREAK_ON_FIRST_LINE, false);
+ store.putBoolean(DLTKDebugPreferenceConstants.PREF_DBGP_ENABLE_LOGGING, false);
- store.setDefault(
- DLTKDebugPreferenceConstants.PREF_DBGP_SHOW_SCOPE_GLOBAL, true);
- store.setDefault(
- DLTKDebugPreferenceConstants.PREF_DBGP_SHOW_SCOPE_CLASS, true);
- store.setDefault(
- DLTKDebugPreferenceConstants.PREF_DBGP_SHOW_SCOPE_LOCAL, true);
+ store.putBoolean(DLTKDebugPreferenceConstants.PREF_DBGP_SHOW_SCOPE_GLOBAL, true);
+ store.putBoolean(DLTKDebugPreferenceConstants.PREF_DBGP_SHOW_SCOPE_CLASS, true);
+ store.putBoolean(DLTKDebugPreferenceConstants.PREF_DBGP_SHOW_SCOPE_LOCAL, true);
}
}
