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

Conflicts:
	src/ui/view/MyCanvas.java

src/classes/CpsNode.java

@@ -0,0 +1,11 @@
+package classes;
+
+public class CpsNode extends CpsObject{
+
+	public CpsNode(String objName) {
+		super(objName);
+		this.setImage("/Images/node.png");
+		this.setID(-1);
+	}
+
+}

src/classes/Edge.java

@@ -0,0 +1,64 @@
+package classes;
+
+public class Edge {
+
+	final float maxCapacity;
+	float curCapacity;
+	
+	CpsObject A;
+	CpsObject B;
+	
+
+	
+	
+
+
+
+
+	Edge(CpsObject A, CpsObject B, float maxCapacity){
+		setA(A);
+		setB(B);
+		this.maxCapacity = maxCapacity;
+	}
+	
+	
+	/**
+	 * @return the capacity
+	 */
+	public float getCapacity() {
+		return maxCapacity;
+	}
+
+
+	/**
+	 * @return the a
+	 */
+	public CpsObject getA() {
+		return A;
+	}
+
+
+	/**
+	 * @param a the a to set
+	 */
+	public void setA(CpsObject a) {
+		A = a;
+	}
+
+
+	/**
+	 * @return the b
+	 */
+	public CpsObject getB() {
+		return B;
+	}
+
+
+	/**
+	 * @param b the b to set
+	 */
+	public void setB(CpsObject b) {
+		B = b;
+	}
+
+}

src/classes/HolonElement.java

@@ -25,12 +25,12 @@ public class HolonElement {
 		setSign(energy);
 	}
 	
-	public HolonElement(HolonElement h) {
-		setEleName(h.getEleName());
-		setAmount(h.getAmount());
-		setEnergy(h.getEnergy());
-		setActive(h.getActive());
-		setSign(h.getEnergy());
+	public HolonElement(HolonElement element) {
+		setEleName(element.getEleName());
+		setAmount(element.getAmount());
+		setEnergy(element.getEnergy());
+		setActive(element.getActive());
+		setSign(element.getEnergy());
 	}
 
 	/**

src/ui/view/MyCanvas.java

@@ -21,6 +21,7 @@ import javax.swing.JPanel;
 import javax.swing.JPopupMenu;
 import javax.swing.JToolTip;
 
+import classes.CpsNode;
 import classes.CpsObject;
 import classes.HolonElement;
 import classes.HolonObject;
@@ -90,7 +91,6 @@ class MyCanvas extends JPanel implements MouseListener, MouseMotionListener {
 			g2.setColor(Color.GREEN);
 			g2.fillRect((int) selectRect.getX(), (int) selectRect.getY(), (int) selectRect.getWidth(),
 					(int) selectRect.getHeight());
-
 		}
 
 		// drawEdges
@@ -106,6 +106,7 @@ 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());
 			}
 		}
 
@@ -170,9 +171,12 @@ 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);
@@ -292,11 +296,13 @@ class MyCanvas extends JPanel implements MouseListener, MouseMotionListener {
 	 * Draws or Deletes an Edge
 	 */
 	private void drawDeleteEdge() {
+		boolean node = true;
+		CpsNode n = null;
 		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) {
-
+			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);
 					tempCps.AddConnection(cps);
@@ -306,6 +312,14 @@ class MyCanvas extends JPanel implements MouseListener, MouseMotionListener {
 				}
 			}
 		}
+		if(node){			
+			n = new CpsNode("Node");
+			n.setPosition(x-model.getScaleDiv2(),y-model.getScaleDiv2());
+			controller.addObjectCanvas(n);
+			n.AddConnection(tempCps);
+			tempCps.AddConnection(n);
+			System.out.println("node ID: "+n.getID());
+		}
 	}
 
 	/**