From 1852c81ce3a63e6847fc5404f91607b553fcd882 Mon Sep 17 00:00:00 2001
From: Daniel Kirschten <daniel.kirschten@gmx.de>
Date: Tue, 25 Jun 2019 10:45:53 +0200
Subject: [PATCH] Now using preference system in plugin.core

---
 .../.settings/org.eclipse.jdt.ui.prefs        |  2 +-
 net.mograsim.plugin.core/META-INF/MANIFEST.MF |  3 +-
 net.mograsim.plugin.core/plugin.xml           | 71 +++++++++++++++----
 ...simPreview.java => SimulationPreview.java} |  2 +-
 .../mograsim/plugin/views/LogicUIPart.java    | 36 ++++++++++
 5 files changed, 96 insertions(+), 18 deletions(-)
 rename net.mograsim.plugin.core/src/net/mograsim/plugin/{MograsimPreview.java => SimulationPreview.java} (98%)

diff --git a/net.mograsim.plugin.core/.settings/org.eclipse.jdt.ui.prefs b/net.mograsim.plugin.core/.settings/org.eclipse.jdt.ui.prefs
index ab73b4b8..3c8fadd6 100644
--- a/net.mograsim.plugin.core/.settings/org.eclipse.jdt.ui.prefs
+++ b/net.mograsim.plugin.core/.settings/org.eclipse.jdt.ui.prefs
@@ -1,6 +1,6 @@
 eclipse.preferences.version=1
 editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
-formatter_profile=_Eclipse ajusted old
+formatter_profile=_MoGraSim
 formatter_settings_version=16
 sp_cleanup.add_default_serial_version_id=true
 sp_cleanup.add_generated_serial_version_id=false
diff --git a/net.mograsim.plugin.core/META-INF/MANIFEST.MF b/net.mograsim.plugin.core/META-INF/MANIFEST.MF
index 8ef1a712..7e65cf9e 100644
--- a/net.mograsim.plugin.core/META-INF/MANIFEST.MF
+++ b/net.mograsim.plugin.core/META-INF/MANIFEST.MF
@@ -21,7 +21,8 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.ui.themes;bundle-version="1.2.400",
  net.mograsim.logic.ui;bundle-version="0.1.0";visibility:=reexport,
  net.mograsim.logic.ui.am2900;bundle-version="0.1.0";visibility:=reexport,
- javax.annotation;bundle-version="1.0.0"
+ javax.annotation;bundle-version="1.0.0",
+ net.mograsim.preferences;bundle-version="0.1.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Automatic-Module-Name: net.mograsim.plugin.core
 Bundle-Vendor: Mograsim Team
diff --git a/net.mograsim.plugin.core/plugin.xml b/net.mograsim.plugin.core/plugin.xml
index a8a643b9..b5293ce8 100644
--- a/net.mograsim.plugin.core/plugin.xml
+++ b/net.mograsim.plugin.core/plugin.xml
@@ -221,54 +221,95 @@
    <extension
          point="org.eclipse.ui.themes">
       <themeElementCategory
-            class="net.mograsim.plugin.MograsimPreview"
+            class="net.mograsim.plugin.SimulationPreview"
             id="net.mograsim.plugin.mograsim"
             label="%themeElementCategory.label">
       </themeElementCategory>
+      <themeElementCategory
+            class="net.mograsim.plugin.SimulationPreview"
+            id="net.mograsim.logic.ui"
+            label="Simulation"
+            parentId="net.mograsim.plugin.mograsim">
+      </themeElementCategory>
       <colorDefinition
-            categoryId="net.mograsim.plugin.mograsim"
-            defaultsTo="COLOR_WHITE"
+            categoryId="net.mograsim.logic.ui"
             id="net.mograsim.plugin.sim_backgound"
             isEditable="true"
-            label="%colorDefinition.label">
+            label="%colorDefinition.label"
+            value="COLOR_WHITE">
          <description>
             %colorDefinition.description
          </description>
       </colorDefinition>
       <colorDefinition
-            categoryId="net.mograsim.plugin.mograsim"
-            defaultsTo="COLOR_BLACK"
+            categoryId="net.mograsim.logic.ui"
             id="net.mograsim.plugin.sim_text_color"
             isEditable="true"
-            label="%colorDefinition.label.0">
+            label="%colorDefinition.label.0"
+            value="COLOR_BLACK">
+      </colorDefinition>
+      <colorDefinition
+            categoryId="net.mograsim.logic.ui"
+            id="net.mograsim.logic.ui.color.bit.one"
+            isEditable="true"
+            label="Simulation Farbe 1"
+            value="COLOR_GREEN">
+      </colorDefinition>
+      <colorDefinition
+            categoryId="net.mograsim.logic.ui"
+            id="net.mograsim.logic.ui.color.bit.u"
+            isEditable="true"
+            label="Simulation Farbe U"
+            value="COLOR_CYAN">
+      </colorDefinition>
+      <colorDefinition
+            categoryId="net.mograsim.logic.ui"
+            id="net.mograsim.logic.ui.color.bit.x"
+            isEditable="true"
+            label="Simulation Farbe X"
+            value="COLOR_RED">
+      </colorDefinition>
+      <colorDefinition
+            categoryId="net.mograsim.logic.ui"
+            id="net.mograsim.logic.ui.color.bit.z"
+            isEditable="true"
+            label="Simulation Farbe Z"
+            value="COLOR_YELLOW">
+      </colorDefinition>
+      <colorDefinition
+            categoryId="net.mograsim.logic.ui"
+            id="net.mograsim.logic.ui.color.bit.zero"
+            isEditable="true"
+            label="Simulation Farbe 0"
+            value="COLOR_GRAY">
       </colorDefinition>
       <colorDefinition
             categoryId="net.mograsim.plugin.mograsim"
