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=7f234a40d7af0f87a051e459ed5c372fca42938d;hb=45941345b94530390abe953aab4e78135d4f0742;hp=df3b726fbfb0b93c7a26641aae5b8991f7ec6237;hpb=3813eb83f6c17041dcb67d7d2744c66a8bfdb18d;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 df3b726f..7f234a40 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
@@ -5,7 +5,6 @@ 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.model.components.atomic.GUIClock;
 import net.mograsim.logic.model.modeladapter.LogicModelParameters;
 import net.mograsim.logic.model.modeladapter.ViewLogicModelAdapter;
 import net.mograsim.logic.model.serializing.IndirectGUIComponentCreator;
@@ -16,20 +15,19 @@ import net.mograsim.machine.Register;
 public class Am2900Machine implements Machine
 {
 	private Am2900MachineDefinition machineDefinition;
-	private ViewModel viewModel;
+	private ViewModelModifiable viewModel;
 	private Timeline timeline;
 	private Clock clock;
 
 	public Am2900Machine(Am2900MachineDefinition am2900MachineDefinition)
 	{
 		this.machineDefinition = am2900MachineDefinition;
-		ViewModelModifiable viewModelModifiable = new ViewModelModifiable();
-		IndirectGUIComponentCreator.createComponent(viewModelModifiable, "resource:Am2900Loader:/components/GUIAm2900.json");
+		viewModel = new ViewModelModifiable();
+		IndirectGUIComponentCreator.createComponent(viewModel, "resloader:Am2900Loader:jsonres:components/GUIAm2900.json");
 		LogicModelParameters params = new LogicModelParameters();
 		params.gateProcessTime = 50;
 		params.wireTravelTime = 10;
-		timeline = ViewLogicModelAdapter.convert(viewModelModifiable, params);
-		clock = ((GUIClock) viewModelModifiable.getComponentsByName().get("GUIClock#0")).getClock();
+		timeline = ViewLogicModelAdapter.convert(viewModel, params);
 	}
 
 	@Override