repair

src/tests/praktikumHolonsAdapter.java

@@ -6,7 +6,7 @@ import java.util.Iterator;
 import static java.lang.Math.*;
 
 import classes.Category;
-import classes.CpsObject;
+import classes.AbstractCpsObject;
 import classes.HolonElement;
 import classes.HolonObject;
 
@@ -32,7 +32,7 @@ public class praktikumHolonsAdapter {
 	 * Generate Sequence of Objects from A - ZZZ.
 	 * @param arr ArrayList of Categories
 	 */
-	public void generateObjects(ArrayList<CpsObject> arr) {
+	public void generateObjects(ArrayList<AbstractCpsObject> arr) {
 		for (int i = 1; i < 18279; i++) {
 			arr.add(new HolonObject(generate(i)));
 		}

src/tests/praktikumHolonsTestClasses.java

@@ -15,7 +15,7 @@ public class praktikumHolonsTestClasses {
 		Category test1 = new Category("Test1");
 		Category test2 = new Category("Test2");
 		HolonObject obj1 = new HolonObject("Test Object");
-		ArrayList<CpsObject> arr = new ArrayList<>();
+		ArrayList<AbstractCpsObject> arr = new ArrayList<>();
 
 		
 		assertTrue("Name not correct", test1.getName().equals("Test1"));

src/tests/praktikumHolonsTestLoadAndStoreController.java

@@ -15,12 +15,11 @@ import com.sun.security.auth.UnixNumericGroupPrincipal;
 
 import classes.Category;
 import classes.CpsEdge;
-<<<<<<< HEAD
+
 import classes.CpsNode;
-import classes.CpsObject;
-=======
+
 import classes.AbstractCpsObject;
->>>>>>> f49bbdc594b9971cf0d3e85ce4846d4b62bfe80a
+
 import classes.HolonElement;
 import classes.HolonObject;
 import classes.HolonSwitch;
@@ -238,15 +237,11 @@ public class praktikumHolonsTestLoadAndStoreController {
 			assertTrue("Objects on Canvas is not 0", model.getObjectsOnCanvas().size() == 0);
 			assertTrue("Canvas File was not found", new File(path + "TestCanvasBasic.json").exists());
 			loadController.readJSON(path + "TestCanvasBasic.json");
-<<<<<<< HEAD
-			assertTrue("NUmber of Objects on Canvas does not match", model.getObjectsOnCanvas().size() == 11);
-			for (CpsObject obj : model.getObjectsOnCanvas()) {
-				assertTrue("Not instance of HolonObject", obj instanceof HolonObject || obj instanceof HolonSwitch);
-=======
+
 			assertTrue("NUmber of Objects on Canvas does not match", model.getObjectsOnCanvas().size() == 10);
 			for (AbstractCpsObject obj : model.getObjectsOnCanvas()) {
 				assertTrue("Not instance of HolonObject", obj instanceof HolonObject);
->>>>>>> f49bbdc594b9971cf0d3e85ce4846d4b62bfe80a
+
 			}
 			
 			assertTrue("NUmber of Categories not match", model.getCategories().size() == 3);