Author: kmorin Date: 2013-05-30 15:33:24 +0200 (Thu, 30 May 2013) New Revision: 1043 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1043 Log: fixes #2528 [REF TEMPORAIRE] Am?\195?\169liorer message d'erreur si format du fichier non adapt?\195?\169 fixes #2526 [MACRODECHET] poids total obligatoire Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/TuttiProtocolImportExportService.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/TuttiReferentialImportExportService.java trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/TuttiProtocolImportExportService.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/TuttiProtocolImportExportService.java 2013-05-30 13:19:37 UTC (rev 1042) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/TuttiProtocolImportExportService.java 2013-05-30 13:33:24 UTC (rev 1043) @@ -268,7 +268,13 @@ reader.close(); } catch (ImportRuntimeException e) { - throw new TuttiTechnicalException(e.getCause().getMessage(), e); + String message; + if (e.getCause() != null) { + message = e.getCause().getMessage(); + } else { + message = e.getMessage(); + } + throw new TuttiTechnicalException(message, e); } catch (Exception e) { throw new TuttiTechnicalException(_("tutti.service.protocol.import.species.error", protocol.getName(), file), e); Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/TuttiReferentialImportExportService.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/TuttiReferentialImportExportService.java 2013-05-30 13:19:37 UTC (rev 1042) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/TuttiReferentialImportExportService.java 2013-05-30 13:33:24 UTC (rev 1043) @@ -114,7 +114,13 @@ throw new IOException(_("tutti.service.referential.import.species.error", file), e); } catch (ImportRuntimeException e) { - throw new TuttiTechnicalException(e.getCause().getMessage()); + String message; + if (e.getCause() != null) { + message = e.getCause().getMessage(); + } else { + message = e.getMessage(); + } + throw new TuttiTechnicalException(message, e); } finally { @@ -252,7 +258,13 @@ throw new IOException(_("tutti.service.referential.import.gears.error", file), e); } catch (ImportRuntimeException e) { - throw new TuttiTechnicalException(e.getCause().getMessage()); + String message; + if (e.getCause() != null) { + message = e.getCause().getMessage(); + } else { + message = e.getMessage(); + } + throw new TuttiTechnicalException(message, e); } finally { Modified: trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties =================================================================== --- trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties 2013-05-30 13:19:37 UTC (rev 1042) +++ trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties 2013-05-30 13:33:24 UTC (rev 1043) @@ -210,5 +210,5 @@ tutti.validator.warning.fishingOperation.invalid.batch.model=Arbre d’échantillonnage non compatible avec l'application tutti.validator.warning.latitude.outOfBounds=La Latitude doit être comprise entre -90.0 et 90.0 tutti.validator.warning.longitude.outOfBounds=La longitude doit être comprise entre -180.0 et 180.0 -tutti.validator.warning.marineLitter.weight.required=Un lot de macro-déchets n'a pas de poids +tutti.validator.warning.marineLitter.weight.required=Vous devez saisir la valeur du poids total des déchets<br/>ou le poids de chacune des catégories observées. tutti.validator.warning.species.protocolNotRespected=Un lot des espèces ne suit pas les recommandations du protocole