Changeset 10718
- Timestamp:
- May 1, 2011, 12:54:17 PM (13 years ago)
- Location:
- extensions/jiwigo/trunk/src/main
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
extensions/jiwigo/trunk/src/main/java/fr/mael/jiwigo/ui/mainframe/CategoriesTree.java
r10715 r10718 273 273 setUpUi(); 274 274 } else if (arg0.getSource().equals(menuDelete)) { 275 try { 276 if (SpringUtils.getCategoryService().delete(selectedCategory)) { 277 setUpUi(); 278 } else { 275 int response = JOptionPane.showConfirmDialog(null, Messages.getMessage("categories_confirmationDelete"), 276 Messages.getMessage("confirmation"), JOptionPane.YES_NO_OPTION); 277 if (response == 0) { 278 try { 279 if (SpringUtils.getCategoryService().delete(selectedCategory)) { 280 setUpUi(); 281 } else { 282 JOptionPane.showMessageDialog(null, Messages.getMessage("deletingCategoryError"), 283 Messages.getMessage("error"), JOptionPane.ERROR_MESSAGE); 284 } 285 } catch (Exception e) { 286 LOG.error(Tools.getStackTrace(e)); 279 287 JOptionPane.showMessageDialog(null, Messages.getMessage("deletingCategoryError"), 280 288 Messages.getMessage("error"), JOptionPane.ERROR_MESSAGE); 281 289 } 282 } catch (Exception e) {283 LOG.error(Tools.getStackTrace(e));284 JOptionPane.showMessageDialog(null, Messages.getMessage("deletingCategoryError"),285 Messages.getMessage("error"), JOptionPane.ERROR_MESSAGE);286 290 } 287 291 } -
extensions/jiwigo/trunk/src/main/java/fr/mael/jiwigo/ui/mainframe/ThumbnailPanel.java
r10717 r10718 247 247 248 248 } else if (arg0.getSource().equals(menuDeleteImage)) { 249 try { 250 if (SpringUtils.getImageService().delete(image)) { 251 parent.refresh(); 252 } else { 249 int response = JOptionPane.showConfirmDialog(null, 250 Messages.getMessage("thumbviewer_deleteImageConfirmation"), Messages.getMessage("confirmation"), 251 JOptionPane.YES_NO_OPTION); 252 if (response == 0) { 253 try { 254 if (SpringUtils.getImageService().delete(image)) { 255 parent.refresh(); 256 } else { 257 JOptionPane.showMessageDialog(this, Messages.getMessage("deletingImageError"), 258 Messages.getMessage("error"), JOptionPane.ERROR_MESSAGE); 259 } 260 } catch (JiwigoException e) { 261 LOG.error(Tools.getStackTrace(e)); 253 262 JOptionPane.showMessageDialog(this, Messages.getMessage("deletingImageError"), 254 263 Messages.getMessage("error"), JOptionPane.ERROR_MESSAGE); 255 264 } 256 } catch (JiwigoException e) {257 LOG.error(Tools.getStackTrace(e));258 JOptionPane.showMessageDialog(this, Messages.getMessage("deletingImageError"),259 Messages.getMessage("error"), JOptionPane.ERROR_MESSAGE);260 265 } 261 266 } -
extensions/jiwigo/trunk/src/main/resources/fr/mael/jiwigo/trad/messages.properties
r10717 r10718 13 13 info=Info 14 14 file=File 15 confirmation=Confirmation 15 16 16 17 ##################################################### … … 49 50 thumbviewer_selectTag=Select tags : 50 51 thumbviewer_deleteImage=Delete image 52 thumbviewer_deleteImageConfirmation=Are you sure you want to delete this image ? 51 53 52 54 ##################################################### … … 87 89 categories_enterName=Fill the category name 88 90 categories_delete=Delete 91 categories_confirmationDelete=Are you sure you want to delete this category ? 89 92 90 93 -
extensions/jiwigo/trunk/src/main/resources/fr/mael/jiwigo/trad/messages_en.properties
r10717 r10718 13 13 info=Info 14 14 file=File 15 confirmation=Confirmation 15 16 16 17 ##################################################### … … 49 50 thumbviewer_selectTag=Select tags : 50 51 thumbviewer_deleteImage=Delete image 52 thumbviewer_deleteImageConfirmation=Are you sure you want to delete this image ? 51 53 52 54 ##################################################### … … 87 89 categories_enterName=Fill the category name 88 90 categories_delete=Delete 91 categories_confirmationDelete=Are you sure you want to delete this category ? 89 92 90 93 -
extensions/jiwigo/trunk/src/main/resources/fr/mael/jiwigo/trad/messages_fr.properties
r10717 r10718 13 13 info=Info 14 14 file=Fichier 15 confirmation=Confirmation 15 16 16 17 ##################################################### … … 49 50 thumbviewer_selectTag=Veuillez sélectionner un (des) tag(s) : 50 51 thumbviewer_deleteImage=Supprimer l'image 52 thumbviewer_deleteImageConfirmation=Êtes-vous sûr de vouloir supprimer cette image ? 51 53 52 54 ##################################################### … … 87 89 categories_enterName=Entrez le nom de la catégorie 88 90 categories_delete=Supprimer 91 categories_confirmationDelete=Êtes-vous sûr de vouloir supprimer cette catégorie ? 89 92 90 93
Note: See TracChangeset
for help on using the changeset viewer.