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

src/classes/HolonElement.java

@@ -15,18 +15,14 @@ public class HolonElement {
 	/* Path of the image for the Obj. */
 	String image;
 	/* +: for Consumers and -: Producers */
-	String sign;
+	char sign;
 
 	public HolonElement(String eleName, float energy, int amount) {
 		setEleName(eleName);
 		setAmount(amount);
 		setEnergy(energy);
 		setActive(true);
-		if (energy < 0) {
-			setSign("-");
-		} else {
-			setSign("+");
-		}
+		setSign(energy);
 	}
 
 	/**
@@ -116,11 +112,22 @@ public class HolonElement {
 		return totalEnergy;
 	}
 
-	public void setSign(String s) {
-		this.sign = s;
+	/**
+	 * @return the sign
+	 */
+	public char getSign() {
+		return sign;
 	}
 
-	public String getSign() {
-		return sign;
+	/**
+	 * @param energy
+	 *            the sign to set
+	 */
+	public void setSign(float energy) {
+		if (energy < 0)
+			this.sign = '-';
+		else
+			this.sign = '+';
 	}
+
 }

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*/

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()) {

src/ui/view/GUI.java

@@ -188,7 +188,7 @@ public class GUI implements CategoryListener {
 
 		JScrollPane scrollPane = new JScrollPane();
 		// Table Set up
-		Object[] columnNames = { "Gadget", "Typ", "Energy", "Quantity" };
+		Object[] columnNames = { "Device", "Type", "Energy", "Quantity" };
 		tableModel.setColumnIdentifiers(columnNames);
 		table.setModel(tableModel);
 		scrollPane.setViewportView(table);

src/ui/view/MyCanvas.java

@@ -172,6 +172,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);
@@ -224,7 +225,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;