This is an automated email from the git hooks/post-receive script. New commit to branch feature/6688 in repository tutti. See http://git.codelutin.com/tutti.git commit d5878b95a30e7d20e1c772b8fed0b6d9fc639b42 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Feb 20 22:00:16 2015 +0100 add comment and list comment parser formatter --- .../service/csv/CommentListParserFormatter.java | 23 +++++++++++++++++ .../tutti/service/csv/CommentParserFormatter.java | 25 +++++++++++++++++++ .../fr/ifremer/tutti/service/csv/TuttiCsvUtil.java | 29 ++++++++++++---------- 3 files changed, 64 insertions(+), 13 deletions(-) diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/csv/CommentListParserFormatter.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/csv/CommentListParserFormatter.java new file mode 100644 index 0000000..ed63826 --- /dev/null +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/csv/CommentListParserFormatter.java @@ -0,0 +1,23 @@ +package fr.ifremer.tutti.service.csv; + +/** + * Created on 2/20/15. + * + * @author Tony Chemit - chemit@codelutin.com + * @since 3.14 + */ +public class CommentListParserFormatter extends ListParserFormatterSupport<String> { + + public static CommentListParserFormatter newFormatter(CommentParserFormatter delegateParserFormatter) { + return new CommentListParserFormatter(delegateParserFormatter); + } + + public static CommentListParserFormatter newParser(CommentParserFormatter delegateParserFormatter) { + return new CommentListParserFormatter(delegateParserFormatter); + } + + protected CommentListParserFormatter(CommentParserFormatter delegateParserFormatter) { + super(delegateParserFormatter); + } + +} diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/csv/CommentParserFormatter.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/csv/CommentParserFormatter.java new file mode 100644 index 0000000..70c8d8e --- /dev/null +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/csv/CommentParserFormatter.java @@ -0,0 +1,25 @@ +package fr.ifremer.tutti.service.csv; + +import org.nuiton.csv.ValueParserFormatter; + +import java.text.ParseException; + +/** + * Created on 2/20/15. + * + * @author Tony Chemit - chemit@codelutin.com + * @since 3.14 + */ +public class CommentParserFormatter implements ValueParserFormatter<String> { + + @Override + public String parse(String value) throws ParseException { + return value == null ? "" : value.replaceAll("@@", "\n"); + } + + @Override + public String format(String value) { + return value == null ? "" : value.replaceAll("\n", "@@"); + } + +} \ No newline at end of file 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 8f10b44..5d0015d 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 @@ -36,7 +36,6 @@ import org.nuiton.csv.ValueFormatter; import org.nuiton.csv.ValueParserFormatter; import java.io.Serializable; -import java.text.ParseException; import java.util.List; import static org.nuiton.i18n.I18n.t; @@ -98,18 +97,18 @@ public class TuttiCsvUtil extends Common { } }; - public static final ValueParserFormatter<String> COMMENT_PARSER_FORMATTER = new ValueParserFormatter<String>() { - - @Override - public String parse(String value) throws ParseException { - return value == null ? "" : value.replaceAll("@@", "\n"); - } - - @Override - public String format(String value) { - return value == null ? "" : value.replaceAll("\n", "@@"); - } - }; +// public static final ValueParserFormatter<String> COMMENT_PARSER_FORMATTER = new ValueParserFormatter<String>() { +// +// @Override +// public String parse(String value) throws ParseException { +// return value == null ? "" : value.replaceAll("@@", "\n"); +// } +// +// @Override +// public String format(String value) { +// return value == null ? "" : value.replaceAll("\n", "@@"); +// } +// }; // public static final ValueFormatter<Species> SPECIES_NAME_FORMATTER = new ValueFormatter<Species>() { // @Override @@ -155,6 +154,10 @@ public class TuttiCsvUtil extends Common { } }; + public static final CommentParserFormatter COMMENT_PARSER_FORMATTER = new CommentParserFormatter(); + + public static final ValueParserFormatter<List<String>> COMMENT_LIST_PARSER_FORMATTER = new CommentListParserFormatter(COMMENT_PARSER_FORMATTER); + public static final ValueFormatter<Caracteristic> CARACTERISTIC_FORMATTER = CaracteristicParserFormatter.newFormatter(); public static final ValueFormatter<Caracteristic> CARACTERISTIC_TECHNICAL_FORMATTER = CaracteristicParserFormatter.newTechnicalFormatter(); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.