Checkstyled stuff

src/classes/AbstractCpsObject.java

@@ -2,7 +2,7 @@ package classes;
 
 import java.awt.Color;
 import java.util.ArrayList;
-import ui.model.idCounter;
+import ui.model.IdCounter;
 
 /**
  * The abstract class "CpsObject" represents any possible object in the system
@@ -62,7 +62,7 @@ public abstract class AbstractCpsObject {
 		setName(obj.getObjName());
 		setConnections(new ArrayList<CpsEdge>());
 		setPosition(new Position());
-		setID(idCounter.nextId());
+		setID(IdCounter.nextId());
 		setImage(obj.getImage());
 	}
 

src/classes/CpsNode.java

@@ -2,7 +2,7 @@ package classes;
 
 import java.util.ArrayList;
 
-import ui.model.idCounter;
+import ui.model.IdCounter;
 
 /**
  * The class "CpsNode" represents empty Objects in the system. They are just
@@ -24,6 +24,6 @@ public class CpsNode extends AbstractCpsObject {
 		this.setConnections(new ArrayList<CpsEdge>());
 		this.setImage("/Images/node.png");
 		this.setSav("CVS");
-		this.setID(idCounter.nextId());
+		this.setID(IdCounter.nextId());
 	}
 }

src/classes/HolonElement.java

@@ -2,7 +2,7 @@ package classes;
 
 import java.awt.Point;
 import java.util.LinkedList;
-import ui.model.idCounterElem;
+import ui.model.IdCounterElem;
 
 /**
  * The class "HolonElement" represents any possible element that can be added to
@@ -59,7 +59,7 @@ public class HolonElement {
 		setActive(true);
 		setSign(energy);
 		setEnergyAt(energy);
-		setId(idCounterElem.nextId());
+		setId(IdCounterElem.nextId());
 	}
 
 	/**
@@ -77,7 +77,7 @@ public class HolonElement {
 		setEnergyAt(element.getEnergy());
 		setSav("CVS");
 		setObj(element.getObj());
-		setId(idCounterElem.nextId());
+		setId(IdCounterElem.nextId());
 	}
 
 	/**

src/tests/praktikumHolonsTestAutoSaveController.java

@@ -11,7 +11,7 @@ import ui.controller.MultiPurposeController;
 import ui.controller.ObjectController;
 import ui.controller.StoreController;
 import ui.model.Model;
-import ui.model.idCounter;
+import ui.model.IdCounter;
 
 public class praktikumHolonsTestAutoSaveController {
 	protected praktikumHolonsAdapter adapter;
@@ -22,7 +22,7 @@ public class praktikumHolonsTestAutoSaveController {
 	protected ObjectController obj;
 	protected StoreController storeController;
 	protected LoadController loadController;
-	protected idCounter id;
+	protected IdCounter id;
 	protected String path = System.getProperty("user.home") + "/HolonGUI/Test/";
 
 	/**

src/tests/praktikumHolonsTestCanvasController.java

@@ -9,7 +9,7 @@ import ui.controller.CanvasController;
 import ui.controller.CategoryController;
 import ui.controller.MultiPurposeController;
 import ui.model.Model;
-import ui.model.idCounter;
+import ui.model.IdCounter;
 
 import org.junit.Test;
 import org.junit.Before;
@@ -33,7 +33,7 @@ public class praktikumHolonsTestCanvasController {
 		mp = new MultiPurposeController(model);
 		cg = new CategoryController(model, mp);
 		controller = new CanvasController(model, mp);
-		idCounter.setCounter(1);
+		IdCounter.setCounter(1);
 	}
 
 	/**

src/tests/praktikumHolonsTestLoadAndStoreController.java

@@ -35,7 +35,7 @@ import ui.controller.MultiPurposeController;
 import ui.controller.ObjectController;
 import ui.controller.StoreController;
 import ui.model.Model;
-import ui.model.idCounter;
+import ui.model.IdCounter;
 import ui.view.UnitGraph;
 
 public class praktikumHolonsTestLoadAndStoreController {
@@ -48,7 +48,7 @@ public class praktikumHolonsTestLoadAndStoreController {
 	protected ObjectController obj;
 	protected StoreController storeController;
 	protected LoadController loadController;
-	protected idCounter id;
+	protected IdCounter id;
 	protected String path = System.getProperty("user.home") + "/HolonGUI/Test/";
 
 	/**

src/ui/controller/LoadController.java

@@ -22,7 +22,7 @@ import classes.HolonObject;
 import classes.HolonSwitch;
 import classes.HolonTransformer;
 import ui.model.Model;
-import ui.model.idCounter;
+import ui.model.IdCounter;
 
 public class LoadController {
 
@@ -83,7 +83,7 @@ public class LoadController {
 			if (key.equals("CG"))
 				readCategory((JSONArray) json.get(key));
 			else if (key.equals("ID"))
-				idCounter.setCounter(Integer.parseInt(json.get(key.toString()).toString()));
+				IdCounter.setCounter(Integer.parseInt(json.get(key.toString()).toString()));
 			else if (key.toString().contains("CGO") || key.toString().contains("CVSO"))
 				obj.add(key.toString());
 			else if (key.toString().contains("CGE") || key.toString().contains("CVSE"))

src/ui/controller/StoreController.java

@@ -16,7 +16,7 @@ import classes.HolonObject;
 import classes.HolonSwitch;
 import classes.HolonTransformer;
 import ui.model.Model;
-import ui.model.idCounter;
+import ui.model.IdCounter;
 
 public class StoreController {
 
@@ -38,7 +38,7 @@ public class StoreController {
 		JSONObject json = new JSONObject();
 
 		json.put("MODE", "ALL");
-		json.put("ID", idCounter.getCounter());
+		json.put("ID", IdCounter.getCounter());
 		writeCategory(json);
 		writeCategoryObjects(json);
 		writeCanvasObjects(json);
@@ -60,7 +60,7 @@ public class StoreController {
 		JSONObject json = new JSONObject();
 		
 		json.put("MODE", "CANVAS");
-		json.put("ID", idCounter.getCounter());
+		json.put("ID", IdCounter.getCounter());
 		writeCanvasObjects(json);
 		writeCanvasElements(json);
 		writeEdges(json);

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

@@ -1,14 +1,25 @@
 package ui.model;
 
-public class idCounter {
+/**
+ * ID-Counter for all Cps Objects.
+ * 
+ * @author Gruppe14
+ */
+public class IdCounter {
 	private static int counter = 1;
 
+	/**
+	 * Return the next ID and increment the ID counter by 1.
+	 * @return the next ID
+	 */
 	public static synchronized int nextId() {
 		return counter++;
 
 	}
 
 	/**
+	 * Return the Counter.
+	 * 
 	 * @return the counter
 	 */
 	public static int getCounter() {
@@ -16,13 +27,18 @@ public class idCounter {
 	}
 
 	/**
+	 * Set the Counter.
+	 * 
 	 * @param counter
 	 *            the counter to set
 	 */
 	public static void setCounter(int counter) {
-		idCounter.counter = counter;
+		IdCounter.counter = counter;
 	}
 
+	/**
+	 * Reset the Counter.
+	 */
 	public static void resetCounter() {
 		counter = 1;
 	}

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

@@ -1,14 +1,26 @@
 package ui.model;
 
-public class idCounterElem {
+/**
+ * ID-Counter for all Holon Elements.
+ * 
+ * @author Gruppe14
+ */
+public class IdCounterElem {
 	private static int counter = 1;
 
+	/**
+	 * Return the next ID and increment the ID counter by 1.
+	 * 
+	 * @return the next ID
+	 */
 	public static synchronized int nextId() {
 		return counter++;
 
 	}
 
 	/**
+	 * Return the Counter.
+	 * 
 	 * @return the counter
 	 */
 	public static int getCounter() {
@@ -16,13 +28,18 @@ public class idCounterElem {
 	}
 
 	/**
+	 * Set the Counter.
+	 * 
 	 * @param counter
 	 *            the counter to set
 	 */
 	public static void setCounter(int counter) {
-		idCounterElem.counter = counter;
+		IdCounterElem.counter = counter;
 	}
 
+	/**
+	 * Reset the Counter.
+	 */
 	public static void resetCounter() {
 		counter = 1;
 	}

src/ui/view/GUI.java

@@ -70,8 +70,8 @@ import classes.HolonSwitch;
 import classes.HolonTransformer;
 import ui.controller.Control;
 import ui.model.Model;
-import ui.model.idCounter;
-import ui.model.idCounterElem;;
+import ui.model.IdCounter;
+import ui.model.IdCounterElem;;
 
 public class GUI<E> implements CategoryListener {
 
@@ -1339,8 +1339,8 @@ public class GUI<E> implements CategoryListener {
 				canvas.tempCps = null;
 				canvas.objectSelectionHighlighting();
 				canvas.repaint();
-				idCounter.resetCounter();
-				idCounterElem.resetCounter();
+				IdCounter.resetCounter();
+				IdCounterElem.resetCounter();
 			}
 		});