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=16c8c2ada701145d686f60307300cd33e5077557;hb=fdb090ca9a42f72119b0332f8157aa7d14119ef6;hp=b9939afeecf385c1c767d0e338da557c882afbcb;hpb=b2f3d0b16783289fab229c667c18d61f84119bbd;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 b9939afe..16c8c2ad 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
@@ -15,12 +15,11 @@ import net.haspamelodica.swt.helper.swtobjectwrappers.Rectangle;
 import net.mograsim.logic.ui.LogicUIRenderer;
 import net.mograsim.logic.ui.model.ViewModel;
 import net.mograsim.logic.ui.model.ViewModelModifiable;
-import net.mograsim.logic.ui.model.components.params.GeneralComponentParams;
-import net.mograsim.logic.ui.model.components.params.SubComponentParams;
-import net.mograsim.logic.ui.model.components.params.RectComponentParams.InnerComponentParams;
-import net.mograsim.logic.ui.model.components.params.RectComponentParams.InnerPinParams;
-import net.mograsim.logic.ui.model.components.params.RectComponentParams.InnerWireParams;
-import net.mograsim.logic.ui.model.components.params.SubComponentParams.InterfacePinParams;
+import net.mograsim.logic.ui.model.components.SubmodelComponentParams.ComponentCompositionParams;
+import net.mograsim.logic.ui.model.components.SubmodelComponentParams.ComponentCompositionParams.InnerComponentParams;
+import net.mograsim.logic.ui.model.components.SubmodelComponentParams.InnerPinParams;
+import net.mograsim.logic.ui.model.components.SubmodelComponentParams.InnerWireParams;
+import net.mograsim.logic.ui.model.components.SubmodelComponentParams.InterfacePinParams;
 import net.mograsim.logic.ui.model.wires.GUIWire;
 import net.mograsim.logic.ui.model.wires.Pin;
 
@@ -210,9 +209,13 @@ public abstract class SubmodelComponent extends GUIComponent
 		}
 	}
 
-	public SubComponentParams calculateParams()
+	/**
+	 * @return {@link SubmodelComponentParams}, which describe this {@link SubmodelComponent}.
+	 */
+	public SubmodelComponentParams calculateParams()
 	{
-		SubComponentParams params = new SubComponentParams();
+		SubmodelComponentParams params = new SubmodelComponentParams();
+		params.type = SubmodelComponent.class.getSimpleName();
 		params.composition = calculateCompositionParams();
 
 		Rectangle bounds = getBounds();
@@ -234,9 +237,9 @@ public abstract class SubmodelComponent extends GUIComponent
 		return params;
 	}
 
-	protected GeneralComponentParams calculateCompositionParams()
+	protected ComponentCompositionParams calculateCompositionParams()
 	{
-		GeneralComponentParams params = new GeneralComponentParams();
+		ComponentCompositionParams params = new ComponentCompositionParams();
 		params.innerScale = getSubmodelScale();
 
 		List<GUIComponent> compList = submodelModifiable.getComponents();