diff options
| author | Mykola Nikishov | 2010-01-07 09:48:06 +0000 |
|---|---|---|
| committer | Mykola Nikishov | 2010-03-15 21:00:02 +0000 |
| commit | bc81cc2f99e2f6bd7ae9be4a6d8f0989df4d9111 (patch) | |
| tree | 8182eb305ebbf1a03fb13dab7b006356efa8d00d | |
| parent | 374af9a268a289429ae1b0c64e14116cff5d3916 (diff) | |
| download | egit-bc81cc2f99e2f6bd7ae9be4a6d8f0989df4d9111.tar.gz egit-bc81cc2f99e2f6bd7ae9be4a6d8f0989df4d9111.tar.xz egit-bc81cc2f99e2f6bd7ae9be4a6d8f0989df4d9111.zip | |
Decouple org.eclipse.egit.core.Activator from org.eclipse.ui
org.eclipse.egit.core.Activator now extends
org.eclipse.core.runtime.Plugin instead of
org.eclipse.ui.plugin.AbstractUIPlugin. Obtain preference store using
org.eclipse.ui.preferences.ScopedPreferenceStore instead of
org.eclipse.ui.plugin.AbstractUIPlugin.getDefault().getPreferenceStore()
Bug: 297584
Change-Id: I16caec54ed65f9b299c21770346aef76c35f60a5
Signed-off-by: Mykola Nikishov <mn@mn.com.ua>
| -rw-r--r-- | org.eclipse.egit.core/src/org/eclipse/egit/core/Activator.java | 4 | ||||
| -rw-r--r-- | org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/preferences/WindowCachePreferencePage.java | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/org.eclipse.egit.core/src/org/eclipse/egit/core/Activator.java b/org.eclipse.egit.core/src/org/eclipse/egit/core/Activator.java index 86f38978f4..422eff5136 100644 --- a/org.eclipse.egit.core/src/org/eclipse/egit/core/Activator.java +++ b/org.eclipse.egit.core/src/org/eclipse/egit/core/Activator.java @@ -12,16 +12,16 @@ package org.eclipse.egit.core; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Platform; +import org.eclipse.core.runtime.Plugin; import org.eclipse.core.runtime.Status; import org.eclipse.egit.core.project.GitProjectData; -import org.eclipse.ui.plugin.AbstractUIPlugin; import org.osgi.framework.BundleContext; /** * The plugin class for the org.eclipse.egit.core plugin. This * is a singleton class. */ -public class Activator extends AbstractUIPlugin { +public class Activator extends Plugin { private static Activator plugin; /** diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/preferences/WindowCachePreferencePage.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/preferences/WindowCachePreferencePage.java index 0058a02726..348a7c87a9 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/preferences/WindowCachePreferencePage.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/preferences/WindowCachePreferencePage.java @@ -8,6 +8,7 @@ *******************************************************************************/ package org.eclipse.egit.ui.internal.preferences; +import org.eclipse.core.runtime.preferences.InstanceScope; import org.eclipse.egit.core.Activator; import org.eclipse.egit.core.GitCorePreferences; import org.eclipse.egit.core.project.GitProjectData; @@ -16,6 +17,7 @@ import org.eclipse.jface.preference.BooleanFieldEditor; import org.eclipse.jface.preference.FieldEditorPreferencePage; import org.eclipse.ui.IWorkbench; import org.eclipse.ui.IWorkbenchPreferencePage; +import org.eclipse.ui.preferences.ScopedPreferenceStore; /** Preferences for our window cache. */ public class WindowCachePreferencePage extends FieldEditorPreferencePage @@ -28,7 +30,9 @@ public class WindowCachePreferencePage extends FieldEditorPreferencePage public WindowCachePreferencePage() { super(GRID); setTitle(UIText.WindowCachePreferencePage_title); - setPreferenceStore(Activator.getDefault().getPreferenceStore()); + ScopedPreferenceStore store = new ScopedPreferenceStore( + new InstanceScope(), Activator.getPluginId()); + setPreferenceStore(store); } @Override |