X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=net.mograsim.logic.model.am2900%2Ftest%2Fnet%2Fmograsim%2Flogic%2Fmodel%2Fam2900%2Futil%2FTestEnvironmentHelper.java;h=9707b9ae423080140b0e1d7eef4bcc5791d2102c;hb=0a04a4ed66ecebd4254541c4977599f6052c115a;hp=ae4b28e69c7bc480d98f14e450aea946183f271d;hpb=6d28e5c93c9347784950ca66fb6d1b3a14461ece;p=Mograsim.git

diff --git a/net.mograsim.logic.model.am2900/test/net/mograsim/logic/model/am2900/util/TestEnvironmentHelper.java b/net.mograsim.logic.model.am2900/test/net/mograsim/logic/model/am2900/util/TestEnvironmentHelper.java
index ae4b28e6..9707b9ae 100644
--- a/net.mograsim.logic.model.am2900/test/net/mograsim/logic/model/am2900/util/TestEnvironmentHelper.java
+++ b/net.mograsim.logic.model.am2900/test/net/mograsim/logic/model/am2900/util/TestEnvironmentHelper.java
@@ -12,10 +12,11 @@ import java.util.Queue;
 import java.util.Set;
 import java.util.TreeSet;
 
-import net.mograsim.logic.core.components.BitDisplay;
-import net.mograsim.logic.core.components.ManualSwitch;
+import net.mograsim.logic.core.components.CoreBitDisplay;
+import net.mograsim.logic.core.components.CoreManualSwitch;
 import net.mograsim.logic.core.timeline.Timeline;
 import net.mograsim.logic.model.LogicUIStandaloneGUI;
+import net.mograsim.logic.model.am2900.Am2900Loader;
 import net.mograsim.logic.model.am2900.TestableCircuit;
 import net.mograsim.logic.model.am2900.TestableCircuit.Result;
 import net.mograsim.logic.model.model.ViewModel;
@@ -80,6 +81,7 @@ public class TestEnvironmentHelper
 		// Create view model
 		viewModel = new ViewModelModifiable();
 		modellingTool = ModellingTool.createFor(viewModel);
+		Am2900Loader.setup();
 		component = IndirectGUIComponentCreator.createComponent(viewModel, modelId);
 		setField(componentField, component);
 
@@ -109,12 +111,12 @@ public class TestEnvironmentHelper
 		{
 			Field f = testEnvClass.getDeclaredField(javaIdentId);
 			Class<?> type = f.getType();
-			if (ManualSwitch.class.isAssignableFrom(type))
+			if (CoreManualSwitch.class.isAssignableFrom(type))
 			{
 				GUIManualSwitch gms = new GUIManualSwitch(viewModel, p.logicWidth);
 				modellingTool.connect(p, gms.getOutputPin());
 				idSwitchMap.put(p.name, gms);
-			} else if (BitDisplay.class.isAssignableFrom(type))
+			} else if (CoreBitDisplay.class.isAssignableFrom(type))
 			{
 				GUIBitDisplay gbd = new GUIBitDisplay(viewModel, p.logicWidth);
 				modellingTool.connect(p, gbd.getInputPin());