X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.ui%2Fsrc%2Fnet%2Fmograsim%2Flogic%2Fui%2Fmodel%2Fcomponents%2FSubmodelComponent.java;h=3db44fdf2dc442257a29d558b639970751ce5cef;hb=64031e27d6b607e5475d081f93581960ef5a82b4;hp=08e7d1af1d539a803367b166fd05f17295d0c53d;hpb=8b82d74c9b7e4435381a7e8bd900cea7f8ae57cd;p=Mograsim.git

diff --git a/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/SubmodelComponent.java b/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/SubmodelComponent.java
index 08e7d1af..3db44fdf 100644
--- a/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/SubmodelComponent.java
+++ b/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/SubmodelComponent.java
@@ -331,6 +331,7 @@ public abstract class SubmodelComponent extends GUIComponent
 	public SubmodelComponentParams calculateParams()
 	{
 		SubmodelComponentParams params = new SubmodelComponentParams();
+		params.name = getIdentifier();
 		params.type = SubmodelComponent.class.getSimpleName();
 		params.composition = calculateCompositionParams();
 
@@ -368,8 +369,8 @@ public abstract class SubmodelComponent extends GUIComponent
 			InnerComponentParams inner = new InnerComponentParams();
 			comps[i] = inner;
 			inner.params = component.getInstantiationParameters();
-			inner.pos = new Point(getPosX(), getPosY());
-			inner.type = component.getIdentifier();
+			inner.pos = new Point(component.getPosX(), component.getPosY());
+			inner.name = component.getIdentifier();
 			i++;
 		}
 		params.subComps = comps;
@@ -396,6 +397,16 @@ public abstract class SubmodelComponent extends GUIComponent
 		return params;
 	}
 
+	public List<GUIComponent> getComponents()
+	{
+		return submodel.getComponents();
+	}
+
+	public List<GUIWire> getWires()
+	{
+		return submodel.getWires();
+	}
+
 	// operations no longer supported
 
 	@Override