X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.model.am2900%2Fsrc%2Fnet%2Fmograsim%2Flogic%2Fmodel%2Fexamples%2FReserializeJSONsSettingUsages.java;h=bd4d45883d1ebdf53666ba19ee91a0b82c9e698e;hb=1f645882d229fc3d4081e4c5060559d75dc2cc24;hp=085cb8f2eb59a45e2831b9dc8a675c8016d411e2;hpb=93b398d6271a538a2a4c9f4de07a3b4a8a2a7fd4;p=Mograsim.git diff --git a/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/examples/ReserializeJSONsSettingUsages.java b/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/examples/ReserializeJSONsSettingUsages.java index 085cb8f2..bd4d4588 100644 --- a/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/examples/ReserializeJSONsSettingUsages.java +++ b/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/examples/ReserializeJSONsSettingUsages.java @@ -12,7 +12,7 @@ import java.util.stream.Collectors; import java.util.stream.Stream; import net.mograsim.logic.model.am2900.Am2900Loader; -import net.mograsim.logic.model.model.ViewModelModifiable; +import net.mograsim.logic.model.model.LogicModelModifiable; import net.mograsim.logic.model.model.wires.ModelWire; import net.mograsim.logic.model.model.wires.MovablePin; import net.mograsim.logic.model.model.wires.Pin; @@ -52,7 +52,7 @@ public class ReserializeJSONsSettingUsages try { DeserializedSubmodelComponent comp = (DeserializedSubmodelComponent) IndirectModelComponentCreator - .createComponent(new ViewModelModifiable(), "jsonfile:" + json.toString()); + .createComponent(new LogicModelModifiable(), "jsonfile:" + json.toString()); System.out.println("Reserializing " + json); comp.getSupermodelPins().entrySet().stream().sorted(Comparator.comparing(Entry::getKey)).map(Entry::getValue).forEach(pin -> { @@ -77,11 +77,11 @@ public class ReserializeJSONsSettingUsages { Set wiresConnectedToPin = comp.submodel.getWiresByName().values().stream() .filter(w -> w.getPin1() == interfacePin || w.getPin2() == interfacePin).collect(Collectors.toSet()); - wiresConnectedToPin.forEach(comp.getSubmodelModifiable()::destroyWire); + LogicModelModifiable submodelModifiable = comp.getSubmodelModifiable(); + wiresConnectedToPin.forEach(submodelModifiable::destroyWire); comp.removeSubmodelInterface(interfacePin.name); - comp.addSubmodelInterface( - new MovablePin(comp, interfacePin.name, interfacePin.logicWidth, usage, interfacePin.getRelX(), interfacePin.getRelY())); - ViewModelModifiable submodelModifiable = comp.getSubmodelModifiable(); + comp.addSubmodelInterface(new MovablePin(submodelModifiable, comp, interfacePin.name, interfacePin.logicWidth, usage, + interfacePin.getRelX(), interfacePin.getRelY())); wiresConnectedToPin.forEach(w -> new ModelWire(submodelModifiable, w.getPin1(), w.getPin2())); } } \ No newline at end of file