projects
/
Mograsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Created ReflectionHelper
[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
..
b6c2879
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;
package net.mograsim.logic.model.serializing;
import java.io.IOException;
+import java.util.Arrays;
import java.util.Collection;
import java.util.Collection;
+import java.util.Comparator;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
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);
} else
{
compParams.id = idGetter.componentIDs.apply(component);
- compParams.params = component.getParamsForSerializing(idGetter);
+ compParams.params = component.getParamsForSerializing
JSON
(idGetter);
}
compParams.name = component.name;
}
modelParams.components = componentsParams.toArray(ComponentParams[]::new);
}
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<>();
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);
innerWireParams.path = innerWire.getPath();
}
modelParams.wires = wiresParams.toArray(WireParams[]::new);
+ Arrays.sort(modelParams.wires, Comparator.comparing(c -> c.name));
return modelParams;
}
return modelParams;
}