Parameter fixes

src/classes/Category.java

@@ -15,7 +15,7 @@ public class Category{
 		setObjects(new ArrayList<CpsObject>());
 		setName(name);
 		setID(-1);
-		setObjIdx(new HashMap<>());
+		setObjIdx(new HashMap<String,Integer>());
 	
 	}
 

src/classes/HolonObject.java

@@ -27,7 +27,7 @@ public class HolonObject extends CpsObject {
 		super(ObjName);
 
 		setElements(new ArrayList<HolonElement>());
-		setEleIdx(new HashMap<>());
+		setEleIdx(new HashMap<String,Integer>());
 
 	}
 
@@ -35,7 +35,7 @@ public class HolonObject extends CpsObject {
 		super(ObjName);
 		super.setName(obj);
 		setElements(new ArrayList<HolonElement>());
-		setEleIdx(new HashMap<>());
+		setEleIdx(new HashMap<String,Integer>());
 	}
 
 	public HolonObject(CpsObject obj) {

src/ui/controller/CanvasController.java

@@ -36,7 +36,7 @@ public class CanvasController {
 	 */
 	public void addNewObject(CpsObject object) {
 		object.setSav("CVS");
-		object.setConnections(new ArrayList<>());
+		object.setConnections(new ArrayList<CpsEdge>());
 		addObject(object);
 	}
 

src/ui/controller/CategoryController.java

@@ -30,8 +30,8 @@ public class CategoryController {
 		addNewCategory("Building");
 		addNewCategory("Component");
 
-		addNewHolonObject(mpC.searchCategory("Energy"), "Power Plant", new ArrayList<>(), "/Images/power-plant.png");
-		addNewHolonObject(mpC.searchCategory("Building"), "House", new ArrayList<>(), "/Images/home-2.png");
+		addNewHolonObject(mpC.searchCategory("Energy"), "Power Plant", new ArrayList<HolonElement>(), "/Images/power-plant.png");
+		addNewHolonObject(mpC.searchCategory("Building"), "House", new ArrayList<HolonElement>(), "/Images/home-2.png");
 		addNewHolonTransformer(mpC.searchCategory("Component"), "Transformer", "/Images/transformer-1.png");
 		addNewHolonSwitch(mpC.searchCategory("Component"), "Switch", "/Images/switch-off.png");
 

src/ui/controller/LoadController.java

@@ -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")) {

src/ui/model/Model.java

@@ -70,8 +70,8 @@ public class Model {
 		setEdgesOnCanvas(new ArrayList<CpsEdge>());
 		setCategoryListeners(new LinkedList<CategoryListener>());
 		setObjectListeners(new LinkedList<ObjectListener>());
-		setCgIdx(new HashMap<>());
-		setCvsObjIdx(new HashMap<>());
+		setCgIdx(new HashMap<String,Integer>());
+		setCvsObjIdx(new HashMap<Integer,Integer>());
 
 
 	}