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=ecb13b4cea46cecd508b3beb00eb93d46cb27ad2;hb=93b398d6271a538a2a4c9f4de07a3b4a8a2a7fd4;hp=0f0dcd51b71717bf0dffdab45ec73026c82e915e;hpb=5b0bf11ef46012078eccc4043331a0d058224519;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 0f0dcd51..ecb13b4c 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.serializing.IndirectModelComponentCreator;
 import net.mograsim.machine.Machine;
 import net.mograsim.machine.MachineDefinition;
 import net.mograsim.machine.Register;
@@ -17,13 +17,14 @@ public class Am2900Machine implements Machine
 	private Am2900MachineDefinition machineDefinition;
 	private ViewModelModifiable viewModel;
 	private Timeline timeline;
-	private Clock clock;
+	private CoreClock clock;
 
 	public Am2900Machine(Am2900MachineDefinition am2900MachineDefinition)
 	{
 		this.machineDefinition = am2900MachineDefinition;
 		viewModel = new ViewModelModifiable();
-		IndirectGUIComponentCreator.createComponent(viewModel, "resource:Am2900Loader:/components/GUIAm2900.json");
+		IndirectModelComponentCreator.createComponent(viewModel,
+				"resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/components/ModelAm2900.json");
 		LogicModelParameters params = new LogicModelParameters();
 		params.gateProcessTime = 50;
 		params.wireTravelTime = 10;
@@ -56,7 +57,7 @@ public class Am2900Machine implements Machine
 	}
 
 	@Override
-	public Clock getClock()
+	public CoreClock getClock()
 	{
 		return clock;
 	}