X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.model.am2900%2Fsrc%2Fnet%2Fmograsim%2Flogic%2Fmodel%2Fam2900%2Fmachine%2FAm2900Machine.java;h=bf98d73dcac801d0da72ba08949cf4ecf4545647;hb=3a52b6bffe52db5dd5ca907b4b3dfd368a58e14f;hp=7f234a40d7af0f87a051e459ed5c372fca42938d;hpb=45941345b94530390abe953aab4e78135d4f0742;p=Mograsim.git

diff --git a/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/machine/Am2900Machine.java b/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/machine/Am2900Machine.java
index 7f234a40..bf98d73d 100644
--- a/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/machine/Am2900Machine.java
+++ b/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/machine/Am2900Machine.java
@@ -1,13 +1,13 @@
 package net.mograsim.logic.model.am2900.machine;
 
-import net.mograsim.logic.core.components.Clock;
+import net.mograsim.logic.core.components.CoreClock;
 import net.mograsim.logic.core.timeline.Timeline;
 import net.mograsim.logic.core.types.BitVector;
-import net.mograsim.logic.model.model.ViewModel;
-import net.mograsim.logic.model.model.ViewModelModifiable;
-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.model.LogicModel;
+import net.mograsim.logic.model.model.LogicModelModifiable;
+import net.mograsim.logic.model.modeladapter.CoreModelParameters;
+import net.mograsim.logic.model.modeladapter.LogicCoreAdapter;
+import net.mograsim.logic.model.serializing.IndirectModelComponentCreator;
 import net.mograsim.machine.Machine;
 import net.mograsim.machine.MachineDefinition;
 import net.mograsim.machine.Register;
@@ -15,19 +15,20 @@ import net.mograsim.machine.Register;
 public class Am2900Machine implements Machine
 {
 	private Am2900MachineDefinition machineDefinition;
-	private ViewModelModifiable viewModel;
+	private LogicModelModifiable logicModel;
 	private Timeline timeline;
-	private Clock clock;
+	private CoreClock clock;
 
 	public Am2900Machine(Am2900MachineDefinition am2900MachineDefinition)
 	{
 		this.machineDefinition = am2900MachineDefinition;
-		viewModel = new ViewModelModifiable();
-		IndirectGUIComponentCreator.createComponent(viewModel, "resloader:Am2900Loader:jsonres:components/GUIAm2900.json");
-		LogicModelParameters params = new LogicModelParameters();
+		logicModel = new LogicModelModifiable();
+		IndirectModelComponentCreator.createComponent(logicModel,
+				"resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/components/ModelAm2900.json");
+		CoreModelParameters params = new CoreModelParameters();
 		params.gateProcessTime = 50;
 		params.wireTravelTime = 10;
-		timeline = ViewLogicModelAdapter.convert(viewModel, params);
+		timeline = LogicCoreAdapter.convert(logicModel, params);
 	}
 
 	@Override
@@ -44,9 +45,9 @@ public class Am2900Machine implements Machine
 	}
 
 	@Override
-	public ViewModel getModel()
+	public LogicModel getModel()
 	{
-		return viewModel;
+		return logicModel;
 	}
 
 	@Override
@@ -56,7 +57,7 @@ public class Am2900Machine implements Machine
 	}
 
 	@Override
-	public Clock getClock()
+	public CoreClock getClock()
 	{
 		return clock;
 	}