Changeset 9894
- Timestamp:
- Mar 27, 2011, 1:05:29 PM (13 years ago)
- Location:
- extensions/jiwigo/trunk/src/main
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
extensions/jiwigo/trunk/src/main/java/fr/mael/jiwigo/ui/comments/CommentsDialog.java
r9431 r9894 176 176 reussite = false; 177 177 LOG.error(Tools.getStackTrace(e)); 178 } catch (Exception e) { 179 reussite = false; 180 LOG.error(Tools.getStackTrace(e)); 178 181 } 179 182 if (reussite) { -
extensions/jiwigo/trunk/src/main/java/fr/mael/jiwigo/ui/mainframe/CategoriesTree.java
r9431 r9894 244 244 } catch (ProxyAuthenticationException e) { 245 245 LOG.error(Tools.getStackTrace(e)); 246 } catch (Exception e) { 247 LOG.error(Tools.getStackTrace(e)); 246 248 } 247 249 } else { … … 258 260 } catch (ProxyAuthenticationException e) { 259 261 LOG.error(Tools.getStackTrace(e)); 262 } catch (Exception e) { 263 LOG.error(Tools.getStackTrace(e)); 260 264 } 261 265 } -
extensions/jiwigo/trunk/src/main/java/fr/mael/jiwigo/ui/mainframe/thread/ThreadPhotoSending.java
r9393 r9894 9 9 import fr.mael.jiwigo.transverse.ImagesManagement; 10 10 import fr.mael.jiwigo.transverse.enumeration.PreferencesEnum; 11 import fr.mael.jiwigo.transverse.exception.FileAlreadyExistsException; 12 import fr.mael.jiwigo.transverse.exception.WrongChunkSizeException; 11 13 import fr.mael.jiwigo.transverse.util.Messages; 12 14 import fr.mael.jiwigo.transverse.util.preferences.PreferencesManagement; … … 69 71 ImagesManagement.getInstance().getPrivacyLevel()); 70 72 MainFrame.getInstance().setMessage(files[i].getName() + " " + Messages.getMessage("sendingSuccess")); 73 } catch (FileAlreadyExistsException e) { 74 //displays a dialog if there is a FileAlreadyExistsException 75 JOptionPane.showMessageDialog(null, Messages.getMessage("fileAlreadyExistsError"), Messages 76 .getMessage("error"), JOptionPane.ERROR_MESSAGE); 77 MainFrame.getInstance().setMessage(Messages.getMessage("sendingError") + " " + files[i].getName()); 78 } catch (WrongChunkSizeException e) { 79 JOptionPane.showMessageDialog(null, Messages.getMessage("wrongChunkSizeError") + files[i].getName(), 80 Messages.getMessage("error"), JOptionPane.ERROR_MESSAGE); 81 MainFrame.getInstance().setMessage(Messages.getMessage("sendingError") + " " + files[i].getName()); 71 82 } catch (Exception e) { 72 //displays a dialog if there is an error73 83 JOptionPane.showMessageDialog(null, Messages.getMessage("sendingError") + files[i].getName(), Messages 74 84 .getMessage("error"), JOptionPane.ERROR_MESSAGE); -
extensions/jiwigo/trunk/src/main/java/fr/mael/jiwigo/ui/search/DialogChooseCategory.java
r9431 r9894 13 13 import javax.swing.JDialog; 14 14 import javax.swing.JLabel; 15 import javax.swing.JOptionPane; 15 16 16 17 import fr.mael.jiwigo.Main; … … 20 21 import fr.mael.jiwigo.transverse.ImagesManagement; 21 22 import fr.mael.jiwigo.transverse.enumeration.PreferencesEnum; 23 import fr.mael.jiwigo.transverse.exception.FileAlreadyExistsException; 22 24 import fr.mael.jiwigo.transverse.exception.ProxyAuthenticationException; 25 import fr.mael.jiwigo.transverse.exception.WrongChunkSizeException; 26 import fr.mael.jiwigo.transverse.util.Messages; 23 27 import fr.mael.jiwigo.transverse.util.Tools; 24 28 import fr.mael.jiwigo.transverse.util.preferences.PreferencesManagement; … … 159 163 if (arg0.getSource().equals(okButton)) { 160 164 Category category = (Category) comboCategories.getSelectedItem(); 165 List<File> alreadyExistingFiles = new ArrayList<File>(); 166 List<File> unExceptedFilesError = new ArrayList<File>(); 161 167 for (File file : filesToSend) { 162 168 try { … … 170 176 category.getIdentifier(), widthOriginal, heightOriginal, chunkSize, 171 177 ImagesManagement.getInstance().getPrivacyLevel()); 178 } catch (WrongChunkSizeException ex) { 179 JOptionPane.showMessageDialog(null, Messages.getMessage("wrongChunkSizeError"), Messages 180 .getMessage("error"), JOptionPane.ERROR_MESSAGE); 181 LOG.error(Tools.getStackTrace(ex)); 182 break; 183 } catch (FileAlreadyExistsException e) { 184 alreadyExistingFiles.add(file); 172 185 } catch (Exception e) { 173 e.printStackTrace(); 186 unExceptedFilesError.add(file); 187 LOG.error(Tools.getStackTrace(e)); 174 188 } 189 } 190 if (alreadyExistingFiles.size() != 0) { 191 StringBuffer list = new StringBuffer(); 192 for (File file : alreadyExistingFiles) { 193 list.append("<li>" + file.getName() + "</li>"); 194 } 195 String message = String.format(Messages.getMessage("fileAlreadyExistsError"), list); 196 JOptionPane.showMessageDialog(null, message, Messages.getMessage("error"), JOptionPane.ERROR_MESSAGE); 197 198 } 199 200 if (unExceptedFilesError.size() != 0) { 201 StringBuffer list = new StringBuffer(); 202 for (File file : unExceptedFilesError) { 203 list.append("<li>" + file.getName() + "</li>"); 204 } 205 String message = String.format(Messages.getMessage("unexpectedSendingError"), list); 206 JOptionPane.showMessageDialog(null, message, Messages.getMessage("error"), JOptionPane.ERROR_MESSAGE); 207 175 208 } 176 209 this.dispose(); -
extensions/jiwigo/trunk/src/main/resources/fr/mael/jiwigo/trad/messages.properties
r9431 r9894 68 68 connectionRefusedError=Error... Connection refused. Check proxy informations 69 69 alreadySendingError=The application is already sending files. Please wait before sending other files. 70 wrongChunkSizeError=The chunk size in the preferences menu is wrong. 71 unexpectedSendingError=<html><center>Unexpected error while sending images. The images will probably not be created.<br/>Affected images are :</center><ul>%s</ul></html> 72 fileAlreadyExistsError=<html><center>Some of the selected files exist on the server. They will not be created.<br/>Affected images are :</center><ul>%s</ul></html> 70 73 71 74 ##################################################### -
extensions/jiwigo/trunk/src/main/resources/fr/mael/jiwigo/trad/messages_en.properties
r9431 r9894 69 69 connectionRefusedError=Error... Connection refused. Check proxy informations 70 70 alreadySendingError=The application is already sending files. Please wait before sending other files. 71 wrongChunkSizeError=The chunk size in the preferences menu is wrong. 72 unexpectedSendingError=<html><center>Unexpected error while sending images. The images will probably not be created.<br/>Affected images are :</center><ul>%s</ul></html> 73 fileAlreadyExistsError=<html><center>Some of the selected files exist on the server. They will not be created.<br/>Affected images are :</center><ul>%s</ul></html> 71 74 72 75 ##################################################### -
extensions/jiwigo/trunk/src/main/resources/fr/mael/jiwigo/trad/messages_fr.properties
r9431 r9894 68 68 connectionRefusedError=Erreur... Connexion refusée. Vérifiez les paramètres proxy 69 69 alreadySendingError=Un envoi de photo est en cours. Veuillez attendre qu'il soit fini. 70 wrongChunkSizeError=La taille des "morceaux" indiquée dans les préférences n'est pas bonne. 71 unexpectedSendingError=<html><center>Erreur inattendue lors de l'envoi des images. Les images ne seront probablement pas créées.<br/>Les images concernées sont : </center><ul>%s</ul></html> 72 fileAlreadyExistsError=<html><center>Certains des fichiers envoyés existent sur le serveur. Les images ne seront pas créées.<br/>Les images concernées sont : </center><ul>%s</ul></html> 70 73 71 74 #####################################################
Note: See TracChangeset
for help on using the changeset viewer.