X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.model.am2900%2Ftest%2Fnet%2Fmograsim%2Flogic%2Fmodel%2Fam2900%2Futil%2FTestEnvironmentHelper.java;fp=net.mograsim.logic.model.am2900%2Ftest%2Fnet%2Fmograsim%2Flogic%2Fmodel%2Fam2900%2Futil%2FTestEnvironmentHelper.java;h=bf8ee36394a30f9505786e90a6ed9c23b80cf6cf;hb=93b398d6271a538a2a4c9f4de07a3b4a8a2a7fd4;hp=9707b9ae423080140b0e1d7eef4bcc5791d2102c;hpb=0a04a4ed66ecebd4254541c4977599f6052c115a;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 9707b9ae..bf8ee363 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
@@ -21,15 +21,15 @@ import net.mograsim.logic.model.am2900.TestableCircuit;
 import net.mograsim.logic.model.am2900.TestableCircuit.Result;
 import net.mograsim.logic.model.model.ViewModel;
 import net.mograsim.logic.model.model.ViewModelModifiable;
-import net.mograsim.logic.model.model.components.GUIComponent;
-import net.mograsim.logic.model.model.components.atomic.GUIBitDisplay;
-import net.mograsim.logic.model.model.components.atomic.GUIManualSwitch;
+import net.mograsim.logic.model.model.components.ModelComponent;
+import net.mograsim.logic.model.model.components.atomic.ModelBitDisplay;
+import net.mograsim.logic.model.model.components.atomic.ModelManualSwitch;
 import net.mograsim.logic.model.model.components.submodels.SubmodelComponent;
-import net.mograsim.logic.model.model.wires.GUIWire;
+import net.mograsim.logic.model.model.wires.ModelWire;
 import net.mograsim.logic.model.model.wires.Pin;
 import net.mograsim.logic.model.modeladapter.LogicModelParameters;
 import net.mograsim.logic.model.modeladapter.ViewLogicModelAdapter;
-import net.mograsim.logic.model.serializing.IndirectGUIComponentCreator;
+import net.mograsim.logic.model.serializing.IndirectModelComponentCreator;
 import net.mograsim.logic.model.util.ModellingTool;
 
 public class TestEnvironmentHelper
@@ -40,12 +40,12 @@ public class TestEnvironmentHelper
 	private Field componentField;
 	private Optional<Field> timelineField = Optional.empty();
 
-	private GUIComponent component;
+	private ModelComponent component;
 	private Timeline timeline;
 	private ViewModelModifiable viewModel;
 	private ModellingTool modellingTool;
-	private HashMap<String, GUIManualSwitch> idSwitchMap = new HashMap<>();
-	private HashMap<String, GUIBitDisplay> idDisplayMap = new HashMap<>();
+	private HashMap<String, ModelManualSwitch> idSwitchMap = new HashMap<>();
+	private HashMap<String, ModelBitDisplay> idDisplayMap = new HashMap<>();
 
 	private DebugState debug = DebugState.NO_DEBUG;
 	private Set<String> wireDebugChangeSet;
@@ -61,7 +61,7 @@ public class TestEnvironmentHelper
 		this.testEnvClass = testEnvInstance.getClass();
 		for (Field f : testEnvClass.getDeclaredFields())
 		{
-			if (GUIComponent.class.isAssignableFrom(f.getType()))
+			if (ModelComponent.class.isAssignableFrom(f.getType()))
 			{
 				componentField = f;
 				componentField.setAccessible(true);
@@ -82,7 +82,7 @@ public class TestEnvironmentHelper
 		viewModel = new ViewModelModifiable();
 		modellingTool = ModellingTool.createFor(viewModel);
 		Am2900Loader.setup();
-		component = IndirectGUIComponentCreator.createComponent(viewModel, modelId);
+		component = IndirectModelComponentCreator.createComponent(viewModel, modelId);
 		setField(componentField, component);
 
 		component.getPins().values().forEach(this::extendModelPin);
@@ -113,12 +113,12 @@ public class TestEnvironmentHelper
 			Class<?> type = f.getType();
 			if (CoreManualSwitch.class.isAssignableFrom(type))
 			{
-				GUIManualSwitch gms = new GUIManualSwitch(viewModel, p.logicWidth);
+				ModelManualSwitch gms = new ModelManualSwitch(viewModel, p.logicWidth);
 				modellingTool.connect(p, gms.getOutputPin());
 				idSwitchMap.put(p.name, gms);
 			} else if (CoreBitDisplay.class.isAssignableFrom(type))
 			{
-				GUIBitDisplay gbd = new GUIBitDisplay(viewModel, p.logicWidth);
+				ModelBitDisplay gbd = new ModelBitDisplay(viewModel, p.logicWidth);
 				modellingTool.connect(p, gbd.getInputPin());
 				idDisplayMap.put(p.name, gbd);
 			} else if (SwitchWithDisplay.class.isAssignableFrom(type))
@@ -148,14 +148,14 @@ public class TestEnvironmentHelper
 	private void setupDebugging()
 	{
 		// Debug code
-		HashSet<GUIWire> wiresIncludingSubmodels = new HashSet<>();
+		HashSet<ModelWire> wiresIncludingSubmodels = new HashSet<>();
 		Queue<ViewModel> modelsToIterate = new LinkedList<>();
 		modelsToIterate.add(viewModel);
 		while (modelsToIterate.size() > 0)
 		{
 			ViewModel model = modelsToIterate.poll();
 			wiresIncludingSubmodels.addAll(model.getWiresByName().values());
-			for (GUIComponent comp : model.getComponentsByName().values())
+			for (ModelComponent comp : model.getComponentsByName().values())
 				if (comp instanceof SubmodelComponent)
 					modelsToIterate.offer(((SubmodelComponent) comp).submodel);
 		}