|
@@ -217,7 +217,8 @@ public class SaveController {
|
|
|
file.add(key, new JsonPrimitive(cat.getName()));
|
|
|
// forall object in the category store them into the jsontree
|
|
|
for (AbstractCpsObject obj : cat.getObjects()) {
|
|
|
- file.add("CGOBJECT" + getNumerator(NUMTYPE.OBJECT), model.getGson().toJsonTree(obj, AbstractCpsObject.class));
|
|
|
+ file.add("CGOBJECT" + getNumerator(NUMTYPE.OBJECT),
|
|
|
+ model.getGson().toJsonTree(obj, AbstractCpsObject.class));
|
|
|
// if its a holonobject add elements too
|
|
|
if (obj instanceof HolonObject)
|
|
|
elementsToJson(TYPE.CATEGORY, file, obj);
|
|
@@ -421,9 +422,8 @@ public class SaveController {
|
|
|
private void statisticgraphToJson(JsonObject file) {
|
|
|
// TODO Auto-generated method stub
|
|
|
JsonObject temp = new JsonObject();
|
|
|
-
|
|
|
- List<String> keys = model.getGraphTable().keySet().parallelStream()
|
|
|
- .collect(Collectors.toCollection(ArrayList::new));
|
|
|
+
|
|
|
+ List<String> keys = model.getGraphTable().keySet().stream().collect(Collectors.toCollection(ArrayList::new));
|
|
|
|
|
|
for (String k : keys) {
|
|
|
JsonObject dataSet = new JsonObject();
|