bugfixes

.gitignore

@@ -0,0 +1 @@
+/bin/

bin/.gitignore

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

src/ui/view/GUI.java

@@ -274,8 +274,6 @@ public class GUI implements CategoryListener {
 					break;
 
 				default:
-					addObjectPopUP = new AddObjectPopUp();
-					addObjectPopUP.setVisible(true);
 					addObjectAction(selectedOption, selectedNode);
 					break;
 				}
@@ -356,17 +354,24 @@ public class GUI implements CategoryListener {
 			if (selectedNode.getLevel() == 1) {
 				String objname = JOptionPane.showInputDialog("Please enter a Name for the " + objType);
 				Category cat = controller.searchCategory(selectedNode.getUserObject().toString());
-				switch (objType) {
+				if(objname.equals("show")){
+					addObjectPopUP = new AddObjectPopUp();
+					addObjectPopUP.setVisible(true);
+				}
+				
+				if(objname.length() != 0){
+					switch (objType) {
 
-				case "Object":
-					controller.addNewObject(cat, objname);
-					break;
+					case "Object":
+						controller.addNewObject(cat, objname);
+						break;
 
-				case "Switch":
-					controller.addNewSwitch(cat, objname);
+					case "Switch":
+						controller.addNewSwitch(cat, objname);
 
-				case "Transformer":
-					controller.addNewTransformer(cat, objname);
+					case "Transformer":
+						controller.addNewTransformer(cat, objname);
+					}
 				}
 			} else {
 				JOptionPane.showMessageDialog(new JFrame(),

src/ui/view/MyCanvas.java

@@ -33,7 +33,7 @@ class MyCanvas extends JPanel implements MouseListener, MouseMotionListener {
 	JPopupMenu popmenu = new JPopupMenu();
 	JMenuItem itemDelete = new JMenuItem("Delete Object");
 
-	public MyCanvas(Model model) {
+	public MyCanvas(final Model model) {
 		this.model = model;
 		popmenu.add(itemDelete);
 		itemDelete.setEnabled(false);