|
@@ -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(),
|