Author: tchemit Date: 2012-03-27 18:14:19 +0200 (Tue, 27 Mar 2012) New Revision: 414 Url: http://forge.codelutin.com/repositories/revision/echobase/414 Log: improve Category decorator + remove old fixme stuff for esdu cell result import Modified: trunk/echobase-entities/src/main/java/fr/ifremer/echobase/csv/CellValueParser.java trunk/echobase-entities/src/main/java/fr/ifremer/echobase/csv/EchobaseCsvUtil.java trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/data/CategoryImpl.java Modified: trunk/echobase-entities/src/main/java/fr/ifremer/echobase/csv/CellValueParser.java =================================================================== --- trunk/echobase-entities/src/main/java/fr/ifremer/echobase/csv/CellValueParser.java 2012-03-27 13:03:51 UTC (rev 413) +++ trunk/echobase-entities/src/main/java/fr/ifremer/echobase/csv/CellValueParser.java 2012-03-27 16:14:19 UTC (rev 414) @@ -32,21 +32,14 @@ import org.nuiton.util.csv.ImportRuntimeException; import org.nuiton.util.csv.ValueParser; -import java.text.DateFormat; import java.text.ParseException; -import java.text.SimpleDateFormat; -import java.util.Date; import java.util.List; import java.util.Map; public class CellValueParser implements ValueParser<Cell> { - public static final String CELLULE_DATE_FORMAT = "dd/MM/yyyy HH:mm:ss.SSSS"; - final Voyage voyage; -// private final Pattern ID_PATTERN = Pattern.compile("(.[^_]+)(_(.+)){0,1}"); - private final CellDAO cellDAO; private final Map<String, Cell> esduCells; @@ -57,28 +50,9 @@ esduCells = Maps.newTreeMap(); } - private static final DateFormat cellDateFormatOne = new SimpleDateFormat( - "yyyy-MM-dd HH:mm:ss"); - - private static final DateFormat cellDateFormat = new SimpleDateFormat( - CELLULE_DATE_FORMAT); - - public static String reformatDate(String date) throws ParseException { - Date parse = cellDateFormatOne.parse(date); - date = cellDateFormat.format(parse); - return date; - } - @Override public Cell parse(String value) throws ParseException { -// // must find it -// Matcher matcher = ID_PATTERN.matcher(value); -// if (!matcher.matches()) { -// throw new ImportRuntimeException( -// "Can not match cell id pattern with value " + value); -// } - int separatorIndex = value.indexOf("_"); String esduCellId; @@ -123,9 +97,6 @@ protected Cell getEsduCell(String esduCellId) throws ParseException { -//FIXME Remove this when using same date formatter everywhere... - esduCellId = reformatDate(esduCellId); - Cell result = esduCells.get(esduCellId); if (result == null) { Modified: trunk/echobase-entities/src/main/java/fr/ifremer/echobase/csv/EchobaseCsvUtil.java =================================================================== --- trunk/echobase-entities/src/main/java/fr/ifremer/echobase/csv/EchobaseCsvUtil.java 2012-03-27 13:03:51 UTC (rev 413) +++ trunk/echobase-entities/src/main/java/fr/ifremer/echobase/csv/EchobaseCsvUtil.java 2012-03-27 16:14:19 UTC (rev 414) @@ -67,7 +67,7 @@ public static final ValueParser<Date> IMPORT_DAY_TIME2 = new DateValue("yyyy-MM-dd HH:mm:ss"); - public static final String CELLULE_DATE_FORMAT = "dd/MM/yyyy HH:mm:ss.SSSS"; + public static final String CELLULE_DATE_FORMAT = "yyyy-MM-dd HH:mm:ss.SSSS"; public static final ValueParser<Date> IMPORT_DAY_TIME3 = new DateValue(CELLULE_DATE_FORMAT); Modified: trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/data/CategoryImpl.java =================================================================== --- trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/data/CategoryImpl.java 2012-03-27 13:03:51 UTC (rev 413) +++ trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/data/CategoryImpl.java 2012-03-27 16:14:19 UTC (rev 414) @@ -29,26 +29,26 @@ @Override public String getEchotypeLabel() { - return echotype == null ? "" : (" echotype: " + echotype.getName()); + return echotype == null ? "" : ("echotype: " + echotype.getName()); } @Override public String getSpeciesLabel() { return speciesCategory == null || speciesCategory.getSpecies() == null ? "" : - (" species: " + speciesCategory.getSpecies().getBaracoudaCode()); + ("species: " + speciesCategory.getSpecies().getBaracoudaCode()); } @Override public String getProcessedAgeLabel() { return speciesCategory == null || speciesCategory.getAgeCategory() == null ? "" : - (" ageCategory: " + speciesCategory.getAgeCategoryName()); + ("ageCategory: " + speciesCategory.getAgeCategoryName()); } @Override public String getProcessedLengthLabel() { return speciesCategory == null || speciesCategory.getSizeCategory() == null ? "" : - (" sizeCategory: " + speciesCategory.getSizeCategoryName()); + ("sizeCategory: " + speciesCategory.getSizeCategoryName()); } } //CategoryImpl