Browse Source

Small Changes GUI

Edgardo Palza 8 years ago
parent
commit
583d6c7486

BIN
bin/ui/view/GUI$2.class


BIN
bin/ui/view/GUI$3.class


BIN
bin/ui/view/GUI$4.class


BIN
bin/ui/view/GUI$5.class


BIN
bin/ui/view/GUI$6.class


BIN
bin/ui/view/GUI.class


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

@@ -145,9 +145,9 @@ public class GUI implements CategoryListener {
 		menuBar.add(mnHelp);
 
 		// Table
-		String[] columnNames = { "Gadget", "Consumption", "Quantity" };
+		String[] columnNames = { "Gadget", "+/-", "Energy", "Quantity" };
 
-		Object[][] data = { { "TV", "20", "1" }, { "PC", "30", "2" }, { "Fridge", "40", "1" } };
+		Object[][] data = {};
 
 		splitPane.setRightComponent(splitPane_1);
 		splitPane.setDividerLocation(200);
@@ -258,6 +258,10 @@ public class GUI implements CategoryListener {
 						for (int i = 0; i < model.getObjectsOnCanvas().size(); i++) {
 							CpsObject temp = model.getObjectsOnCanvas().get(i);
 							String output = "Element: " + temp.getObjName() + " with ID: " + temp.getID();
+
+							if (temp.getClass() == HolonObject.class) {
+								output = output + " and Elements: " + ((HolonObject) temp).toStringElements();
+							}
 							System.out.println(output);
 						}
 						canvas.repaint();