X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.model%2Fsrc%2Fnet%2Fmograsim%2Flogic%2Fmodel%2Fserializing%2FViewModelSerializer.java;h=b6c28792a8b00cb859151cf8fb2d80af80ff4f3b;hb=95a225aed8eae0fc080440dba779abfdf867ff3d;hp=ffd18c94c0208635d2650541488fdf39dc84ce1f;hpb=853d979edee5d49d3b3c5fe08609f6cfd82d863f;p=Mograsim.git

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 ffd18c94..b6c28792 100644
--- 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;
@@ -156,11 +158,12 @@ public class ViewModelSerializer
 			} else
 			{
 				compParams.id = idGetter.componentIDs.apply(component);
-				compParams.params = component.getParamsForSerializing(idGetter);
+				compParams.params = component.getParamsForSerializingJSON(idGetter);
 			}
 			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;
 	}