Edges

src/classes/CpsEdge.java

@@ -3,7 +3,7 @@ package classes;
 public class CpsEdge {
 
 	float maxCapacity;
-	float curCapacity;
+	float flow;
 	
 	CpsObject A;
 	CpsObject B;
@@ -25,10 +25,24 @@ public class CpsEdge {
 	/**
 	 * @param cap the Capacity to set
 	 */
-	public void setA(float cap) {
+	public void setCapacity(float cap) {
 		this.maxCapacity = cap;
 	}
 
+	/**
+	 * @return the flow
+	 */
+	public float getFlow() {
+		return flow;
+	}
+
+	/**
+	 * @param flow the flow to set
+	 */
+	public void setFlow(float flow) {
+		this.flow = flow;
+	}
+	
 	/**
 	 * @return the a
 	 */

src/ui/view/MyCanvas.java

@@ -22,18 +22,13 @@ import javax.swing.JPanel;
 import javax.swing.JPopupMenu;
 import javax.swing.JToolTip;
 
-<<<<<<< HEAD
-import com.sun.javafx.geom.Edge;
-
 import classes.CpsEdge;
-=======
->>>>>>> branch 'Ohne_Drag_and_Drop' of https://git.tk.informatik.tu-darmstadt.de/carlos.garcia/praktikum-holons.git
 import classes.CpsNode;
 import classes.CpsObject;
 import classes.HolonElement;
 import classes.HolonObject;
 import classes.HolonSwitch;
-import classes.HolonTransformer;
+import javafx.util.Pair;
 import ui.controller.Control;
 import ui.model.*;
 
@@ -114,7 +109,7 @@ class MyCanvas extends JPanel implements MouseListener, MouseMotionListener {
 					g2.drawLine(cps.getPosition().x + controller.getScaleDiv2(),
 							cps.getPosition().y + controller.getScaleDiv2(),
 							con.getKey().getPosition().x + controller.getScaleDiv2(),
-							con.getKey().getPosition().y + controller.getScaleDiv2());
+							con.getKey().getPosition().y + controller.getScaleDiv2());
 			}
 		}
 
@@ -177,9 +172,9 @@ class MyCanvas extends JPanel implements MouseListener, MouseMotionListener {
 			if (x - controller.getScale() <= cx && y - controller.getScale() <= cy && x >= cx && y >= cy) {
 				tempCps = cps;
 				// If drawing an Edge (CTRL down)
-				if (e.isControlDown()) {
-					drawEdge = true;
-					drawEdge = true;
+				if (e.isControlDown()) {
+					drawEdge = true;
+					drawEdge = true;
 				}
 				if (tempCps.getClass() == HolonObject.class) {
 					HolonObject tempObj = ((HolonObject) tempCps);
@@ -304,40 +299,41 @@ class MyCanvas extends JPanel implements MouseListener, MouseMotionListener {
 		CpsEdge e;
 		CpsNode n = null;
 		Pair<CpsObject, CpsEdge> tempPair = null;
-		Pair<CpsObject, CpsEdge>  cpsPair = null;
-		
-		for (Pair<CpsObject, CpsEdge> p: tempCps.getConnections()) {
-			if(p.getKey() == tempCps){
+		Pair<CpsObject, CpsEdge> cpsPair = null;
+
+		for (Pair<CpsObject, CpsEdge> p : tempCps.getConnections()) {
+			if (p.getKey() == tempCps) {
 				cpsPair = p;
 			}
 		}
-		
+
 		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) {
 				node = false;
-				for (Pair<CpsObject, CpsEdge> p: tempCps.getConnections()) {
-					if(p.getKey() == cps){
-						System.out.println("remove");
-						for (Pair<CpsObject, CpsEdge> pp: tempCps.getConnections()) {
-							if(p.getKey() == tempCps){
-								cpsPair = p;
-								cps.getConnectedTo().remove(tempPair);
-								tempCps.getConnectedTo().remove(cpsPair);
+				for (Pair<CpsObject, CpsEdge> p : tempCps.getConnections()) {
+					if (p.getKey() == cps) {
+						newEdge = false;
+						cpsPair = p;
+						for (Pair<CpsObject, CpsEdge> pp : cps.getConnections()) {
+							if (pp.getKey() == tempCps) {
+								tempPair = pp;
 							}
 						}
 					}
 				}
+				tempCps.getConnections().remove(cpsPair);
+				cps.getConnections().remove(tempPair);
 				if (newEdge) {
 					e = new CpsEdge(cps, tempCps);
 					tempPair = new Pair<CpsObject, CpsEdge>(tempCps, e);
 					cpsPair = new Pair<CpsObject, CpsEdge>(cps, e);
-					
+
 					cps.AddConnection(tempPair);
 					tempCps.AddConnection(cpsPair);
-					
+
 				}
 			}
 		}
@@ -345,11 +341,11 @@ class MyCanvas extends JPanel implements MouseListener, MouseMotionListener {
 			n = new CpsNode("Node");
 			n.setPosition(x - model.getScaleDiv2(), y - model.getScaleDiv2());
 			controller.addObjectCanvas(n);
-			
+
 			e = new CpsEdge(n, tempCps);
 			tempPair = new Pair<CpsObject, CpsEdge>(tempCps, e);
 			cpsPair = new Pair<CpsObject, CpsEdge>(n, e);
-			
+
 			n.AddConnection(tempPair);
 			tempCps.AddConnection(cpsPair);
 			System.out.println("node ID: " + n.getID());