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/CpsNode.java

@@ -2,7 +2,7 @@ package classes;
 
 import ui.model.idCounter;
 
-public class CpsNode extends CpsObject{
+public class CpsNode extends CpsObject {
 
 	public CpsNode(String objName) {
 		super(objName);

src/ui/model/Model.java

@@ -169,8 +169,8 @@ public class Model {
 		return SCALE_DIV2;
 	}
 	
-	public void setScale(int s){
-		SCALE = s;
+	public void setScale(int scale){
+		SCALE = scale;
 		SCALE_DIV2 = SCALE/2;
 	}