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=179265bc8f388043991da2b31a5d3748afd3cafd;hpb=45941345b94530390abe953aab4e78135d4f0742;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 179265bc..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
@@ -11,19 +11,21 @@ import java.util.Set;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import net.mograsim.logic.model.model.ViewModelModifiable;
-import net.mograsim.logic.model.model.wires.GUIWire;
+import net.mograsim.logic.model.am2900.Am2900Loader;
+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;
 import net.mograsim.logic.model.model.wires.PinUsage;
 import net.mograsim.logic.model.serializing.DeserializedSubmodelComponent;
-import net.mograsim.logic.model.serializing.IndirectGUIComponentCreator;
+import net.mograsim.logic.model.serializing.IndirectModelComponentCreator;
 import net.mograsim.logic.model.serializing.SubmodelComponentSerializer;
 
 public class ReserializeJSONsSettingUsages
 {
 	public static void main(String[] args) throws IOException
 	{
+		Am2900Loader.setup();
 		try (Scanner sysin = new Scanner(System.in))
 		{
 			System.out.print("Directory to search for JSONs in / JSON file to reserialize >");
@@ -49,8 +51,8 @@ public class ReserializeJSONsSettingUsages
 	{
 		try
 		{
-			DeserializedSubmodelComponent comp = (DeserializedSubmodelComponent) IndirectGUIComponentCreator
-					.createComponent(new ViewModelModifiable(), "jsonfile:" + json.toString());
+			DeserializedSubmodelComponent comp = (DeserializedSubmodelComponent) IndirectModelComponentCreator
+					.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 ->
 			{
@@ -73,13 +75,13 @@ public class ReserializeJSONsSettingUsages
 
 	private static void setInterfacePinUsage(DeserializedSubmodelComponent comp, Pin interfacePin, PinUsage usage)
 	{
-		Set<GUIWire> wiresConnectedToPin = comp.submodel.getWiresByName().values().stream()
+		Set<ModelWire> 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();
-		wiresConnectedToPin.forEach(w -> new GUIWire(submodelModifiable, w.getPin1(), w.getPin2()));
+		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