Author: bleny Date: 2011-04-20 10:12:40 +0000 (Wed, 20 Apr 2011) New Revision: 1219 Log: better error management in UI Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/Import.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java trunk/wao-business/src/main/resources/i18n/wao-business_fr_FR.properties Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/Import.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/Import.java 2011-04-19 15:34:23 UTC (rev 1218) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/Import.java 2011-04-20 10:12:40 UTC (rev 1219) @@ -219,8 +219,9 @@ try { parsedValue = field.parseValue(value); } catch (Exception e) { - throw new RuntimeException(WaoUtils.translate(n_("csv.import.error.unableToParseValue"), value, - field.getHeaderName(), lineNumber), e); + String message = WaoUtils.translate(n_("csv.import.error.unableToParseValue"), value, field.getHeaderName(), lineNumber) + + "\n" + e.getMessage(); + throw new RuntimeException(message, e); } time = timeLog.log(time, "parseValue"); Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java 2011-04-19 15:34:23 UTC (rev 1218) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java 2011-04-20 10:12:40 UTC (rev 1219) @@ -1055,11 +1055,12 @@ timeLog.log(startReadLine, "import one line"); } catch (Exception e) { + WaoBusinessException waoBusinessException = new WaoBusinessException(e.getMessage() + "\n" + e.getCause().getMessage(), e); errorArgs.add(-1); errorArgs.add(sampleRow == null ? "" : sampleRow.getCode()); //errorArgs.add(e.getMessage()); transaction.rollbackTransaction(); - throw new ImportRefusedException(e.getMessage(), -1, "field", e); + throw new ImportRefusedException(e.getMessage(), -1, "field", waoBusinessException); } } Modified: trunk/wao-business/src/main/resources/i18n/wao-business_fr_FR.properties =================================================================== --- trunk/wao-business/src/main/resources/i18n/wao-business_fr_FR.properties 2011-04-19 15:34:23 UTC (rev 1218) +++ trunk/wao-business/src/main/resources/i18n/wao-business_fr_FR.properties 2011-04-20 10:12:40 UTC (rev 1219) @@ -212,7 +212,7 @@ wao.error.serviceSampling.getSampleRowByCode=Impossible de charger la ligne d'\u00E9chantillon ayant pour code %1$s wao.error.serviceSampling.getSampleRowsByFilter=Impossible de r\u00E9cup\u00E9rer la liste des lignes du plan d'\u00E9chantillonnage wao.error.serviceSampling.getSampleRowsOrderedByFishingZone=Impossible de r\u00E9cup\u00E9rer la liste des lignes du plan d'\u00E9chantillonnage -wao.error.serviceSampling.importSamplingPlanCsv=Erreur \u00E0 la ligne %1$d [CODE \= %2$s] +wao.error.serviceSampling.importSamplingPlanCsv=Erreur lors de l'import du plan wao.error.serviceSampling.newSamplingFilter= wao.error.serviceSampling.validateSampleRow= wao.error.serviceSynthesis.getAllIndicatorLogs=