X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=plugins%2Fnet.mograsim.plugin.core%2Fsrc%2Fnet%2Fmograsim%2Fplugin%2FMograsimActivator.java;h=64586b07363e85b370171b6f60f489b2b47b0290;hb=648fc6e69e09fe4467cb6bac47934be1a7dcf0d6;hp=765a63a57f113c3f79ee7867e8601a5f1be2f284;hpb=0eb525202d3c871a2a20f789af1728248f3cff11;p=Mograsim.git

diff --git a/plugins/net.mograsim.plugin.core/src/net/mograsim/plugin/MograsimActivator.java b/plugins/net.mograsim.plugin.core/src/net/mograsim/plugin/MograsimActivator.java
index 765a63a5..64586b07 100644
--- a/plugins/net.mograsim.plugin.core/src/net/mograsim/plugin/MograsimActivator.java
+++ b/plugins/net.mograsim.plugin.core/src/net/mograsim/plugin/MograsimActivator.java
@@ -1,9 +1,15 @@
 package net.mograsim.plugin;
 
+import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.ui.PlatformUI;
 import org.eclipse.ui.plugin.AbstractUIPlugin;
+import org.eclipse.ui.themes.ITheme;
 
+import net.mograsim.logic.model.preferences.RenderPreferences;
 import net.mograsim.machine.MachineRegistry;
+import net.mograsim.plugin.preferences.EclipsePluginPreferences;
+import net.mograsim.plugin.preferences.EclipseRenderPreferences;
+import net.mograsim.plugin.preferences.PluginPreferences;
 import net.mograsim.preferences.Preferences;
 
 public final class MograsimActivator extends AbstractUIPlugin
@@ -12,20 +18,36 @@ public final class MograsimActivator extends AbstractUIPlugin
 
 	private static MograsimActivator instance;
 
+	public static MograsimActivator instance()
+	{
+		if (instance == null)
+			throw new IllegalStateException("MograsimActivator not yet created!");
+		return instance;
+	}
+
+	private final RenderPreferences renderPrefs;
+	private final PluginPreferences pluginPrefs;
+
 	public MograsimActivator()
 	{
 		if (instance != null)
 			throw new IllegalStateException("MograsimActivator already created!");
 		instance = this;
+
 		MachineRegistry.initialize();
-		Preferences.setPreferences(new EclipsePreferences(PlatformUI.getWorkbench().getThemeManager().getCurrentTheme(),
-				MograsimActivator.instance().getPreferenceStore()));
+		ITheme currentTheme = PlatformUI.getWorkbench().getThemeManager().getCurrentTheme();
+		IPreferenceStore preferenceStore = getPreferenceStore();
+		renderPrefs = new EclipseRenderPreferences(currentTheme, preferenceStore);
+		pluginPrefs = new EclipsePluginPreferences(currentTheme, preferenceStore);
 	}
 
-	public static MograsimActivator instance()
+	public RenderPreferences getRenderPrefs()
 	{
-		if (instance == null)
-			throw new IllegalStateException("MograsimActivator not yet created!");
-		return instance;
+		return renderPrefs;
+	}
+
+	public Preferences getPluginPrefs()
+	{
+		return pluginPrefs;
 	}
 }
\ No newline at end of file