Renamed core components to have the common prefix Core

[Mograsim.git] / net.mograsim.logic.model.am2900 / test / net / mograsim / logic / model / am2900 / util / TestEnvironmentHelper.java

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 ae4b28e..9707b9a 100644 (file)
--- 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());