Made finding the ID of a JsonSerializable less ugly

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

diff --git a/net.mograsim.logic.model/src/net/mograsim/logic/model/serializing/ViewModelSerializer.java b/net.mograsim.logic.model/src/net/mograsim/logic/model/serializing/ViewModelSerializer.java
index ffd18c9..61d4915 100644 (file)
--- a/net.mograsim.logic.model/src/net/mograsim/logic/model/serializing/ViewModelSerializer.java
+++ b/net.mograsim.logic.model/src/net/mograsim/logic/model/serializing/ViewModelSerializer.java
@@ -1,7 +1,9 @@
 package net.mograsim.logic.model.serializing;
 
 import java.io.IOException;
+import java.util.Arrays;
 import java.util.Collection;
+import java.util.Comparator;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
@@ -76,9 +78,9 @@ public class ViewModelSerializer
         * 
         * @author Daniel Kirschten
         */
-       public static void serialize(ViewModel model, IdentifierGetter idGetter, String targetPath) throws IOException
+       public static void serialize(ViewModel model, IdentifyParams idParams, String targetPath) throws IOException
        {
-               JsonHandler.writeJson(serialize(model, idGetter), targetPath);
+               JsonHandler.writeJson(serialize(model, idParams), targetPath);
        }
 
        /**
@@ -89,7 +91,7 @@ public class ViewModelSerializer
         */
        public static ViewModelParams serialize(ViewModel model)
        {
-               return serialize(model, new IdentifierGetter());
+               return serialize(model, new IdentifyParams());
        }
 
        // "core" methods
@@ -135,7 +137,7 @@ public class ViewModelSerializer
         * @author Fabian Stemmler
         * @author Daniel Kirschten
         */
-       public static ViewModelParams serialize(ViewModel model, IdentifierGetter idGetter)
+       public static ViewModelParams serialize(ViewModel model, IdentifyParams idParams)
        {
                ViewModelParams modelParams = new ViewModelParams(CURRENT_JSON_VERSION);
 
@@ -155,12 +157,13 @@ public class ViewModelSerializer
                                compParams.params = innerCompCasted.paramsForSerializingOverride;
                        } else
                        {
-                               compParams.id = idGetter.componentIDs.apply(component);
-                               compParams.params = component.getParamsForSerializing(idGetter);
+                               compParams.id = component.getIDForSerializing(idParams);
+                               compParams.params = component.getParamsForSerializingJSON(idParams);
                        }
                        compParams.name = component.name;
                }
                modelParams.components = componentsParams.toArray(ComponentParams[]::new);
+               Arrays.sort(modelParams.components, Comparator.comparing(c -> c.name));
 
                Collection<GUIWire> wires = model.getWiresByName().values();
                Set<WireParams> wiresParams = new HashSet<>();
@@ -180,6 +183,7 @@ public class ViewModelSerializer
                        innerWireParams.path = innerWire.getPath();
                }
                modelParams.wires = wiresParams.toArray(WireParams[]::new);
+               Arrays.sort(modelParams.wires, Comparator.comparing(c -> c.name));
 
                return modelParams;
        }