Browse Source

delete exeptions behoben

dominik.rieder 8 năm trước cách đây
mục cha
commit
9d10587ecf

+ 1 - 0
bin/.gitignore

@@ -1,3 +1,4 @@
+/Images/
 /Interfaces/
 /classes/
 /exceptions/

BIN
bin/Interfaces/CategoryListener.class


BIN
bin/Interfaces/ComparableObject.class


BIN
bin/Interfaces/ObjectListener.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/exceptions/newException1.class


BIN
bin/tests/Tests1.class


BIN
bin/tests/praktikumHolonsTestMinimal.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/Model.class


BIN
bin/ui/model/tests.class


BIN
bin/ui/view/AddElementPopUp.class


BIN
bin/ui/view/AddObjectPopUp.class


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


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


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


BIN
bin/ui/view/Main.class


BIN
bin/ui/view/MyCanvas.class


+ 27 - 12
src/ui/view/GUI.java

@@ -270,18 +270,33 @@ public class GUI implements CategoryListener {
 			public void actionPerformed(ActionEvent arg0) {
 
 				Object nodeInfo = tree.getLastSelectedPathComponent();
-				DefaultMutableTreeNode selectedNode = (DefaultMutableTreeNode) nodeInfo;
-				String nodeName = selectedNode.getUserObject().toString();
-				int depthOfNode = selectedNode.getLevel();
-
-				switch (depthOfNode) {
-				case 1:
-					controller.deleteCategory(nodeName);
-					break;
-				case 2:
-					DefaultMutableTreeNode parent = (DefaultMutableTreeNode) selectedNode.getParent();
-					controller.deleteObjectInCat(nodeName, parent.getUserObject().toString());
-					break;
+				if(nodeInfo != null){
+					DefaultMutableTreeNode selectedNode = (DefaultMutableTreeNode) nodeInfo;
+					String nodeName = selectedNode.getUserObject().toString();
+					int depthOfNode = selectedNode.getLevel();
+
+					switch (depthOfNode) {
+					case 1:
+						int dialogResult = JOptionPane.showConfirmDialog (null, "Do you realy want to delete the Category " + nodeName + "?","Warning", JOptionPane.YES_NO_OPTION);
+						if(dialogResult == JOptionPane.YES_OPTION){
+							controller.deleteCategory(nodeName);
+							break;
+						}
+						else{
+						break;
+						}
+					case 2:
+						DefaultMutableTreeNode parent = (DefaultMutableTreeNode) selectedNode.getParent();
+						controller.deleteObjectInCat(nodeName, parent.getUserObject().toString());
+						break;
+				
+					default :
+						JOptionPane.showMessageDialog(new JFrame(),
+							"Please select a Category or an Object in order to delete something.");
+					}
+				}else{
+					JOptionPane.showMessageDialog(new JFrame(),
+							"Please select a Category or an Object in order to delete something.");
 				}
 
 			}