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

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

diff --git a/net.mograsim.logic.model/src/net/mograsim/logic/model/serializing/LegacySubmodelComponentSerializer.java b/net.mograsim.logic.model/src/net/mograsim/logic/model/serializing/LegacySubmodelComponentSerializer.java
index 37b05a9..93fc945 100644 (file)
--- a/net.mograsim.logic.model/src/net/mograsim/logic/model/serializing/LegacySubmodelComponentSerializer.java
+++ b/net.mograsim.logic.model/src/net/mograsim/logic/model/serializing/LegacySubmodelComponentSerializer.java
@@ -140,8 +140,8 @@ public final class LegacySubmodelComponentSerializer
        }
 
        /**
-        * {@link #serialize(SubmodelComponent, Function)} using a default {@link IdentifierGetter} (see <code>IdentifierGetter</code>'s
-        * {@link IdentifierGetter#IdentifierGetter() default constructor})
+        * {@link #serialize(SubmodelComponent, Function)} using the default {@link IdentifyParams} (see <code>IdentifyParams</code>'s
+        * {@link IdentifyParams#IdentifyParams() default constructor})
         * 
         * @author Daniel Kirschten
         */
@@ -173,8 +173,8 @@ public final class LegacySubmodelComponentSerializer
                comp.setSize(params.width, params.height);
                for (LegacyInterfacePinParams iPinParams : params.interfacePins)
                        // TRISTATE because we don't have a better choice
-                       comp.addSubmodelInterface(new MovablePin(comp, iPinParams.name, iPinParams.logicWidth, PinUsage.TRISTATE, iPinParams.location.x,
-                                       iPinParams.location.y));
+                       comp.addSubmodelInterface(new MovablePin(model, comp, iPinParams.name, iPinParams.logicWidth, PinUsage.TRISTATE,
+                                       iPinParams.location.x, iPinParams.location.y));
                LegacySubmodelParameters submodelParams = params.submodel;
                LogicModelModifiable submodelModifiable = comp.getSubmodelModifiable();
                Map<String, ModelComponent> componentsByName = submodelModifiable.getComponentsByName();
@@ -232,18 +232,9 @@ public final class LegacySubmodelComponentSerializer
                        LegacyInnerComponentParams innerComponentParams = new LegacyInnerComponentParams();
                        componentParams[i1] = innerComponentParams;
                        innerComponentParams.pos = new Point(innerComponent.getPosX(), innerComponent.getPosY());
-                       DeserializedSubmodelComponent innerCompCasted;
-                       if (innerComponent instanceof DeserializedSubmodelComponent
-                                       && (innerCompCasted = (DeserializedSubmodelComponent) innerComponent).idForSerializingOverride != null)
-                       {
-                               innerComponentParams.id = innerCompCasted.idForSerializingOverride;
-                               innerComponentParams.params = innerCompCasted.paramsForSerializingOverride;
-                       } else
-                       {
-                               innerComponentParams.id = innerComponent.getIDForSerializing(idParams);
-                               innerComponentParams.params = innerComponent.getParamsForSerializingJSON(idParams);
-                       }
-                       innerComponentParams.name = innerComponent.name;
+                       innerComponentParams.id = innerComponent.getIDForSerializing(idParams);
+                       innerComponentParams.params = innerComponent.getParamsForSerializingJSON(idParams);
+                       innerComponentParams.name = innerComponent.getName();
                        i1++;
                }
                submodelParams.subComps = componentParams;
@@ -258,9 +249,9 @@ public final class LegacySubmodelComponentSerializer
                        LegacyInnerPinParams pin1Params = new LegacyInnerPinParams(), pin2Params = new LegacyInnerPinParams();
 
                        pin1Params.pinName = innerWire.getPin1().name;
-                       pin1Params.compName = innerWire.getPin1().component.name;
+                       pin1Params.compName = innerWire.getPin1().component.getName();
                        pin2Params.pinName = innerWire.getPin2().name;
-                       pin2Params.compName = innerWire.getPin2().component.name;
+                       pin2Params.compName = innerWire.getPin2().component.getName();
                        innerWireParams.name = innerWire.name;
                        innerWireParams.pin1 = pin1Params;
                        innerWireParams.pin2 = pin2Params;