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 ad5140dbfe91dd0b6fc2cbe3da2abc4b8b72f7d9 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Feb 7 12:58:25 2015 +0100 revue de comment on export les navires associés --- .../tutti/service/csv/ListVesselFormatter.java | 24 ++++++++++------------ .../fr/ifremer/tutti/service/csv/TuttiCsvUtil.java | 9 +++----- 2 files changed, 14 insertions(+), 19 deletions(-) diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/csv/ListVesselFormatter.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/csv/ListVesselFormatter.java index ce3f2ef..0ea521b 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/csv/ListVesselFormatter.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/csv/ListVesselFormatter.java @@ -5,31 +5,29 @@ import com.google.common.base.Joiner; import com.google.common.collect.Lists; import fr.ifremer.tutti.persistence.entities.referential.Vessel; import org.nuiton.csv.ValueFormatter; -import org.nuiton.decorator.Decorator; import java.util.List; /** -* Created on 2/5/15. -* -* @author Tony Chemit - chemit@codelutin.com -* @since 3.13 -*/ + * Created on 2/5/15. + * + * @author Tony Chemit - chemit@codelutin.com + * @since 3.13 + */ public class ListVesselFormatter implements ValueFormatter<List<Vessel>> { - final Decorator<Vessel> decorator; - - public ListVesselFormatter(Decorator<Vessel> decorator) { - this.decorator = decorator; - } - @Override public String format(List<Vessel> value) { List<String> decoratedValues = Lists.transform(value, new Function<Vessel, String>() { @Override public String apply(Vessel input) { - return decorator.toString(input); + + String result = input.getRegistrationCode(); + if (result == null) { + result = input.getInternationalRegistrationCode(); + } + return result; } }); return Joiner.on('|').join(decoratedValues); diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/csv/TuttiCsvUtil.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/csv/TuttiCsvUtil.java index 9dde632..d471fc5 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/csv/TuttiCsvUtil.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/csv/TuttiCsvUtil.java @@ -248,16 +248,13 @@ public class TuttiCsvUtil extends Common { public static final ValueFormatter<Serializable> CARACTERISTIC_VALUE_FORMATTER = new CaracteristicValueFormatter(); - public static final ValueFormatter<Vessel> VESSEL_VALUE_FORMATTER = new VesselFormatter(); + public static final ValueFormatter<Vessel> VESSEL_FORMATTER = new VesselFormatter(); public static final ValueFormatter<List<Person>> LIST_PERSON_FORMATTER = new ListPersonFormatter(); - public static ListVesselFormatter newListVesselFormatter(Decorator<Vessel> decorator) { - return new ListVesselFormatter(decorator); - } + public static final ValueFormatter<List<Vessel>> LIST_VESSEL_FORMATTER = new ListVesselFormatter(); - public static final ValueParserFormatter<List<Integer>> LIST_INTEGER_PARSER_FORMATTER = - new ListIntegerFormatter(); + public static final ValueParserFormatter<List<Integer>> LIST_INTEGER_PARSER_FORMATTER = new ListIntegerFormatter(); public static final ValueFormatter<List<Gear>> LIST_GEAR_FORMATTER = new ListGearFormatter(); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.