Browse Source

delete Element on Canvas

Teh-Hai Julian Zheng 8 years ago
parent
commit
5cb4b8e16b

+ 2 - 2
src/ui/controller/Control.java

@@ -88,8 +88,8 @@ public class Control {
 		objectController.addNewElementIntoCategoryObject(catName, objName, eleName, amount, energy);
 	}
 
-	public void deleteElement() {
-
+	public void deleteElementCanvas(String object, String element, int amount) {
+		objectController.deleteElementInCanvas(object, element, amount);
 	}
 
 	/* Global Operations*/

+ 10 - 0
src/ui/controller/ObjectController.java

@@ -28,6 +28,10 @@ public class ObjectController {
 	 */
 	public void initHolonElements() {
 		addNewElementIntoCategoryObject("Energy", "Power Plant", "Power", 1, 100);
+		addNewElementIntoCategoryObject("Energy", "Power Plant", "Zero", 2, 100);
+		addNewElementIntoCategoryObject("Energy", "Power Plant", "Rehab", 10, 100);
+		addNewElementIntoCategoryObject("Energy", "Power Plant", "The Doctor", 40, 100);
+		addNewElementIntoCategoryObject("Energy", "Power Plant", "Original", 99, 100);
 	}
 
 	/**
@@ -137,6 +141,12 @@ public class ObjectController {
 		return null;
 	}
 
+	/**
+	 * Search for Element
+	 * @param object
+	 * @param element
+	 * @return
+	 */
 	public HolonElement searchHolonElement(HolonObject object, String element) {
 
 		for (HolonElement elements : object.getElements()) {

+ 2 - 1
src/ui/view/MyCanvas.java

@@ -174,6 +174,7 @@ class MyCanvas extends JPanel implements MouseListener, MouseMotionListener {
 				// If drawing an Edge (CTRL down)
 				if (e.isControlDown()){
 					drawEdge = true;
+					controller.deleteElementCanvas("Monster", "Rehab", 1);
 				}
 				if (tempCps.getClass() == HolonObject.class) {
 					HolonObject tempObj = ((HolonObject) tempCps);
@@ -226,7 +227,7 @@ class MyCanvas extends JPanel implements MouseListener, MouseMotionListener {
 			repaint();
 		} else {
 			try {
-				//Außerhalb des Randes gedragged?
+				//Au�erhalb des Randes gedragged?
 				x = e.getX()-controller.getScaleDiv2();
 				y = e.getY()-controller.getScaleDiv2();
 				if(e.getX()<controller.getScaleDiv2())x = 0;