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=b91f27edafe240695d21c944384111c25255f5dd;hb=1ce42890e85c1a114bf647002d1aa2743ff9871a;hp=f1e90aa017ec4f6ee3e25b8c7858640575aa4651;hpb=aa5e4901442a1003415dab96a486bb8bfbfc934b;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 f1e90aa0..b91f27ed 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
@@ -28,6 +28,7 @@ import net.mograsim.logic.model.serializing.DeserializedSubmodelComponent;
 import net.mograsim.logic.model.serializing.IdentifyParams;
 import net.mograsim.logic.model.serializing.IndirectModelComponentCreator;
 import net.mograsim.logic.model.serializing.SubmodelComponentSerializer;
+import net.mograsim.logic.model.snippets.highlevelstatehandlers.DefaultHighLevelStateHandler;
 
 public class ReserializeJSONsSettingUsages
 {
@@ -58,13 +59,13 @@ public class ReserializeJSONsSettingUsages
 		}
 	}
 
-	public static void reserializeJSON(Path json, Scanner sysin)
+	public static void reserializeJSON(Path componentPath, Scanner sysin)
 	{
 		try
 		{
 			DeserializedSubmodelComponent comp = (DeserializedSubmodelComponent) IndirectModelComponentCreator
-					.createComponent(new LogicModelModifiable(), "jsonfile:" + json.toString());
-			System.out.println("Reserializing " + json);
+					.createComponent(new LogicModelModifiable(), "jsonfile:" + componentPath.toString());
+			System.out.println("Reserializing " + componentPath);
 			if (changePinUsages)
 				comp.getSupermodelPins().entrySet().stream().sorted(Comparator.comparing(Entry::getKey)).map(Entry::getValue).forEach(pin ->
 				{
@@ -86,9 +87,9 @@ public class ReserializeJSONsSettingUsages
 					setInterfacePinUsage(comp, pin, usage);
 				});
 			LogicModelModifiable submodelModifiable = comp.getSubmodelModifiable();
+			Map<String, String> componentNameRemapping = new HashMap<>();
 			if (changeComponentNames)
 			{
-				Map<String, String> componentNameRemapping = new HashMap<>();
 				componentNameRemapping.put(SubmodelComponent.SUBMODEL_INTERFACE_NAME, SubmodelComponent.SUBMODEL_INTERFACE_NAME);
 				LogicModelModifiable tempModel = new LogicModelModifiable();
 				IdentifyParams iP = new IdentifyParams();
@@ -104,7 +105,9 @@ public class ReserializeJSONsSettingUsages
 							{
 								System.out.print("  New name for component " + oldName + " of type " + subcomp.getIDForSerializing(iP)
 										+ " (empty: " + defaultName + ") >");
-								newName = sysin.nextLine();
+//								newName = sysin.nextLine();
+								newName = "";
+								System.out.println();
 								if (newName.equals(""))
 									newName = defaultName;
 								if (tempModel.getComponentsByName().containsKey(newName))
@@ -126,21 +129,29 @@ public class ReserializeJSONsSettingUsages
 
 				Optional<ModelComponent> o;
 				while ((o = submodelModifiable.getComponentsByName().values().stream()
-						.filter(c -> !c.name.equals(SubmodelComponent.SUBMODEL_INTERFACE_NAME)).findAny()).isPresent())
+						.filter(c -> !c.getName().equals(SubmodelComponent.SUBMODEL_INTERFACE_NAME)).findAny()).isPresent())
 					submodelModifiable.destroyComponent(o.get());
 
-				tempModel.getComponentsByName().values().stream().filter(c -> !c.name.equals(SubmodelComponent.SUBMODEL_INTERFACE_NAME))
+				tempModel.getComponentsByName().values().stream().filter(c -> !c.getName().equals(SubmodelComponent.SUBMODEL_INTERFACE_NAME))
 						.forEach(c -> IndirectModelComponentCreator
-								.createComponent(submodelModifiable, c.getIDForSerializing(iP), c.getParamsForSerializingJSON(iP), c.name)
+								.createComponent(submodelModifiable, c.getIDForSerializing(iP), c.getParamsForSerializingJSON(iP), c.getName())
 								.moveTo(c.getPosX(), c.getPosY()));
 				for (ModelWire w : tempModel.getWiresByName().values())
 					createWire(Function.identity(), submodelModifiable, w);
 			}
-			SubmodelComponentSerializer.serialize(comp, json.toString());
+			SubmodelComponentSerializer.serialize(comp, componentPath.toString());
+			if (changeComponentNames && (comp.getHighLevelStateHandler() == null
+					|| !(comp.getHighLevelStateHandler() instanceof DefaultHighLevelStateHandler)))
+			{
+				System.out.println("A non-default HighLevelStateHandler was detected. Check for changes there manually.");
+				System.out.print("Empty line to continue to next component, old component name to get new component name >");
+				for (String line = sysin.nextLine(); !line.equals(""); line = sysin.nextLine())
+					System.out.println(line + "->" + componentNameRemapping.get(line) + " >");
+			}
 		}
 		catch (Exception e)
 		{
-			System.err.println("An error occurred visiting " + json + ":");
+			System.err.println("An error occurred visiting " + componentPath + ":");
 			e.printStackTrace();
 		}
 	}
@@ -156,7 +167,7 @@ public class ReserializeJSONsSettingUsages
 	private static Pin getRemappedPin(Function<String, String> componentNameRemapping, LogicModelModifiable tempModelForDefaultNames,
 			Pin pin)
 	{
-		return tempModelForDefaultNames.getComponentsByName().get(componentNameRemapping.apply(pin.component.name)).getPin(pin.name);
+		return tempModelForDefaultNames.getComponentsByName().get(componentNameRemapping.apply(pin.component.getName())).getPin(pin.name);
 	}
 
 	private static int compareStringsWithIntegers(String a, String b)