Author: bleny Date: 2014-06-21 14:15:41 +0200 (Sat, 21 Jun 2014) New Revision: 2083 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2083 Log: refs #4491 fix export import Modified: branches/wao-4.0-obsvente/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/DistrictsParserFormatter.java branches/wao-4.0-obsvente/wao-web/src/main/java/fr/ifremer/wao/web/action/AbstractDownloadCsvAction.java Modified: branches/wao-4.0-obsvente/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/DistrictsParserFormatter.java =================================================================== --- branches/wao-4.0-obsvente/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/DistrictsParserFormatter.java 2014-06-21 12:00:27 UTC (rev 2082) +++ branches/wao-4.0-obsvente/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/DistrictsParserFormatter.java 2014-06-21 12:15:41 UTC (rev 2083) @@ -40,18 +40,13 @@ protected final Locale locale; + protected List<TerrestrialLocation> districts; + protected Map<String, TerrestrialLocation> indexedDistricts; public DistrictsParserFormatter(Locale locale, List<TerrestrialLocation> districts) { this.locale = locale; - indexedDistricts = new HashMap<>(); - for (TerrestrialLocation district : districts) { - if ( ! district.isDistrict()) { - throw new IllegalArgumentException(); - } - indexedDistricts.put(district.getDistrictCode(), district); - } - // XXX brendan 28/02/14 on utilise pas Maps.uniqueIndex car la clé peut être null (quartier maritime « Hors France ») + this.districts = districts; } @Override @@ -68,6 +63,16 @@ @Override public Collection<TerrestrialLocation> parse(String value) throws ParseException { + if (indexedDistricts == null) { + indexedDistricts = new HashMap<>(); + for (TerrestrialLocation district : districts) { + // XXX brendan 28/02/14 on utilise pas Maps.uniqueIndex car la clé peut être null (quartier maritime « Hors France ») + if (!district.isDistrict()) { + throw new IllegalArgumentException(); + } + indexedDistricts.put(district.getDistrictCode(), district); + } + } if (StringUtils.isBlank(value)) { throw new IllegalArgumentException(I18n.l(locale, "wao.import.contact.failure.districtMissing")); } Modified: branches/wao-4.0-obsvente/wao-web/src/main/java/fr/ifremer/wao/web/action/AbstractDownloadCsvAction.java =================================================================== --- branches/wao-4.0-obsvente/wao-web/src/main/java/fr/ifremer/wao/web/action/AbstractDownloadCsvAction.java 2014-06-21 12:00:27 UTC (rev 2082) +++ branches/wao-4.0-obsvente/wao-web/src/main/java/fr/ifremer/wao/web/action/AbstractDownloadCsvAction.java 2014-06-21 12:15:41 UTC (rev 2083) @@ -40,7 +40,7 @@ private static final long serialVersionUID = 1L; - protected SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-dd-MM_HH-mm"); + protected SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd_HH-mm"); public abstract String getFileName();