Browse Source

Small changes in Canvas

Edgardo Palza 8 years ago
parent
commit
4772c0181a

+ 0 - 6
bin/.gitignore

@@ -1,6 +0,0 @@
-/Images/
-/Interfaces/
-/classes/
-/exceptions/
-/tests/
-/ui/

BIN
bin/Images/Dummy_House.png


BIN
bin/Images/Thumbs.db


BIN
bin/Interfaces/CategoryListener.class


BIN
bin/Interfaces/ComparableObject.class


BIN
bin/classes/Category.class


BIN
bin/classes/CpsObject.class


BIN
bin/classes/HolonElement.class


BIN
bin/classes/HolonObject.class


BIN
bin/classes/HolonSwitch.class


BIN
bin/classes/HolonTransformer.class


BIN
bin/classes/Position.class


BIN
bin/ui/controller/CategoryController.class


BIN
bin/ui/controller/Control$command.class


BIN
bin/ui/controller/Control.class


BIN
bin/ui/controller/ObjectControl.class


BIN
bin/ui/model/IdCounter.class


BIN
bin/ui/model/tests.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


BIN
bin/ui/view/Main$1.class


BIN
bin/ui/view/Main.class


BIN
bin/ui/view/RealPopUp.class


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

@@ -87,8 +87,8 @@ public class GUI implements CategoryListener {
 	private final JComboBox comboBox = new JComboBox();
 
 	// Buttons
-	private final JButton btnAdd = new JButton("Add");
-	private final JButton btnDel = new JButton("Del");
+	private final JButton btnAdd = new JButton("+");
+	private final JButton btnDel = new JButton("-");
 
 	private final JToolBar toolBar = new JToolBar();
 
@@ -131,7 +131,7 @@ public class GUI implements CategoryListener {
 		menuBar.add(mnHelp);
 
 		// Table
-		String[] columnNames = { "Consumer", "Units", "Number" };
+		String[] columnNames = { "Gadget", "Consumption", "Quantity" };
 
 		Object[][] data = { { "TV", "20", "1" }, { "PC", "30", "2" }, { "Fridge", "40", "1" } };