X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.ui%2Fsrc%2Fnet%2Fmograsim%2Flogic%2Fui%2Fserializing%2FSubmodelComponentParams.java;h=3deda5f7e744f47d82e5916582b82905bad8f0e3;hb=5ece0acf049bf9af2933f513fe0206565681f622;hp=238635910651f8a0ba077bae9c67418e3680195f;hpb=01c5d7035474a5eb58f216b6831b2c0d8c174efa;p=Mograsim.git

diff --git a/net.mograsim.logic.ui/src/net/mograsim/logic/ui/serializing/SubmodelComponentParams.java b/net.mograsim.logic.ui/src/net/mograsim/logic/ui/serializing/SubmodelComponentParams.java
index 23863591..3deda5f7 100644
--- a/net.mograsim.logic.ui/src/net/mograsim/logic/ui/serializing/SubmodelComponentParams.java
+++ b/net.mograsim.logic.ui/src/net/mograsim/logic/ui/serializing/SubmodelComponentParams.java
@@ -1,7 +1,8 @@
 package net.mograsim.logic.ui.serializing;
 
 import java.io.IOException;
-import java.util.Map;
+
+import com.google.gson.JsonElement;
 
 import net.haspamelodica.swt.helper.swtobjectwrappers.Point;
 import net.mograsim.logic.ui.model.components.submodels.SubmodelComponent;
@@ -12,11 +13,17 @@ import net.mograsim.logic.ui.util.JsonHandler;
  */
 public class SubmodelComponentParams
 {
-	public String type, name;
+	// basic stuff
 	public double width, height;
 	public InterfacePinParams[] interfacePins;
-	public ComponentCompositionParams composition;
-	public Map<String, Object> specialized;
+	public SubmodelParameters submodel;
+
+	// functionality that needs to be expressed in Java code
+	public String outlineRendererSnippetID;
+	public JsonElement outlineRendererParams;
+
+	public String symbolRendererSnippetID;
+	public JsonElement symbolRendererParams;
 
 	public static class InterfacePinParams
 	{
@@ -25,19 +32,7 @@ public class SubmodelComponentParams
 		public int logicWidth;
 	}
 
-	public static class InnerWireParams
-	{
-		public InnerPinParams pin1, pin2;
-		public Point[] path;
-	}
-
-	public static class InnerPinParams
-	{
-		public int compId;
-		public String pinName;
-	}
-
-	public static class ComponentCompositionParams
+	public static class SubmodelParameters
 	{
 		public double innerScale;
 		public InnerComponentParams[] subComps;
@@ -46,8 +41,21 @@ public class SubmodelComponentParams
 		public static class InnerComponentParams
 		{
 			public Point pos;
+			public String id;
 			public String name;
-			public Map<String, Object> params;
+			public JsonElement params;
+		}
+
+		public static class InnerWireParams
+		{
+			public InnerPinParams pin1, pin2;
+			public Point[] path;
+
+			public static class InnerPinParams
+			{
+				public String compName;
+				public String pinName;
+			}
 		}
 	}