fix again

src/api/AbstractAlgorithmSuperClass.java

@@ -1,4 +1,4 @@
-package API;
+package api;
 
 /**
  * API Algorithm Super Class.

src/api/CpsAPI.java

@@ -1,4 +1,4 @@
-package API;
+package api;
 
 import java.awt.Color;
 import java.util.ArrayList;

src/tests/PraktikumHolonsTestClasses.java

@@ -107,10 +107,6 @@ public class PraktikumHolonsTestClasses {
 		test1.setState();
 		assertTrue("Should be state 0", test1.getState() == 0);
 		test2.setState();
-<<<<<<< HEAD
-=======
-
->>>>>>> 90bc29b29bece3f981eca7b6bd629093b2c90382
 		test2.setBorderColor(color);
 		assertTrue("Color not Same", color == test2.getBorderColor());
 	}

src/tests/PraktikumHolonsTestGlobalController.java

@@ -4,8 +4,6 @@ import org.junit.Before;
 import org.junit.Test;
 import static org.junit.Assert.assertTrue;
 
-import java.util.ArrayList;
-
 import ui.controller.GlobalController;
 import ui.model.Model;
 
@@ -19,32 +17,21 @@ public class PraktikumHolonsTestGlobalController {
 	protected Model model;
 	protected GlobalController controller;
 
-<<<<<<< HEAD
-	 
-=======
 	/**
 	 * Setup.
 	 */
->>>>>>> 90bc29b29bece3f981eca7b6bd629093b2c90382
 	@Before
 	public void setUp() {
 		model = new Model();
 		controller = new GlobalController(model);
 
 	}
-<<<<<<< HEAD
-	
-	/**
-	 * Test the methods for Global attributes.
-	 */
-	@Test 
-=======
+
 
 	/**
 	 * Test for GlobalControls.
 	 */
 	@Test
->>>>>>> 90bc29b29bece3f981eca7b6bd629093b2c90382
 	public void testGlobalControls() {
 		int prevScale = controller.getScale();
 		int prevScaleDiv2 = controller.getScaleDiv2();

src/ui/controller/CanvasController.java

@@ -9,8 +9,8 @@ import classes.AbstractCpsObject;
 import classes.HolonObject;
 import classes.HolonSwitch;
 import classes.Position;
-import Interfaces.CategoryListener;
-import Interfaces.ObjectListener;
+import interfaces.CategoryListener;
+import interfaces.ObjectListener;
 import ui.model.Model;
 
 /**

src/ui/controller/CategoryController.java

@@ -8,7 +8,7 @@ import classes.HolonElement;
 import classes.HolonObject;
 import classes.HolonSwitch;
 import classes.HolonTransformer;
-import Interfaces.CategoryListener;
+import interfaces.CategoryListener;
 import ui.model.Model;
 
 /**

src/ui/controller/Control.java

@@ -2,7 +2,6 @@ package ui.controller;
 
 import java.awt.Color;
 import java.awt.Point;
-import java.awt.event.ActionListener;
 import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
@@ -13,11 +12,9 @@ import classes.CpsNode;
 import classes.AbstractCpsObject;
 import classes.HolonElement;
 import classes.HolonObject;
-import classes.Position;
-import Interfaces.CategoryListener;
+import interfaces.CategoryListener;
 import ui.model.Model;
 import ui.view.MyCanvas;
-import ui.view.TimePanel;
 
 /**
  * The Class represents the controller in the model, controller view Pattern.

src/ui/model/Model.java

@@ -9,8 +9,8 @@ import classes.Category;
 import classes.CpsEdge;
 import classes.AbstractCpsObject;
 import classes.HolonElement;
-import Interfaces.CategoryListener;
-import Interfaces.ObjectListener;
+import interfaces.CategoryListener;
+import interfaces.ObjectListener;
 import ui.view.Console;
 
 /**

src/ui/view/GUI.java

@@ -69,7 +69,7 @@ import classes.HolonSwitch;
 import classes.HolonTransformer;
 import classes.IdCounter;
 import classes.IdCounterElem;
-import Interfaces.CategoryListener;
+import interfaces.CategoryListener;
 import ui.controller.Control;
 import ui.model.Model;;