X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.model.am2900%2Fsrc%2Fnet%2Fmograsim%2Flogic%2Fmodel%2Fam2900%2FAm2900Loader.java;h=10cf14123d5c600299e911cfb13b799051227fa4;hb=8bed58cd47f4e53a0a83e066d38864aa6875502f;hp=2b483d51d4fb6acb25d039b978fdb8ca891f1b38;hpb=45942cbbb4b10a99cef716c56fe14642f7c45722;p=Mograsim.git

diff --git a/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/Am2900Loader.java b/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/Am2900Loader.java
index 2b483d51..10cf1412 100644
--- a/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/Am2900Loader.java
+++ b/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/Am2900Loader.java
@@ -6,10 +6,12 @@ import org.osgi.framework.BundleActivator;
 import org.osgi.framework.BundleContext;
 
 import net.mograsim.logic.model.serializing.ClassLoaderBasedResourceLoader;
-import net.mograsim.logic.model.serializing.IndirectGUIComponentCreator;
+import net.mograsim.logic.model.serializing.IndirectModelComponentCreator;
+import net.mograsim.machine.MachineLoader;
 
 public class Am2900Loader implements BundleActivator
 {
+	// TODO use dff16 in dff16_we & dff16_invwe
 	private static AtomicBoolean activated = new AtomicBoolean(false);
 
 	@Override
@@ -29,8 +31,9 @@ public class Am2900Loader implements BundleActivator
 		if (activated.getAndSet(true))
 			return;
 		ClassLoaderBasedResourceLoader resourceLoader = ClassLoaderBasedResourceLoader.create(Am2900Loader.class.getClassLoader());
-		IndirectGUIComponentCreator.registerResourceLoader(resourceLoader, "Am2900Loader");
-		IndirectGUIComponentCreator.loadStandardComponentIDs(Am2900Loader.class.getResourceAsStream("standardComponentIDMapping.json"));
+		IndirectModelComponentCreator.registerResourceLoader(resourceLoader, "Am2900Loader");
+		IndirectModelComponentCreator.loadStandardComponentIDs(Am2900Loader.class.getResourceAsStream("standardComponentIDMapping.json"));
+		MachineLoader.setup();
 //		System.out.println("SETUP DONE"); // TODO: Debug
 	}
 }