More colors managed by Preferences

[Mograsim.git] / net.mograsim.logic.ui / src / net / mograsim / logic / ui / model / components / SubmodelComponent.java

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 08e7d1a..3db44fd 100644 (file)
--- 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