Author: bleny Date: 2012-04-25 14:09:17 +0200 (Wed, 25 Apr 2012) New Revision: 1607 Url: http://forge.codelutin.com/repositories/revision/wao/1607 Log: fixes #1171 Erreur lors de l'export du plan si une ligne n'a pas de lieu associ?\195?\169 Added: trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/operations/SampleRowDistrictNameGetter.java Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/ObsMerObsVenteSamplingPlanImportExportModel.java Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/ObsMerObsVenteSamplingPlanImportExportModel.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/ObsMerObsVenteSamplingPlanImportExportModel.java 2012-04-19 12:56:25 UTC (rev 1606) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/ObsMerObsVenteSamplingPlanImportExportModel.java 2012-04-25 12:09:17 UTC (rev 1607) @@ -34,11 +34,7 @@ import fr.ifremer.wao.entity.SampleRow; import fr.ifremer.wao.entity.SampleRowImpl; import fr.ifremer.wao.entity.TerrestrialLocation; -import fr.ifremer.wao.io.csv2.models.operations.CompanyParserFormatter; -import fr.ifremer.wao.io.csv2.models.operations.DCF5CodesParserFormatter; -import fr.ifremer.wao.io.csv2.models.operations.DistrictParserFormatter; -import fr.ifremer.wao.io.csv2.models.operations.FishingZonesParserFormatter; -import fr.ifremer.wao.io.csv2.models.operations.SampleRowCodeParserFormatter; +import fr.ifremer.wao.io.csv2.models.operations.*; import org.nuiton.util.PeriodDates; import org.nuiton.util.csv.Common; import org.nuiton.util.csv.ExportableColumn; @@ -217,7 +213,7 @@ if (obsProgram == ObsProgram.OBSVENTE) { modelBuilder.newColumnForImportExport("PLAN_STRATEGIE", "samplingStrategy", new Common.ToStringParserFormatter<SamplingStrategy>(SamplingStrategy.values())); modelBuilder.newColumnForImportExport("PLAN_LIEU_CODE", SampleRow.PROPERTY_TERRESTRIAL_LOCATION, new DistrictParserFormatter(terrestrialDistricts)); - modelBuilder.newColumnForExport("PLAN_LIEU_NOM", SampleRow.PROPERTY_TERRESTRIAL_LOCATION + "." + TerrestrialLocation.PROPERTY_DISTRICT_NAME); + modelBuilder.newColumnForExport("PLAN_LIEU_NOM", new SampleRowDistrictNameGetter()); modelBuilder.newIgnoredColumn("PLAN_LIEU_NOM"); modelBuilder.newColumnForImportExport("PLAN_LIEU_COMMENT", SampleRow.PROPERTY_TERRESTRIAL_LOCATION_INFOS); } Added: trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/operations/SampleRowDistrictNameGetter.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/operations/SampleRowDistrictNameGetter.java (rev 0) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/operations/SampleRowDistrictNameGetter.java 2012-04-25 12:09:17 UTC (rev 1607) @@ -0,0 +1,17 @@ +package fr.ifremer.wao.io.csv2.models.operations; + +import fr.ifremer.wao.entity.SampleRow; +import fr.ifremer.wao.entity.TerrestrialLocation; +import org.nuiton.util.csv.ValueGetter; + +public class SampleRowDistrictNameGetter implements ValueGetter<SampleRow, String> { + + @Override + public String get(SampleRow sampleRow) throws Exception { + String districtName = ""; + if (sampleRow.getTerrestrialLocation() != null) { + districtName = sampleRow.getTerrestrialLocation().getDistrictName(); + } + return districtName; + } +}