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

[Mograsim.git] / net.mograsim.logic.model / src / net / mograsim / logic / model / serializing / SubmodelComponentParams.java

diff --git a/net.mograsim.logic.model/src/net/mograsim/logic/model/serializing/SubmodelComponentParams.java b/net.mograsim.logic.model/src/net/mograsim/logic/model/serializing/SubmodelComponentParams.java
index 49edfd6..97b3c7c 100644 (file)
--- a/net.mograsim.logic.model/src/net/mograsim/logic/model/serializing/SubmodelComponentParams.java
+++ b/net.mograsim.logic.model/src/net/mograsim/logic/model/serializing/SubmodelComponentParams.java
@@ -1,86 +1,43 @@
 package net.mograsim.logic.model.serializing;
 
-import java.io.IOException;
-
 import com.google.gson.JsonElement;
 
 import net.haspamelodica.swt.helper.swtobjectwrappers.Point;
 import net.mograsim.logic.model.model.components.submodels.SubmodelComponent;
-import net.mograsim.logic.model.util.JsonHandler;
+import net.mograsim.logic.model.model.wires.PinUsage;
+import net.mograsim.logic.model.util.Version;
 
 /**
  * This class contains all the information necessary to create a new {@link SubmodelComponent}
  */
-public class SubmodelComponentParams
+public class SubmodelComponentParams extends SerializablePojo
 {
        // basic stuff
        public double width, height;
        public InterfacePinParams[] interfacePins;
-       public SubmodelParameters submodel;
+       public double innerScale;
+       public LogicModelParams submodel;
 
        // functionality that needs to be expressed in Java code
-       public String outlineRendererSnippetID;
-       public JsonElement outlineRendererParams;
-
        public String symbolRendererSnippetID;
        public JsonElement symbolRendererParams;
 
+       public String outlineRendererSnippetID;
+       public JsonElement outlineRendererParams;
+
        public String highLevelStateHandlerSnippetID;
        public JsonElement highLevelStateHandlerParams;
 
+       public SubmodelComponentParams(Version version)
+       {
+               super(version);
+       }
+
        public static class InterfacePinParams
        {
                public Point location;
                public String name;
                public int logicWidth;
-       }
-
-       public static class SubmodelParameters
-       {
-               public double innerScale;
-               public InnerComponentParams[] subComps;
-               public InnerWireParams[] innerWires;
-
-               public static class InnerComponentParams
-               {
-                       public Point pos;
-                       public String id;
-                       public String name;
-                       public JsonElement params;
-               }
-
-               public static class InnerWireParams
-               {
-                       public InnerPinParams pin1, pin2;
-                       public Point[] path;
-
-                       public static class InnerPinParams
-                       {
-                               public String compName;
-                               public String pinName;
-                       }
-               }
-       }
-
-       public static SubmodelComponentParams readJson(String path) throws IOException
-       {
-               return JsonHandler.readJson(path, SubmodelComponentParams.class);
-       }
-
-       /**
-        * Writes this {@link SubmodelComponentParams} object into a file in json format. The correct file extension is important! Check
-        * {@link SubmodelComponentParams}.fileExtension
-        */
-       public void writeJson(String path)
-       {
-               try
-               {
-                       JsonHandler.writeJson(this, path);
-               }
-               catch (IOException e)
-               {
-                       System.err.println("Failed to write SubComponentParams to file");
-                       e.printStackTrace();
-               }
+               public PinUsage usage;
        }
 }
\ No newline at end of file