Author: dcosse Date: 2014-08-14 16:06:09 +0200 (Thu, 14 Aug 2014) New Revision: 3911 Url: http://forge.chorem.org/projects/lima/repository/revisions/3911 Log: fix sonar warning Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/csv/AbstractLimaModel.java trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/csv/EntryModel.java Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/csv/AbstractLimaModel.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/csv/AbstractLimaModel.java 2014-08-14 14:00:32 UTC (rev 3910) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/csv/AbstractLimaModel.java 2014-08-14 14:06:09 UTC (rev 3911) @@ -66,36 +66,6 @@ }; /** - * String to integer converter (null allowed). - */ - protected static final ValueParser<Integer> INTEGER_WITH_NULL_PARSER = new ValueParser<Integer>() { - @Override - public Integer parse(String value) throws ParseException { - Integer result = null; - if (!Strings.isNullOrEmpty(value)) { - result = Integer.valueOf(value); - } - return result; - } - }; - - /** - * String to double converter. - * Can handle , or . as decimal separator and ' ' as thousand separator - */ - protected static final ValueParser<Double> DOUBLE_PARSER = new ValueParser<Double>() { - @Override - public Double parse(String value) throws ParseException { - double result = 0; - if (!value.isEmpty()) { - // " " est un espace insécable, pas un " " - result = Double.valueOf(value.replace(',','.').replace(" ", "")); - } - return result; - } - }; - - /** * O/N boolean parser. */ protected static final ValueParser<Boolean> O_N_PARSER = new ValueParser<Boolean>() { Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/csv/EntryModel.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/csv/EntryModel.java 2014-08-14 14:00:32 UTC (rev 3910) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/csv/EntryModel.java 2014-08-14 14:06:09 UTC (rev 3911) @@ -37,6 +37,8 @@ import org.nuiton.csv.ValueFormatter; import org.nuiton.csv.ValueParser; +import java.text.SimpleDateFormat; + /** * Created by davidcosse on 03/06/14. */ @@ -65,7 +67,7 @@ @Override public Iterable<ExportableColumn<Entry, Object>> getColumnsForExport() { - ModelBuilder<Entry> modelBuilder = new ModelBuilder<Entry>(); + ModelBuilder<Entry> modelBuilder = new ModelBuilder<>(); modelBuilder.newColumnForExport("account", Entry.PROPERTY_ACCOUNT, ACCOUNT_TO_ACCOUNT_NUMBER_FORMATTER); modelBuilder.newColumnForExport("amount", Entry.PROPERTY_AMOUNT, BIG_DECIMAL_FORMATTER); modelBuilder.newColumnForExport("debit", Entry.PROPERTY_DEBIT, O_N_FORMATTER); @@ -114,7 +116,8 @@ public String format(FinancialTransaction value) { String result; if (value != null) { - result = humanReadable ? AbstractLimaModel.simpleDateFormat.format(value.getTransactionDate()) : value.getTopiaId(); + SimpleDateFormat simpleDateFormat = new SimpleDateFormat(DATE_FORMAT); + result = humanReadable ? simpleDateFormat.format(value.getTransactionDate()) : value.getTopiaId(); } else { result = ""; }