Merge branch 'Ohne_Drag_and_Drop' of https://git.tk.informatik.tu-darmstadt.de/carlos.garcia/praktikum-holons.git into Ohne_Drag_and_Drop

src/classes/AbstractCpsObject.java

@@ -2,7 +2,6 @@ package classes;
 
 import java.awt.Color;
 import java.util.ArrayList;
-import ui.model.IdCounter;
 
 /**
  * The abstract class "CpsObject" represents any possible object in the system

src/classes/CpsNode.java

@@ -2,8 +2,6 @@ package classes;
 
 import java.util.ArrayList;
 
-import ui.model.IdCounter;
-
 /**
  * The class "CpsNode" represents empty Objects in the system. They are just
  * nodes between Objects

src/classes/HolonElement.java

@@ -2,7 +2,6 @@ package classes;
 
 import java.awt.Point;
 import java.util.LinkedList;
-import ui.model.IdCounterElem;
 
 /**
  * The class "HolonElement" represents any possible element that can be added to

src/ui/model/IdCounter.java → src/classes/IdCounter.java

@@ -1,4 +1,4 @@
-package ui.model;
+package classes;
 
 /**
  * ID-Counter for all Cps Objects.

src/ui/model/IdCounterElem.java → src/classes/IdCounterElem.java

@@ -1,4 +1,4 @@
-package ui.model;
+package classes;
 
 /**
  * ID-Counter for all Holon Elements.

src/tests/PraktikumHolonsTestAutoSaveControlle.java

@@ -4,6 +4,7 @@ import java.io.File;
 
 import org.junit.Before;
 
+import classes.IdCounter;
 import ui.controller.CanvasController;
 import ui.controller.CategoryController;
 import ui.controller.LoadController;
@@ -11,7 +12,6 @@ import ui.controller.MultiPurposeController;
 import ui.controller.ObjectController;
 import ui.controller.StoreController;
 import ui.model.Model;
-import ui.model.IdCounter;
 
 public class PraktikumHolonsTestAutoSaveControlle {
 	protected PraktikumHolonsAdapter adapter;

src/tests/PraktikumHolonsTestCanvasController.java

@@ -4,12 +4,11 @@ import classes.AbstractCpsObject;
 import classes.CpsEdge;
 import classes.HolonObject;
 import classes.HolonSwitch;
-
+import classes.IdCounter;
 import ui.controller.CanvasController;
 import ui.controller.CategoryController;
 import ui.controller.MultiPurposeController;
 import ui.model.Model;
-import ui.model.IdCounter;
 
 import org.junit.Test;
 import org.junit.Before;

src/tests/PraktikumHolonsTestClasses.java

@@ -75,7 +75,7 @@ public class PraktikumHolonsTestClasses {
 		test3.setState(4);
 		assertTrue("Should be state 4", test3.getState() == 4);
 		assertTrue("Element not Found", test3.searchElement("Element") != null);
-		test1.setElements(new ArrayList<>());
+		test1.setElements(new ArrayList<HolonElement>());
 		assertTrue("Not Empty", !test1.checkIfPartiallySupplied(1));
 		test3.addElements(new HolonElement("Element2", 1, -10));
 

src/tests/PraktikumHolonsTestLoadAndStoreController.java

@@ -23,6 +23,7 @@ import classes.AbstractCpsObject;
 import classes.HolonElement;
 import classes.HolonObject;
 import classes.HolonSwitch;
+import classes.IdCounter;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -35,7 +36,6 @@ import ui.controller.MultiPurposeController;
 import ui.controller.ObjectController;
 import ui.controller.StoreController;
 import ui.model.Model;
-import ui.model.IdCounter;
 import ui.view.UnitGraph;
 
 public class PraktikumHolonsTestLoadAndStoreController {
@@ -107,7 +107,7 @@ public class PraktikumHolonsTestLoadAndStoreController {
 			assertTrue("Number of Categories does not match", model.getCategories().size() == i + 3);
 			assertTrue("Category was not created", mp.searchCat(adapter.generate(i)) != null);
 			for (int j = 1; j <= 10; j++) {
-				cg.addNewHolonObject(mp.searchCat(adapter.generate(i)), adapter.generate(j), new ArrayList<>(), "");
+				cg.addNewHolonObject(mp.searchCat(adapter.generate(i)), adapter.generate(j), new ArrayList<HolonElement>(), "");
 				assertTrue("Number of Objects does not match",
 						mp.searchCat(adapter.generate(i)).getObjects().size() == j);
 				assertTrue("Object was not created", mp.searchCat(adapter.generate(i)).getObjects().get(j - 1) != null);

src/ui/controller/LoadController.java

@@ -21,8 +21,8 @@ import classes.HolonElement;
 import classes.HolonObject;
 import classes.HolonSwitch;
 import classes.HolonTransformer;
+import classes.IdCounter;
 import ui.model.Model;
-import ui.model.IdCounter;
 
 public class LoadController {
 

src/ui/controller/StoreController.java

@@ -15,8 +15,8 @@ import classes.HolonElement;
 import classes.HolonObject;
 import classes.HolonSwitch;
 import classes.HolonTransformer;
+import classes.IdCounter;
 import ui.model.Model;
-import ui.model.IdCounter;
 
 public class StoreController {
 

src/ui/view/GUI.java

@@ -68,10 +68,10 @@ import classes.HolonElement;
 import classes.HolonObject;
 import classes.HolonSwitch;
 import classes.HolonTransformer;
+import classes.IdCounter;
+import classes.IdCounterElem;
 import ui.controller.Control;
-import ui.model.Model;
+import ui.model.Model;;
-import ui.model.IdCounter;
-import ui.model.IdCounterElem;;
 
 /**
  * Graphical User Interface.