load/save statgraph finish

src/ui/controller/SaveController.java

@@ -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();

src/ui/view/GUI.java

@@ -2329,9 +2329,10 @@ public class GUI<E> implements CategoryListener {
 				cps = controller.searchTracked(obj.get("ID").getAsInt());
 				prop = obj.get("PROPERTY").getAsInt();
 				color = model.getGson().fromJson(obj.get("COLOR"), Color.class);
-				stat.getStatGraph().addObject(new TrackedDataSet(cps, prop, color));
+				stat.addObject(new TrackedDataSet(cps, prop, color));
 			}
 			model.getGraphTable().put(json.get("KEY").getAsString(), stat);
+			model.getStatPanel().getGraphPanel().add(stat);
 		}
 	}
 }

src/ui/view/StatisticGraphPanel.java

@@ -152,7 +152,7 @@ public class StatisticGraphPanel extends JPanel {
 	 * 
 	 * @param set
 	 */
-	public void addObjec(TrackedDataSet set) {
+	public void addObject(TrackedDataSet set) {
 		sGraph.addObject(set);
 		String property = "";
 		switch (set.getProperty()) {

src/ui/view/StatisticPanel.java

@@ -612,7 +612,7 @@ public class StatisticPanel extends JSplitPane implements GraphListener {
 							}
 							TrackedDataSet tds = new TrackedDataSet(absCps, propValTable.get(property),
 									currentProperty.getColor());
-							graphHashtable.get(graphNrTxtField.getText()).addObjec(tds);
+							graphHashtable.get(graphNrTxtField.getText()).addObject(tds);
 						}
 					}
 				}