X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.model.am2900%2Ftest%2Fnet%2Fmograsim%2Flogic%2Fmodel%2Fam2900%2Fam2901%2FTestableAm2901Impl.java;h=60c1cf86c253b1aa3b527f15c4940d62d78ba730;hb=93b398d6271a538a2a4c9f4de07a3b4a8a2a7fd4;hp=43e01d43b317c732afc804181cea5985c53dc010;hpb=c6181cf9a7b6a2f5dc927939d98d61c565f97917;p=Mograsim.git

diff --git a/net.mograsim.logic.model.am2900/test/net/mograsim/logic/model/am2900/am2901/TestableAm2901Impl.java b/net.mograsim.logic.model.am2900/test/net/mograsim/logic/model/am2900/am2901/TestableAm2901Impl.java
index 43e01d43..60c1cf86 100644
--- a/net.mograsim.logic.model.am2900/test/net/mograsim/logic/model/am2900/am2901/TestableAm2901Impl.java
+++ b/net.mograsim.logic.model.am2900/test/net/mograsim/logic/model/am2900/am2901/TestableAm2901Impl.java
@@ -1,29 +1,29 @@
 package net.mograsim.logic.model.am2900.am2901;
 
-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.types.Bit;
 import net.mograsim.logic.core.types.BitVector;
 import net.mograsim.logic.model.am2900.util.SwitchWithDisplay;
 import net.mograsim.logic.model.am2900.util.TestEnvironmentHelper;
 import net.mograsim.logic.model.am2900.util.TestEnvironmentHelper.DebugState;
 import net.mograsim.logic.model.am2900.util.TestUtil;
-import net.mograsim.logic.model.model.components.GUIComponent;
+import net.mograsim.logic.model.model.components.ModelComponent;
 
 public class TestableAm2901Impl implements TestableAm2901
 {
-	private GUIComponent am2901;
-	private ManualSwitch I8, I7, I6, I5, I4, I3, I2, I1, I0;
-	private ManualSwitch C;
-	private ManualSwitch Cn;
-	private ManualSwitch D1, D2, D3, D4;
-	private ManualSwitch A0, A1, A2, A3;
-	private ManualSwitch B0, B1, B2, B3;
-	private BitDisplay Y1, Y2, Y3, Y4;
-	private BitDisplay F_0, Cn_4, OVR, F3;
+	private ModelComponent am2901;
+	private CoreManualSwitch I8, I7, I6, I5, I4, I3, I2, I1, I0;
+	private CoreManualSwitch C;
+	private CoreManualSwitch Cn;
+	private CoreManualSwitch D1, D2, D3, D4;
+	private CoreManualSwitch A0, A1, A2, A3;
+	private CoreManualSwitch B0, B1, B2, B3;
+	private CoreBitDisplay Y1, Y2, Y3, Y4;
+	private CoreBitDisplay F_0, Cn_4, OVR, F3;
 	private SwitchWithDisplay RAMn, RAMn_3, Qn, Qn_3;
 
-	private final TestEnvironmentHelper testHelper = new TestEnvironmentHelper(this, "GUIAm2901");
+	private final TestEnvironmentHelper testHelper = new TestEnvironmentHelper(this, "Am2901");
 
 	@Override
 	public Result run()