This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See http://git.codelutin.com/tutti.git commit 092414df66bd18b589d0efd7a4d8183e30fdfec5 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Feb 14 15:04:26 2015 +0100 fix new formatters --- .../ifremer/tutti/service/csv/PersonListParserFormatter.java | 4 ++-- .../fr/ifremer/tutti/service/csv/SpeciesParserFormatter.java | 12 ++++-------- .../ifremer/tutti/service/csv/VesselListParserFormatter.java | 4 ++-- 3 files changed, 8 insertions(+), 12 deletions(-) diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/csv/PersonListParserFormatter.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/csv/PersonListParserFormatter.java index eaa1470..937e01a 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/csv/PersonListParserFormatter.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/csv/PersonListParserFormatter.java @@ -10,8 +10,8 @@ import fr.ifremer.tutti.persistence.entities.referential.Person; */ public class PersonListParserFormatter extends EntityListParserFormatterSupport<Person> { - public static PersonListParserFormatter newFormatter() { - return new PersonListParserFormatter(null); + public static PersonListParserFormatter newFormatter(PersonParserFormatter delegateParserFormatter) { + return new PersonListParserFormatter(delegateParserFormatter); } public static PersonListParserFormatter newParser(PersonParserFormatter delegateParserFormatter) { diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/csv/SpeciesParserFormatter.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/csv/SpeciesParserFormatter.java index efcc029..f56e3e4 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/csv/SpeciesParserFormatter.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/csv/SpeciesParserFormatter.java @@ -50,16 +50,12 @@ public class SpeciesParserFormatter extends EntityParserFormatterSupport<Species } @Override - public String format(Species value) { - String result = ""; - if (value != null) { - result = Speciess.GET_REFERECE_TAXON_ID.apply(value); - } - return result; + protected String formatBusiness(Species value) { + return value.getName(); } @Override - protected String formatBusiness(Species species) { - return species.getName(); + protected String formatTechnical(Species value) { + return Speciess.GET_REFERECE_TAXON_ID.apply(value); } } diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/csv/VesselListParserFormatter.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/csv/VesselListParserFormatter.java index 729dd22..618e770 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/csv/VesselListParserFormatter.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/csv/VesselListParserFormatter.java @@ -10,8 +10,8 @@ import fr.ifremer.tutti.persistence.entities.referential.Vessel; */ public class VesselListParserFormatter extends EntityListParserFormatterSupport<Vessel> { - public static VesselListParserFormatter newFormatter() { - return new VesselListParserFormatter(null); + public static VesselListParserFormatter newFormatter(VesselParserFormatter delegateParserFormatter) { + return new VesselListParserFormatter(delegateParserFormatter); } public static VesselListParserFormatter newParser(VesselParserFormatter delegateParserFormatter) { -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.