no message

src/ui/view/MyCanvas.java

@@ -106,7 +106,8 @@ class MyCanvas extends JPanel implements MouseListener, MouseMotionListener {
 							cps.getPosition().y + controller.getScaleDiv2(),
 							con.getPosition().x + controller.getScaleDiv2(),
 							con.getPosition().y + controller.getScaleDiv2());
-				g2.drawString("Capacity", (cps.getPosition().x+con.getPosition().x)/2+model.getScaleDiv2(), (cps.getPosition().y+con.getPosition().y)/2+model.getScaleDiv2());
+				g2.drawString("Capacity", (cps.getPosition().x + con.getPosition().x) / 2 + model.getScaleDiv2(),
+						(cps.getPosition().y + con.getPosition().y) / 2 + model.getScaleDiv2());
 			}
 		}
 
@@ -171,12 +172,9 @@ class MyCanvas extends JPanel implements MouseListener, MouseMotionListener {
 				// If drawing an Edge (CTRL down)
 				if (e.isControlDown()) {
 					drawEdge = true;
-<<<<<<< HEAD
 					controller.deleteElementCanvas(1, "Rehab");
 					System.out.println(((HolonObject) model.getCategories().get(0).getObjects().get(0)).getElements()
 							.get(2).getAmount());
-=======
->>>>>>> 2c44f8d66ebab1e191bc0b6ae7d714ae25fafc2f
 				}
 				if (tempCps.getClass() == HolonObject.class) {
 					HolonObject tempObj = ((HolonObject) tempCps);
@@ -301,7 +299,8 @@ class MyCanvas extends JPanel implements MouseListener, MouseMotionListener {
 		for (CpsObject cps : model.getObjectsOnCanvas()) {
 			cx = cps.getPosition().x;
 			cy = cps.getPosition().y;
-			if (x - controller.getScale() <= cx && y - controller.getScale() <= cy && x >= cx && y >= cy && cps != tempCps) {
+			if (x - controller.getScale() <= cx && y - controller.getScale() <= cy && x >= cx && y >= cy
+					&& cps != tempCps) {
 				node = false;
 				if (!cps.getConnectedTo().contains(tempCps)) {
 					cps.AddConnection(tempCps);
@@ -312,13 +311,13 @@ class MyCanvas extends JPanel implements MouseListener, MouseMotionListener {
 				}
 			}
 		}
-		if(node){			
+		if (node) {
 			n = new CpsNode("Node");
-			n.setPosition(x-model.getScaleDiv2(),y-model.getScaleDiv2());
+			n.setPosition(x - model.getScaleDiv2(), y - model.getScaleDiv2());
 			controller.addObjectCanvas(n);
 			n.AddConnection(tempCps);
 			tempCps.AddConnection(n);
-			System.out.println("node ID: "+n.getID());
+			System.out.println("node ID: " + n.getID());
 		}
 	}