X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.model%2Fsrc%2Fnet%2Fmograsim%2Flogic%2Fmodel%2Fsnippets%2FSubmodelComponentSnippetSuppliers.java;h=860557fdac3ac4dbb115ade0c0b9d25eac440029;hb=8bed58cd47f4e53a0a83e066d38864aa6875502f;hp=ff6e554971a7958724555bdb616909d20ab80e34;hpb=c5c0d07286a29994a11ba8b01eaffb21964b6c1b;p=Mograsim.git

diff --git a/net.mograsim.logic.model/src/net/mograsim/logic/model/snippets/SubmodelComponentSnippetSuppliers.java b/net.mograsim.logic.model/src/net/mograsim/logic/model/snippets/SubmodelComponentSnippetSuppliers.java
index ff6e5549..860557fd 100644
--- a/net.mograsim.logic.model/src/net/mograsim/logic/model/snippets/SubmodelComponentSnippetSuppliers.java
+++ b/net.mograsim.logic.model/src/net/mograsim/logic/model/snippets/SubmodelComponentSnippetSuppliers.java
@@ -4,6 +4,7 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.util.Map;
 
+import net.mograsim.logic.model.model.components.ModelComponent;
 import net.mograsim.logic.model.model.components.submodels.SubmodelComponent;
 import net.mograsim.logic.model.snippets.highlevelstatehandlers.DefaultHighLevelStateHandler;
 import net.mograsim.logic.model.snippets.outlinerenderers.DefaultOutlineRenderer;
@@ -12,8 +13,8 @@ import net.mograsim.logic.model.util.JsonHandler;
 
 public class SubmodelComponentSnippetSuppliers
 {
-	public static final CodeSnippetSupplier<SubmodelComponent, Renderer> symbolRendererSupplier;
-	public static final CodeSnippetSupplier<SubmodelComponent, Renderer> outlineRendererSupplier;
+	public static final CodeSnippetSupplier<ModelComponent, Renderer> symbolRendererSupplier;
+	public static final CodeSnippetSupplier<ModelComponent, Renderer> outlineRendererSupplier;
 	public static final CodeSnippetSupplier<SubmodelComponent, HighLevelStateHandler> highLevelStateHandlerSupplier;
 
 	static
@@ -25,13 +26,13 @@ public class SubmodelComponentSnippetSuppliers
 
 	static
 	{
-		try (InputStream s = SubmodelComponentSnippetSuppliers.class.getResourceAsStream("./standardSnippetIDMapping.json"))
+		try (InputStream s = SubmodelComponentSnippetSuppliers.class.getResourceAsStream("standardSnippetIDMapping.json"))
 		{
 			if (s == null)
 				throw new IOException("Resource not found");
 			SnippetIDClassNames tmp = JsonHandler.readJson(s, SnippetIDClassNames.class);
-			tmp.standardOutlineRendererSuppliers.forEach(outlineRendererSupplier::addStandardSnippetID);
 			tmp.standardSymbolRendererSuppliers.forEach(symbolRendererSupplier::addStandardSnippetID);
+			tmp.standardOutlineRendererSuppliers.forEach(outlineRendererSupplier::addStandardSnippetID);
 			tmp.standardHighLevelStateHandlerSuppliers.forEach(highLevelStateHandlerSupplier::addStandardSnippetID);
 		}
 		catch (Exception e)
@@ -43,8 +44,8 @@ public class SubmodelComponentSnippetSuppliers
 
 	private static class SnippetIDClassNames
 	{
-		public Map<String, String> standardOutlineRendererSuppliers;
 		public Map<String, String> standardSymbolRendererSuppliers;
+		public Map<String, String> standardOutlineRendererSuppliers;
 		public Map<String, String> standardHighLevelStateHandlerSuppliers;
 	}