Changeset 6962 for extensions/jiwigo/trunk/src/main/java/fr/mael/jiwigo/ui/mainframe/CategoriesTree.java

Timestamp:

Sep 19, 2010, 3:19:40 PM (14 years ago)

Author:

mlg

Message:

"Feature" :
Until now, it was not possible to create a "root" category. It is now possible.

File:

• extensions/jiwigo/trunk/src/main/java/fr/mael/jiwigo/ui/mainframe/CategoriesTree.java (modified) (2 diffs)

extensions/jiwigo/trunk/src/main/java/fr/mael/jiwigo/ui/mainframe/CategoriesTree.java

@@ -189 +189 @@
         tree.setSelectionRow(selRow);
         //end
-        if (selRow != -1) {
-            if (e.getButton() == 3) {
-                JPopupMenu popup = new JPopupMenu();
-                menuAjouter = new JMenuItem(Messages.getMessage("categories_add"));
-                menuAjouter.addActionListener(this);
-                popup.add(menuAjouter);
-                menuActualiser = new JMenuItem(Messages.getMessage("categories_update"));
-                menuActualiser.addActionListener(this);
-                popup.add(menuActualiser);
-                popup.show(tree, e.getX(), e.getY());
+
+        if (e.getButton() == 3) {
+            JPopupMenu popup = new JPopupMenu();
+            menuAjouter = new JMenuItem(Messages.getMessage("categories_add"));
+            menuAjouter.addActionListener(this);
+            popup.add(menuAjouter);
+            menuActualiser = new JMenuItem(Messages.getMessage("categories_update"));
+            menuActualiser.addActionListener(this);
+            popup.add(menuActualiser);
+            popup.show(tree, e.getX(), e.getY());
+            if (selRow != -1) {
                 DefaultMutableTreeNode node = (DefaultMutableTreeNode) (selPath.getLastPathComponent());
                 this.selectedCategory = (Category) node.getUserObject();
+            } else {
+                this.selectedCategory = null;
             }
         }
@@ -217 +220 @@
             String nomcategorie = JOptionPane.showInputDialog(null, Messages.getMessage("categories_enterName"),
                     Messages.getMessage("categories_add"), JOptionPane.INFORMATION_MESSAGE);
+            //if the name of the category is not empty
             if (!(nomcategorie == null) && !nomcategorie.equals("")) {
-                if (CategoryService.getInstance().creer(nomcategorie, selectedCategory.getIdentifiant())) {
-                    setUpUi();
+                //if there is a parent category
+                if (selectedCategory != null) {
+                    //try to create a category
+                    if (CategoryService.getInstance().creer(nomcategorie, selectedCategory.getIdentifiant())) {
+                        setUpUi();
+                    } else {
+                        JOptionPane.showMessageDialog(null, Messages.getMessage("categoryCreationError"), Messages
+                                .getMessage("error"), JOptionPane.ERROR_MESSAGE);
+
+                    }
                 } else {
-                    JOptionPane.showMessageDialog(null, Messages.getMessage("categoryCreationError"), Messages
-                            .getMessage("error"), JOptionPane.ERROR_MESSAGE);
-
+                    if (CategoryService.getInstance().creer(nomcategorie)) {
+                        setUpUi();
+                    } else {
+                        JOptionPane.showMessageDialog(null, Messages.getMessage("categoryCreationError"), Messages
+                                .getMessage("error"), JOptionPane.ERROR_MESSAGE);
+
+                    }
                 }
             }