new classes

src/classes/CpsNode.java

@@ -0,0 +1,10 @@
+package classes;
+
+public class CpsNode extends CpsObject{
+
+	public CpsNode(String objName) {
+		super(objName);
+		// TODO Auto-generated constructor stub
+	}
+
+}

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

@@ -170,8 +170,6 @@ class MyCanvas extends JPanel implements MouseListener, MouseMotionListener {
 				// If drawing an Edge (CTRL down)
 				if (e.isControlDown()){
 					drawEdge = true;
-					controller.deleteElementCanvas(1, "Rehab");
-					System.out.println(((HolonObject)model.getCategories().get(0).getObjects().get(0)).getElements().get(2).getAmount());
 				}
 				if (tempCps.getClass() == HolonObject.class) {
 					HolonObject tempObj = ((HolonObject) tempCps);