|
@@ -14,6 +14,7 @@ import org.json.simple.JSONObject;
|
|
|
import org.json.simple.parser.JSONParser;
|
|
|
import org.json.simple.parser.ParseException;
|
|
|
|
|
|
+import classes.Category;
|
|
|
import classes.CpsEdge;
|
|
|
import classes.CpsNode;
|
|
|
import classes.CpsObject;
|
|
@@ -50,10 +51,10 @@ public class LoadController {
|
|
|
*/
|
|
|
public void readJSON(String path) throws IOException {
|
|
|
JSONParser parser = new JSONParser();
|
|
|
- MODEL.setCgIdx(new HashMap<>());
|
|
|
- MODEL.setCvsObjIdx(new HashMap<>());
|
|
|
- MODEL.setCategories(new ArrayList<>());
|
|
|
- MODEL.setObjectsOnCanvas(new ArrayList<>());
|
|
|
+ MODEL.setCgIdx(new HashMap<String,Integer>());
|
|
|
+ MODEL.setCvsObjIdx(new HashMap<Integer,Integer>());
|
|
|
+ MODEL.setCategories(new ArrayList<Category>());
|
|
|
+ MODEL.setObjectsOnCanvas(new ArrayList<CpsObject>());
|
|
|
|
|
|
|
|
|
ArrayList<String> obj = new ArrayList<>();
|
|
@@ -147,7 +148,7 @@ public class LoadController {
|
|
|
String type = next(i);
|
|
|
|
|
|
if (type.equals("HolonObject")) {
|
|
|
- cgC.addNewHolonObject(mpC.searchCategory(next(i)), next(i), new ArrayList<>(), next(i));
|
|
|
+ cgC.addNewHolonObject(mpC.searchCategory(next(i)), next(i), new ArrayList<HolonElement>(), next(i));
|
|
|
} else if (type.equals("HolonTransformer")) {
|
|
|
cgC.addNewHolonTransformer(mpC.searchCategory(next(i)), next(i), next(i));
|
|
|
} else if (type.equals("HolonSwitch")) {
|