Browse Source

Add Switch und Add Transformer funktionieren jz

dominik.rieder 8 years ago
parent
commit
a2b71f6214
3 changed files with 10 additions and 10 deletions
  1. 4 4
      src/ui/controller/CategoryController.java
  2. 4 4
      src/ui/controller/Control.java
  3. 2 2
      src/ui/view/GUI.java

+ 4 - 4
src/ui/controller/CategoryController.java

@@ -144,9 +144,9 @@ public class CategoryController {
 	 * @param obj
 	 *            New Object Name
 	 */
-	public void addNewHolonTransformer(Category cat, String objName, String image) {
+	public void addNewHolonTransformer(Category cat, String objName) {
 		HolonTransformer transformer = new HolonTransformer(objName);
-		transformer.setImage(image);
+		transformer.setImage("/Images/transformer.png");
 		addObject(cat, transformer);
 	}
 
@@ -158,9 +158,9 @@ public class CategoryController {
 	 * @param obj
 	 *            New Object Name
 	 */
-	public void addNewHolonSwitch(Category cat, String objName, String image) {
+	public void addNewHolonSwitch(Category cat, String objName) {
 		HolonSwitch holonSwitch = new HolonSwitch(objName);
-		holonSwitch.setImage(image);
+		holonSwitch.setImage("/Images/switch-on.png");
 		addObject(cat, holonSwitch);
 	}
 

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

@@ -50,12 +50,12 @@ public class Control {
 	// categoryController.addObject(cat, object);
 	// }
 
-	public void addTransformer(Category cat, String objName, String image) {
-		categoryController.addNewHolonTransformer(cat, objName, image);
+	public void addTransformer(Category cat, String objName) {
+		categoryController.addNewHolonTransformer(cat, objName);
 	}
 
-	public void addSwitch(Category cat, String objName, String image) {
-		categoryController.addNewHolonSwitch(cat, objName, image);
+	public void addSwitch(Category cat, String objName) {
+		categoryController.addNewHolonSwitch(cat, objName);
 	}
 
 	public Category searchCategory(String name) {

+ 2 - 2
src/ui/view/GUI.java

@@ -737,11 +737,11 @@ public class GUI implements CategoryListener {
 					switch (objType) {
 
 					case "Switch":
-						controller.addSwitch(cat, objname, objType);
+						controller.addSwitch(cat, objname);
 						break;
 
 					case "Transformer":
-						controller.addTransformer(cat, objname, objType);
+						controller.addTransformer(cat, objname);
 						break;
 					}
 				}