Author: bleny Date: 2013-04-19 18:52:25 +0200 (Fri, 19 Apr 2013) New Revision: 1648 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1648 Log: fix build, revert some change by reintroducing DistrictParserFormatter Added: trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/operations/DistrictParserFormatter.java Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/BoatImportExportModel.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/BoatImportExportModel.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/BoatImportExportModel.java 2013-04-19 16:51:52 UTC (rev 1647) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/BoatImportExportModel.java 2013-04-19 16:52:25 UTC (rev 1648) @@ -29,7 +29,7 @@ import fr.ifremer.wao.entity.ShipOwnerImpl; import fr.ifremer.wao.entity.TerrestrialLocation; import fr.ifremer.wao.io.csv2.models.operations.BoatImmatriculationParserFormatter; -import fr.ifremer.wao.io.csv2.models.operations.DistrictsParserFormatter; +import fr.ifremer.wao.io.csv2.models.operations.DistrictParserFormatter; import fr.ifremer.wao.io.csv2.models.operations.PortParserFormatter; import org.apache.commons.lang3.StringUtils; import org.nuiton.util.csv.Common; @@ -131,7 +131,7 @@ // boat district modelBuilder.newColumnForImportExport("QUARTIER_CODE", Boat.PROPERTY_DISTRICT, - new DistrictsParserFormatter(districts)); + new DistrictParserFormatter(districts)); // port of registry modelBuilder.newColumnForImportExport("PORT_CODE", Added: trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/operations/DistrictParserFormatter.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/operations/DistrictParserFormatter.java (rev 0) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/operations/DistrictParserFormatter.java 2013-04-19 16:52:25 UTC (rev 1648) @@ -0,0 +1,73 @@ +package fr.ifremer.wao.io.csv2.models.operations; + +/* + * #%L + * Wao :: Business + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + + +import fr.ifremer.wao.WaoUtils; +import fr.ifremer.wao.entity.TerrestrialLocation; +import org.nuiton.util.csv.ValueParserFormatter; + +import java.text.ParseException; +import java.util.List; +import java.util.Map; + +public class DistrictParserFormatter implements ValueParserFormatter<TerrestrialLocation> { + + protected Map<String, TerrestrialLocation> indexedDistricts; + + public DistrictParserFormatter(List<TerrestrialLocation> districts) { + if (districts != null) { + for (TerrestrialLocation district : districts) { + if ( ! district.isDistrict()) { + throw new IllegalArgumentException(); + } + } + indexedDistricts = WaoUtils.projectPropertyUnique(districts, TerrestrialLocation.PROPERTY_DISTRICT_CODE); + } + } + + @Override + public String format(TerrestrialLocation district) { + String districtCode = ""; + if (district != null) { + districtCode = district.getDistrictCode(); + } + return districtCode; + } + + @Override + public TerrestrialLocation parse(String value) throws ParseException { + String trimmedValue = value.trim(); + if (trimmedValue.isEmpty()) { + throw new IllegalArgumentException(WaoUtils._("wao.import.contact.failure.districtMissing")); + } + TerrestrialLocation district = indexedDistricts.get(trimmedValue); + if (district == null) { + throw new IllegalArgumentException(WaoUtils._("wao.import.contact.failure.wrongDistrict", value)); + } + return district; + } + +} 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 2013-04-19 16:51:52 UTC (rev 1647) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java 2013-04-19 16:52:25 UTC (rev 1648) @@ -626,8 +626,8 @@ } if (result.isPhoneCall()) { result.getBoat().getBoatGroup(); - result.getTerrestrialLocation(); } + result.sizeTerrestrialLocations(); } else { result.sizeElligibleBoat(); result.sizeSampleMonth();