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=51e8cecb5fb0386eecfff995c2c0c75ac2b38d66;hb=fad8705ef415763bc80cf698be3bc6f443470a29;hp=2b483d51d4fb6acb25d039b978fdb8ca891f1b38;hpb=45941345b94530390abe953aab4e78135d4f0742;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..51e8cecb 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,11 @@ 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; public class Am2900Loader implements BundleActivator { + // TODO use dff16 in dff16_we & dff16_invwe private static AtomicBoolean activated = new AtomicBoolean(false); @Override @@ -29,8 +30,8 @@ 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")); // System.out.println("SETUP DONE"); // TODO: Debug } }