From: Christian Femers <femers@in.tum.de>
Date: Tue, 3 Sep 2019 04:51:57 +0000 (+0200)
Subject: Adapted Am2900 to that
X-Git-Url: https://mograsim.net/gitweb/?p=Mograsim.git;a=commitdiff_plain;h=be84f16de96aaef311987e0cad85f0e30f546537

Adapted Am2900 to that
---

diff --git a/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/Am2900Loader.java b/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/Am2900Loader.java
index a2142341..45d22078 100644
--- a/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/Am2900Loader.java
+++ b/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/Am2900Loader.java
@@ -55,5 +55,11 @@ public class Am2900Loader implements BundleActivator
 		{
 			return Am2900ResourceLoader.class.getResourceAsStream(path);
 		}
+
+		@Override
+		public Class<?> loadClass(String name) throws ClassNotFoundException
+		{
+			return Class.forName(name, true, Am2900ResourceLoader.class.getClassLoader());
+		}
 	}
 }
diff --git a/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/standardComponentIDMapping.json b/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/standardComponentIDMapping.json
index b111b71f..7bb2e062 100644
--- a/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/standardComponentIDMapping.json
+++ b/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/standardComponentIDMapping.json
@@ -1,16 +1,16 @@
 mograsim version: 0.1.3
 {
-  "GUIAm2904RegCTInstrDecode": "class:net.mograsim.logic.model.am2900.components.am2904.GUIAm2904RegCTInstrDecode",
-  "GUIAm2904ShiftInstrDecode": "class:net.mograsim.logic.model.am2900.components.am2904.GUIAm2904ShiftInstrDecode",
-  "GUIAm2910InstrPLA": "class:net.mograsim.logic.model.am2900.components.am2910.GUIAm2910InstrPLA",
-  "GUIAm2910RegCntr": "class:net.mograsim.logic.model.am2900.components.am2910.GUIAm2910RegCntr",
-  "GUIAm2910SP": "class:net.mograsim.logic.model.am2900.components.am2910.GUIAm2910SP",
-  "GUIdff12": "class:net.mograsim.logic.model.am2900.components.GUIdff12",
-  "GUIdff4_finewe": "class:net.mograsim.logic.model.am2900.components.GUIdff4_finewe",
-  "GUIinc12": "class:net.mograsim.logic.model.am2900.components.GUIinc12",
-  "GUInor12": "class:net.mograsim.logic.model.am2900.components.GUInor12",
-  "GUIram5_12": "class:net.mograsim.logic.model.am2900.components.GUIram5_12",
-  "GUIsel4_12": "class:net.mograsim.logic.model.am2900.components.GUIsel4_12",
+  "GUIAm2904RegCTInstrDecode": "resource:Am2900Loader:net.mograsim.logic.model.am2900.components.am2904.GUIAm2904RegCTInstrDecode",
+  "GUIAm2904ShiftInstrDecode": "resource:Am2900Loader:net.mograsim.logic.model.am2900.components.am2904.GUIAm2904ShiftInstrDecode",
+  "GUIAm2910InstrPLA": "resource:Am2900Loader:net.mograsim.logic.model.am2900.components.am2910.GUIAm2910InstrPLA",
+  "GUIAm2910RegCntr": "resource:Am2900Loader:net.mograsim.logic.model.am2900.components.am2910.GUIAm2910RegCntr",
+  "GUIAm2910SP": "resource:Am2900Loader:net.mograsim.logic.model.am2900.components.am2910.GUIAm2910SP",
+  "GUIdff12": "resource:Am2900Loader:net.mograsim.logic.model.am2900.components.GUIdff12",
+  "GUIdff4_finewe": "resource:Am2900Loader:net.mograsim.logic.model.am2900.components.GUIdff4_finewe",
+  "GUIinc12": "resource:Am2900Loader:net.mograsim.logic.model.am2900.components.GUIinc12",
+  "GUInor12": "resource:Am2900Loader:net.mograsim.logic.model.am2900.components.GUInor12",
+  "GUIram5_12": "resource:Am2900Loader:net.mograsim.logic.model.am2900.components.GUIram5_12",
+  "GUIsel4_12": "resource:Am2900Loader:net.mograsim.logic.model.am2900.components.GUIsel4_12",
   
   "GUIAm2901": "resource:Am2900Loader:/components/am2901/GUIAm2901.json",
   "GUIAm2901ALUFuncDecode": "resource:Am2900Loader:/components/am2901/GUIAm2901ALUFuncDecode.json",