-            defaultsTo="COLOR_GREEN"
             id="net.mograsim.plugin.asm_comment_color"
             isEditable="true"
-            label="%colorDefinition.label.1">
+            label="%colorDefinition.label.1"
+            value="COLOR_GREEN">
       </colorDefinition>
       <colorDefinition
             categoryId="net.mograsim.plugin.mograsim"
-            defaultsTo="COLOR_BLUE"
             id="net.mograsim.plugin.asm_label_color"
             isEditable="true"
-            label="%colorDefinition.label.2">
+            label="%colorDefinition.label.2"
+            value="COLOR_BLUE">
       </colorDefinition>
       <colorDefinition
             categoryId="net.mograsim.plugin.mograsim"
-            defaultsTo="COLOR_RED"
             id="net.mograsim.plugin.asm_operation_color"
             isEditable="true"
-            label="%colorDefinition.label.3">
+            label="%colorDefinition.label.3"
+            value="COLOR_RED">
       </colorDefinition>
       <colorDefinition
             categoryId="net.mograsim.plugin.mograsim"
-            defaultsTo="COLOR_MAGENTA"
             id="net.mograsim.plugin.asm_number_color"
             isEditable="true"
-            label="%colorDefinition.label.4">
+            label="%colorDefinition.label.4"
+            value="COLOR_MAGENTA">
       </colorDefinition>
       <fontDefinition
             categoryId="net.mograsim.plugin.mograsim"
diff --git a/net.mograsim.plugin.core/src/net/mograsim/plugin/MograsimPreview.java b/net.mograsim.plugin.core/src/net/mograsim/plugin/SimulationPreview.java
similarity index 98%
rename from net.mograsim.plugin.core/src/net/mograsim/plugin/MograsimPreview.java
rename to net.mograsim.plugin.core/src/net/mograsim/plugin/SimulationPreview.java
index 6bb08a24..9426f2c9 100644
--- a/net.mograsim.plugin.core/src/net/mograsim/plugin/MograsimPreview.java
+++ b/net.mograsim.plugin.core/src/net/mograsim/plugin/SimulationPreview.java
@@ -19,7 +19,7 @@ import net.mograsim.logic.ui.model.wires.WireCrossPoint;
 import net.mograsim.logic.ui.modeladapter.LogicModelParameters;
 import net.mograsim.logic.ui.modeladapter.ViewLogicModelAdapter;
 
-public class MograsimPreview implements IThemePreview
+public class SimulationPreview implements IThemePreview
 {
 
 	private LogicUICanvas ui;
diff --git a/net.mograsim.plugin.core/src/net/mograsim/plugin/views/LogicUIPart.java b/net.mograsim.plugin.core/src/net/mograsim/plugin/views/LogicUIPart.java
index aab85c8c..61e0b384 100644
--- a/net.mograsim.plugin.core/src/net/mograsim/plugin/views/LogicUIPart.java
+++ b/net.mograsim.plugin.core/src/net/mograsim/plugin/views/LogicUIPart.java
@@ -2,11 +2,17 @@ package net.mograsim.plugin.views;
 
 import javax.inject.Inject;
 
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
 import org.eclipse.e4.ui.model.application.ui.basic.MPart;
+import org.eclipse.jface.resource.ColorRegistry;
 import org.eclipse.swt.SWT;
+import org.eclipse.swt.graphics.Color;
+import org.eclipse.swt.graphics.RGB;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.ui.PlatformUI;
 import org.eclipse.ui.part.ViewPart;
+import org.eclipse.ui.statushandlers.StatusManager;
 import org.eclipse.ui.themes.ITheme;
 
 import net.haspamelodica.swt.helper.zoomablecanvas.helper.ZoomableCanvasUserInput;
@@ -21,6 +27,9 @@ import net.mograsim.logic.ui.model.components.mi.nandbased.am2901.GUIAm2901;
 import net.mograsim.logic.ui.model.wires.GUIWire;
 import net.mograsim.logic.ui.modeladapter.LogicModelParameters;
 import net.mograsim.logic.ui.modeladapter.ViewLogicModelAdapter;
+import net.mograsim.preferences.ColorDefinition;
+import net.mograsim.preferences.ColorDefinition.BuiltInColor;
+import net.mograsim.preferences.Preferences;
 
 public class LogicUIPart extends ViewPart
 {
@@ -40,6 +49,33 @@ public class LogicUIPart extends ViewPart
 	@Override
 	public void createPartControl(Composite parent)
 	{
+		// set preferences
+		Preferences.setPreferences(new Preferences()
+		{
+			@Override
+			public ColorDefinition getColorDefinition(String name)
+			{
+				RGB rgb = getColorRegistry().getRGB(name);
+				if (rgb == null)
+				{
+					StatusManager.getManager().handle(new Status(IStatus.ERROR, "net.mograsim.plugin.core", "No color for name " + name));
+					return new ColorDefinition(BuiltInColor.COLOR_BLACK);
+				}
+				return new ColorDefinition(rgb.red, rgb.green, rgb.blue);
+			}
+
+			@Override
+			public Color getColor(String name)
+			{
+				return getColorRegistry().get(name);
+			}
+
+			private ColorRegistry getColorRegistry()
+			{
+				return PlatformUI.getWorkbench().getThemeManager().getCurrentTheme().getColorRegistry();
+			}
+		});
+
 		// setup view model
 		ViewModelModifiable viewModel = new ViewModelModifiable();
 		createTestbench(viewModel);
-- 
2.17.1