Fixed a bug in Am2900; created dlatch8/80; relayouted some components

[Mograsim.git] / net.mograsim.logic.model / src / net / mograsim / logic / model / snippets / SubmodelComponentSnippetSuppliers.java

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 ff6e554..860557f 100644 (file)
--- 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;
        }