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

src/ui/view/MyCanvas.java

@@ -111,6 +111,7 @@ class MyCanvas extends JPanel implements MouseListener, MouseMotionListener {
 		// drawEdges
 		// g2.setColor(Color.BLACK);
 		if (drawEdge) {
+			g2.setColor(Color.BLACK);
 			g2.setStroke(new BasicStroke(2));
 			g2.drawLine(tempCps.getPosition().x + controller.getScaleDiv2(),
 					tempCps.getPosition().y + controller.getScaleDiv2(), x, y);
@@ -120,7 +121,7 @@ class MyCanvas extends JPanel implements MouseListener, MouseMotionListener {
 			if (con.getA().getID() != model.getSelectedObjectID() && con.getB().getID() != model.getSelectedObjectID()
 					&& con != edgeHighlight) {
 				if (con.getFlow() <= con.getCapacity()) {
-					g2.setColor(Color.BLACK);
+					g2.setColor(Color.GREEN);
 					g2.setStroke(new BasicStroke(Math.min((con.getFlow() / con.getCapacity() * 4), 4)));
 				} else {
 					g2.setColor(Color.RED);