Changeset 10718

Timestamp:

May 1, 2011, 12:54:17 PM (13 years ago)

Author:

mlg

Message:

Adds confirmation messages for images and categories deletion.

Location:

extensions/jiwigo/trunk/src/main

Files:

• java/fr/mael/jiwigo/ui/mainframe/CategoriesTree.java (modified) (1 diff)
• java/fr/mael/jiwigo/ui/mainframe/ThumbnailPanel.java (modified) (1 diff)
• resources/fr/mael/jiwigo/trad/messages.properties (modified) (3 diffs)
• resources/fr/mael/jiwigo/trad/messages_en.properties (modified) (3 diffs)
• resources/fr/mael/jiwigo/trad/messages_fr.properties (modified) (3 diffs)

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

@@ -273 +273 @@
             setUpUi();
         } else if (arg0.getSource().equals(menuDelete)) {
-            try {
-                if (SpringUtils.getCategoryService().delete(selectedCategory)) {
-                    setUpUi();
-                } else {
+            int response = JOptionPane.showConfirmDialog(null, Messages.getMessage("categories_confirmationDelete"),
+                    Messages.getMessage("confirmation"), JOptionPane.YES_NO_OPTION);
+            if (response == 0) {
+                try {
+                    if (SpringUtils.getCategoryService().delete(selectedCategory)) {
+                        setUpUi();
+                    } else {
+                        JOptionPane.showMessageDialog(null, Messages.getMessage("deletingCategoryError"),
+                                Messages.getMessage("error"), JOptionPane.ERROR_MESSAGE);
+                    }
+                } catch (Exception e) {
+                    LOG.error(Tools.getStackTrace(e));
                     JOptionPane.showMessageDialog(null, Messages.getMessage("deletingCategoryError"),
                             Messages.getMessage("error"), JOptionPane.ERROR_MESSAGE);
                 }
-            } catch (Exception e) {
-                LOG.error(Tools.getStackTrace(e));
-                JOptionPane.showMessageDialog(null, Messages.getMessage("deletingCategoryError"),
-                        Messages.getMessage("error"), JOptionPane.ERROR_MESSAGE);
             }
         }

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

@@ -247 +247 @@
 
         } else if (arg0.getSource().equals(menuDeleteImage)) {
-            try {
-                if (SpringUtils.getImageService().delete(image)) {
-                    parent.refresh();
-                } else {
+            int response = JOptionPane.showConfirmDialog(null,
+                    Messages.getMessage("thumbviewer_deleteImageConfirmation"), Messages.getMessage("confirmation"),
+                    JOptionPane.YES_NO_OPTION);
+            if (response == 0) {
+                try {
+                    if (SpringUtils.getImageService().delete(image)) {
+                        parent.refresh();
+                    } else {
+                        JOptionPane.showMessageDialog(this, Messages.getMessage("deletingImageError"),
+                                Messages.getMessage("error"), JOptionPane.ERROR_MESSAGE);
+                    }
+                } catch (JiwigoException e) {
+                    LOG.error(Tools.getStackTrace(e));
                     JOptionPane.showMessageDialog(this, Messages.getMessage("deletingImageError"),
                             Messages.getMessage("error"), JOptionPane.ERROR_MESSAGE);
                 }
-            } catch (JiwigoException e) {
-                LOG.error(Tools.getStackTrace(e));
-                JOptionPane.showMessageDialog(this, Messages.getMessage("deletingImageError"),
-                        Messages.getMessage("error"), JOptionPane.ERROR_MESSAGE);
             }
         }

extensions/jiwigo/trunk/src/main/resources/fr/mael/jiwigo/trad/messages.properties

@@ -13 +13 @@
 info=Info
 file=File
+confirmation=Confirmation
 
 #####################################################
@@ -49 +50 @@
 thumbviewer_selectTag=Select tags :
 thumbviewer_deleteImage=Delete image
+thumbviewer_deleteImageConfirmation=Are you sure you want to delete this image ?
 
 #####################################################
@@ -87 +89 @@
 categories_enterName=Fill the category name
 categories_delete=Delete
+categories_confirmationDelete=Are you sure you want to delete this category ?
 
 

extensions/jiwigo/trunk/src/main/resources/fr/mael/jiwigo/trad/messages_en.properties

@@ -13 +13 @@
 info=Info
 file=File
+confirmation=Confirmation
 
 #####################################################
@@ -49 +50 @@
 thumbviewer_selectTag=Select tags :
 thumbviewer_deleteImage=Delete image
+thumbviewer_deleteImageConfirmation=Are you sure you want to delete this image ?
 
 #####################################################
@@ -87 +89 @@
 categories_enterName=Fill the category name
 categories_delete=Delete
+categories_confirmationDelete=Are you sure you want to delete this category ?
 
 

extensions/jiwigo/trunk/src/main/resources/fr/mael/jiwigo/trad/messages_fr.properties

@@ -13 +13 @@
 info=Info
 file=Fichier
+confirmation=Confirmation
 
 #####################################################
@@ -49 +50 @@
 thumbviewer_selectTag=Veuillez sélectionner un (des) tag(s) :
 thumbviewer_deleteImage=Supprimer l'image
+thumbviewer_deleteImageConfirmation=Êtes-vous sûr de vouloir supprimer cette image ?
 
 #####################################################
@@ -87 +89 @@
 categories_enterName=Entrez le nom de la catégorie
 categories_delete=Supprimer
+categories_confirmationDelete=Êtes-vous sûr de vouloir supprimer cette catégorie ?