Author: kmorin Date: 2013-04-29 12:22:47 +0200 (Mon, 29 Apr 2013) New Revision: 881 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/881 Log: fixes #2000 [TECH] Mettre en place les messages d'erreur m?\195?\169tier Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiApplicationUpdaterCallBack.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config/TuttiApplicationConfig.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/config/SampleOrderIdsTableCell.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiUIUtil.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/action/TuttiActionHelper.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/AttachmentEditorUIHandler.java trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiApplicationUpdaterCallBack.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiApplicationUpdaterCallBack.java 2013-04-29 10:03:25 UTC (rev 880) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiApplicationUpdaterCallBack.java 2013-04-29 10:22:47 UTC (rev 881) @@ -438,13 +438,13 @@ service.prepare(dbDirectory, result); if (!result.isSuccess()) { - throw new TuttiTechnicalException("Could not prepare synchro", result.getError()); + throw new TuttiTechnicalException(_("tutti.applicationUpdater.synchroDB.prepare.error"), result.getError()); } service.synchronize(dbDirectory, result); if (!result.isSuccess()) { - throw new TuttiTechnicalException("Could not synchro db", result.getError()); + throw new TuttiTechnicalException(_("tutti.applicationUpdater.synchroDB.synchro.error"), result.getError()); } // reset cache @@ -463,7 +463,7 @@ try { ApplicationUpdater.storeVersionFile(target, info.newVersion); } catch (IOException e) { - throw new TuttiTechnicalException("Could not write back new db version to file " + versionFile); + throw new TuttiTechnicalException(_("tutti.applicationUpdater.synchroDB.writeVersion.error", versionFile)); } } } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java 2013-04-29 10:03:25 UTC (rev 880) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java 2013-04-29 10:22:47 UTC (rev 881) @@ -74,6 +74,8 @@ import java.util.Properties; import java.util.Set; +import static org.nuiton.i18n.I18n._; + /** * UI application context. * @@ -552,7 +554,7 @@ try { serviceContext.close(); } catch (IOException e) { - throw new TuttiTechnicalException("Could not close services", e); + throw new TuttiTechnicalException(_("tutti.context.service.close.error"), e); } dataContext.close(); @@ -770,8 +772,7 @@ String value = (String) helpMapping.get(helpId); if (value == null) { - throw new TuttiTechnicalException( - "Could not find help page for " + helpId); + throw new TuttiTechnicalException(_("tutti.context.helpPage.notFound", helpId)); } File helpDirectory = getConfig().getHelpDirectoryWithLocale(); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config/TuttiApplicationConfig.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config/TuttiApplicationConfig.java 2013-04-29 10:03:25 UTC (rev 880) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config/TuttiApplicationConfig.java 2013-04-29 10:22:47 UTC (rev 881) @@ -168,8 +168,7 @@ try { applicationConfig.save(file, false, optionKeyToNotSave); } catch (IOException e) { - throw new TuttiTechnicalException( - "Could not save configuration at " + file, e); + throw new TuttiTechnicalException(_("tutti.config.save.error", file), e); } } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/config/SampleOrderIdsTableCell.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/config/SampleOrderIdsTableCell.java 2013-04-29 10:03:25 UTC (rev 880) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/config/SampleOrderIdsTableCell.java 2013-04-29 10:22:47 UTC (rev 881) @@ -49,6 +49,8 @@ import java.util.List; import java.util.Map; +import static org.nuiton.i18n.I18n._; + /** * To edit sampling oder ids in a table cell. * @@ -158,7 +160,7 @@ for (Integer id : ids) { SampleCategoryEnum sampleCategoryEnum = mapping.get(id); if (sampleCategoryEnum == null) { - throw new TuttiTechnicalException("caracteristic with id '" + id + "' is not designed form sampling."); + throw new TuttiTechnicalException(_("tutti.sampleOrder.caracteristicNotFound", id)); } Caracteristic caracteristic = caracteristicMap.get(id); result.add(caracteristic); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiUIUtil.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiUIUtil.java 2013-04-29 10:03:25 UTC (rev 880) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiUIUtil.java 2013-04-29 10:22:47 UTC (rev 881) @@ -169,7 +169,7 @@ try { PropertyUtils.setSimpleProperty(bean, property, value); } catch (Exception e) { - throw new TuttiTechnicalException("Could not set property '" + property + "' on object of type '" + bean.getClass().getName() + "'", e); + throw new TuttiTechnicalException(_("tutti.property.set.error", property, bean.getClass().getName()), e); } } @@ -179,7 +179,7 @@ try { return PropertyUtils.getSimpleProperty(bean, property); } catch (Exception e) { - throw new TuttiTechnicalException("Could not get property '" + property + "' on object of type '" + bean.getClass().getName() + "'", e); + throw new TuttiTechnicalException(_("tutti.property.get.error", property, bean.getClass().getName()), e); } } @@ -259,7 +259,7 @@ try { openLink(url.toURI()); } catch (URISyntaxException e) { - throw new TuttiTechnicalException("Could not open link: " + url, e); + throw new TuttiTechnicalException(_("swing.error.cannot.open.link", url), e); } } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/action/TuttiActionHelper.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/action/TuttiActionHelper.java 2013-04-29 10:03:25 UTC (rev 880) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/action/TuttiActionHelper.java 2013-04-29 10:22:47 UTC (rev 881) @@ -33,6 +33,8 @@ import javax.swing.AbstractButton; import javax.swing.Action; +import static org.nuiton.i18n.I18n._; + /** * Useful method around TuttiUIAction. * @@ -102,8 +104,8 @@ TuttiUIAction<A> result = createUIAction(abstractButton, logicAction); return result; } catch (Exception e) { - throw new TuttiTechnicalException( - "Could not instanciate action " + actionName, e); + throw new TuttiTechnicalException(_("tutti.action.create.error", actionName), e); + //"Could not instanciate action " + actionName, e); } } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/AttachmentEditorUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/AttachmentEditorUIHandler.java 2013-04-29 10:03:25 UTC (rev 880) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/AttachmentEditorUIHandler.java 2013-04-29 10:22:47 UTC (rev 881) @@ -259,7 +259,7 @@ File file = persistenceService.getAttachmentFile(attachment.getId()); if (!file.exists()) { - throw new TuttiTechnicalException("File " + file.getAbsolutePath() + " does not exists."); + throw new TuttiTechnicalException(_("tutti.attachmentEditor.fileNotFound", file.getAbsolutePath())); } Desktop desktop = TuttiUIUtil.getDesktopForBrowse(); Modified: trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties =================================================================== --- trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties 2013-04-29 10:03:25 UTC (rev 880) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties 2013-04-29 10:22:47 UTC (rev 881) @@ -15,6 +15,10 @@ tutti.about.update.app.up.detail= tutti.about.update.content= tutti.about.update.title= +tutti.action.create.error= +tutti.applicationUpdater.synchroDB.prepare.error= +tutti.applicationUpdater.synchroDB.synchro.error= +tutti.applicationUpdater.synchroDB.writeVersion.error= tutti.attachmentEditor.action.add.mnemonic= tutti.attachmentEditor.action.add.tip= tutti.attachmentEditor.action.closeAttachment.tip= @@ -30,6 +34,7 @@ tutti.attachmentEditor.field.file= tutti.attachmentEditor.field.fileComment= tutti.attachmentEditor.field.fileName= +tutti.attachmentEditor.fileNotFound= tutti.attachmentEditor.none.tip= tutti.attachmentEditor.saveAttachment.button= tutti.attachmentEditor.saveAttachment.fail.message= @@ -101,7 +106,10 @@ tutti.config.option.weights.rate.difference.totalAndSorted.description= tutti.config.parse.error= tutti.config.sampleOrder.title= +tutti.config.save.error= tutti.config.title= +tutti.context.helpPage.notFound= +tutti.context.service.close.error= tutti.createAccidentalBatch.action.cancel= tutti.createAccidentalBatch.action.cancel.mnemonic= tutti.createAccidentalBatch.action.cancel.tip= @@ -1014,6 +1022,8 @@ tutti.manageTemporaryReferential.title.choose.importTemporarySpeciesFile= tutti.manageTemporaryReferential.title.choose.importTemporaryVesselFile= tutti.message.action.running= +tutti.property.get.error= +tutti.sampleOrder.caracteristicNotFound= tutti.selectBenthos.title= tutti.selectCruise.action.chooseCruiseExportFile= tutti.selectCruise.action.chooseProgramExportFile= Modified: trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties =================================================================== --- trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2013-04-29 10:03:25 UTC (rev 880) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2013-04-29 10:22:47 UTC (rev 881) @@ -13,6 +13,10 @@ tutti.about.update.app.up.detail=<tr><td>%1$s</td><td>%2$s</td><td><strong>%3$s</strong></td><td><a href\="%4$s">Mettre à jour</a><td></tr> tutti.about.update.content=<h2>Mise à jour de Tutti</h2><p>Fichier des mises à jour \: <a href\="%1$s">%1$s</a></p><br/><hr/><br/><table><CAPTION><EM>Mises à jour des modules</EM></CAPTION><tr><th>Module</th><th>Version installée</th><th>Dernière version</th><th></th></tr>%2$s</table> tutti.about.update.title=Mise à jour Tutti +tutti.action.create.error=Erreur à l'instanciation de l'action %s +tutti.applicationUpdater.synchroDB.prepare.error=Erreur lors de la préparation de la synchronisation de la base +tutti.applicationUpdater.synchroDB.synchro.error=Erreur lors de la synchronisation de la base +tutti.applicationUpdater.synchroDB.writeVersion.error=Erreur lors de l'écriture de la nouvelle version de la base de données dans le fichier %s tutti.attachmentEditor.action.add.mnemonic=A tutti.attachmentEditor.action.add.tip=Ajouter une pièce jointe tutti.attachmentEditor.action.closeAttachment.tip=Fermer la fenêtre des pièces-jointes @@ -28,6 +32,7 @@ tutti.attachmentEditor.field.file=Fichier tutti.attachmentEditor.field.fileComment=Commentaire tutti.attachmentEditor.field.fileName=Nom +tutti.attachmentEditor.fileNotFound=Le fichier %s de la pièce jointe n'a pas été trouvé tutti.attachmentEditor.none.tip=Pas de pièce-jointes tutti.attachmentEditor.saveAttachment.button=Enregistrer tutti.attachmentEditor.saveAttachment.fail.message=Une erreur est survenue lors de la sauvegarde du fichier. @@ -95,9 +100,12 @@ tutti.config.option.ui.showNumberEditorButton.description=Afficher le pavé numérique de saisie tutti.config.option.update.url.description=URL de mise à jour tutti.config.option.weights.rate.difference.totalAndSorted.description=Pourcentage de différence entre les Poids totaux VRAC triés et les poids totaux VRAC en dessous duquel on demande confirmation sur la saisie. -tutti.config.parse.error= +tutti.config.parse.error=Erreur de parsing du fichier de configuration tutti.config.sampleOrder.title=Catégorie d'échantillonnage +tutti.config.save.error=Erreur lors de la sauvegarde de la configuration dans le fichier %s tutti.config.title=Configuration +tutti.context.helpPage.notFound=La page d'aide %s n'a pas été trouvée +tutti.context.service.close.error=Erreur lors de la fermeture du service %s tutti.createAccidentalBatch.action.cancel=Annuler tutti.createAccidentalBatch.action.cancel.mnemonic=A tutti.createAccidentalBatch.action.cancel.tip=Annuler la création de la capture accidentelle @@ -999,6 +1007,9 @@ tutti.manageTemporaryReferential.title.choose.importTemporarySpeciesFile=Importer un réferentiel Espèce tutti.manageTemporaryReferential.title.choose.importTemporaryVesselFile=Importer un réferentiel Navire tutti.message.action.running=<html>Action <strong>%s</strong> en cours d'execution...<hr/></html> +tutti.property.get.error=Propriété %1s non trouvée sur l'objet de type %2s +tutti.property.set.error=Propriété %1s non trouvée sur l'objet de type %2s +tutti.sampleOrder.caracteristicNotFound=La caractéristique d'id %s n'est pas prévue pour l'échantillonage tutti.selectBenthos.title=Choisissez un benthos tutti.selectCruise.action.chooseCruiseExportFile=Exporter tutti.selectCruise.action.chooseProgramExportFile=Exporter