X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.model.am2900%2Ftest%2Fnet%2Fmograsim%2Flogic%2Fmodel%2Fam2900%2Fam2910%2FTestableAm2910Impl.java;h=48b85698315cfd63d1452f9e00976c0c78f09a9f;hb=8bed58cd47f4e53a0a83e066d38864aa6875502f;hp=436fe838256521696b9348d6a897212932682a43;hpb=c3f6c48944beecd51a41a6e9c123b73d8b630dfb;p=Mograsim.git

diff --git a/net.mograsim.logic.model.am2900/test/net/mograsim/logic/model/am2900/am2910/TestableAm2910Impl.java b/net.mograsim.logic.model.am2900/test/net/mograsim/logic/model/am2900/am2910/TestableAm2910Impl.java
index 436fe838..48b85698 100644
--- a/net.mograsim.logic.model.am2900/test/net/mograsim/logic/model/am2900/am2910/TestableAm2910Impl.java
+++ b/net.mograsim.logic.model.am2900/test/net/mograsim/logic/model/am2900/am2910/TestableAm2910Impl.java
@@ -1,29 +1,29 @@
 package net.mograsim.logic.model.am2900.am2910;
 
-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.BitVector;
 import net.mograsim.logic.model.am2900.util.TestEnvironmentHelper;
 import net.mograsim.logic.model.am2900.util.TestEnvironmentHelper.DebugState;
-import net.mograsim.logic.model.model.components.GUIComponent;
+import net.mograsim.logic.model.model.components.ModelComponent;
 
 public class TestableAm2910Impl implements TestableAm2910
 {
 
-	private GUIComponent am2901;
-	private ManualSwitch I;
-	private ManualSwitch C;
-	private ManualSwitch CI;
-	private ManualSwitch D;
-	private ManualSwitch _CC;
-	private ManualSwitch _CCEN;
-	private ManualSwitch _RLD;
-	private ManualSwitch _OE;
-	private BitDisplay _FULL;
-	private BitDisplay Y;
-	private BitDisplay _PL, _MAP, _VECT;
-
-	private final TestEnvironmentHelper testHelper = new TestEnvironmentHelper(this, "GUIAm2910");
+	private ModelComponent am2901;
+	private CoreManualSwitch I;
+	private CoreManualSwitch C;
+	private CoreManualSwitch CI;
+	private CoreManualSwitch D;
+	private CoreManualSwitch _CC;
+	private CoreManualSwitch _CCEN;
+	private CoreManualSwitch _RLD;
+	private CoreManualSwitch _OE;
+	private CoreBitDisplay _FULL;
+	private CoreBitDisplay Y;
+	private CoreBitDisplay _PL, _MAP, _VECT;
+
+	private final TestEnvironmentHelper testHelper = new TestEnvironmentHelper(this, "Am2910");
 
 	@Override
 	public void setup()