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=2b483d51d4fb6acb25d039b978fdb8ca891f1b38;hb=45941345b94530390abe953aab4e78135d4f0742;hp=a2142341c77d096438f82aa29acd8ff884e8f882;hpb=8e8d5776ccc95a08885789834abd55cc50e18a24;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 a2142341..2b483d51 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
@@ -1,14 +1,12 @@
 package net.mograsim.logic.model.am2900;
 
-import java.io.IOException;
-import java.io.InputStream;
 import java.util.concurrent.atomic.AtomicBoolean;
 
 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.ResourceLoader;
 
 public class Am2900Loader implements BundleActivator
 {
@@ -17,7 +15,7 @@ public class Am2900Loader implements BundleActivator
 	@Override
 	public void start(BundleContext context) throws Exception
 	{
-		setup(); // TODO: useful?
+		setup();
 	}
 
 	@Override
@@ -30,30 +28,9 @@ public class Am2900Loader implements BundleActivator
 	{
 		if (activated.getAndSet(true))
 			return;
-		IndirectGUIComponentCreator.registerResourceLoader(new Am2900ResourceLoader(), "Am2900Loader");
+		ClassLoaderBasedResourceLoader resourceLoader = ClassLoaderBasedResourceLoader.create(Am2900Loader.class.getClassLoader());
+		IndirectGUIComponentCreator.registerResourceLoader(resourceLoader, "Am2900Loader");
 		IndirectGUIComponentCreator.loadStandardComponentIDs(Am2900Loader.class.getResourceAsStream("standardComponentIDMapping.json"));
-		System.out.println("SETUP DONE");
-	}
-
-	static
-	{
-		setup();
-	}
-
-	/**
-	 * @see ResourceLoader
-	 */
-	public static ResourceLoader resourceLoader()
-	{
-		return new Am2900ResourceLoader();
-	}
-
-	static class Am2900ResourceLoader implements ResourceLoader
-	{
-		@Override
-		public InputStream loadResource(String path) throws IOException
-		{
-			return Am2900ResourceLoader.class.getResourceAsStream(path);
-		}
+//		System.out.println("SETUP DONE"); // TODO: Debug
 	}
 }