Teh-Hai Julian Zheng 8 tahun lalu
induk
melakukan
a4bf9bd73a
17 mengubah file dengan 8 tambahan dan 8 penghapusan
  1. TEMPAT SAMPAH
      bin/ui/controller/CategoryController.class
  2. TEMPAT SAMPAH
      bin/ui/model/Model.class
  3. TEMPAT SAMPAH
      res/Images/factory-1.png
  4. TEMPAT SAMPAH
      res/Images/factory.png
  5. TEMPAT SAMPAH
      res/Images/home-1.png
  6. TEMPAT SAMPAH
      res/Images/home-2.png
  7. TEMPAT SAMPAH
      res/Images/home.png
  8. TEMPAT SAMPAH
      res/Images/power-plant.png
  9. TEMPAT SAMPAH
      res/Images/powerplant-1.png
  10. TEMPAT SAMPAH
      res/Images/switch-1.png
  11. TEMPAT SAMPAH
      res/Images/switch-off.png
  12. TEMPAT SAMPAH
      res/Images/switch-on.png
  13. TEMPAT SAMPAH
      res/Images/transformer-1.png
  14. TEMPAT SAMPAH
      res/Images/transformer.png
  15. 4 4
      src/ui/controller/CategoryController.java
  16. 3 4
      src/ui/controller/ObjectController.java
  17. 1 0
      src/ui/model/Model.java

TEMPAT SAMPAH
bin/ui/controller/CategoryController.class


TEMPAT SAMPAH
bin/ui/model/Model.class


TEMPAT SAMPAH
res/Images/factory-1.png


TEMPAT SAMPAH
res/Images/factory.png


TEMPAT SAMPAH
res/Images/home-1.png


TEMPAT SAMPAH
res/Images/home-2.png


TEMPAT SAMPAH
res/Images/home.png


TEMPAT SAMPAH
res/Images/power-plant.png


TEMPAT SAMPAH
res/Images/powerplant-1.png


TEMPAT SAMPAH
res/Images/switch-1.png


TEMPAT SAMPAH
res/Images/switch-off.png


TEMPAT SAMPAH
res/Images/switch-on.png


TEMPAT SAMPAH
res/Images/transformer-1.png


TEMPAT SAMPAH
res/Images/transformer.png


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

@@ -36,13 +36,13 @@ public class CategoryController {
 		Category component = new Category("Component");
 
 		HolonObject powerp = new HolonObject("Power Plant");
-		powerp.setImage("/Images/Dummy_PowerPlant.png");
+		powerp.setImage("/Images/power-plant.png");
 		HolonObject house = new HolonObject("House");
-		house.setImage("/Images/Dummy_House.png");
+		house.setImage("/Images/home-2.png");
 		HolonTransformer transformer = new HolonTransformer("Transformer");
-		transformer.setImage("/Images/Dummy_Transformator.png");
+		transformer.setImage("/Images/transformer.png");
 		HolonSwitch sw = new HolonSwitch("Switch");
-		sw.setImage("/Images/Dummy_Switch.png");
+		sw.setImage("/Images/switch-on.png");
 
 		addObject(energy, powerp);
 		addObject(building, house);

+ 3 - 4
src/ui/controller/ObjectController.java

@@ -23,18 +23,17 @@ public class ObjectController {
 	public ObjectController(Model model) {
 		this.MODEL = model;
 		this.ID = iDCounter.nextId();
-		initElements();
+		initHolonElements();
 	}
 	
+	
 	/**
 	 * init default Power supply of the Power Plant
 	 */
-	public void initElements(){
+	public void initHolonElements(){
 		addNewElementIntoCategoryObject("Energy", "Power Plant", "Power", 1, 100);
 	}
 
-	
-
 	/**
 	 * Adds Element into a Object
 	 */

+ 1 - 0
src/ui/model/Model.java

@@ -34,6 +34,7 @@ public class Model {
 	 */
 	private List<CategoryListener> categoryListeners;
 	private List<ObjectListener> objectListeners;
+	
 
 	/*
 	 * Constructor for the model. It initializes the categories and