Mercurial > dive4elements > river
diff backend/src/main/java/org/dive4elements/river/importer/parsers/DA66Parser.java @ 8200:9d2e69f971f5
sed -i src/**/*.java 's/logger/log/g'
author | Sascha L. Teichmann <teichmann@intevation.de> |
---|---|
date | Fri, 05 Sep 2014 12:50:33 +0200 |
parents | 3bb1c62ad732 |
children | 3ecf1f76b2b8 |
line wrap: on
line diff
--- a/backend/src/main/java/org/dive4elements/river/importer/parsers/DA66Parser.java Fri Sep 05 12:22:42 2014 +0200 +++ b/backend/src/main/java/org/dive4elements/river/importer/parsers/DA66Parser.java Fri Sep 05 12:50:33 2014 +0200 @@ -35,8 +35,8 @@ */ public class DA66Parser extends LineParser implements CrossSectionParser { - /** Private logger. */ - private static Logger logger = Logger.getLogger(DA66Parser.class); + /** Private log. */ + private static Logger log = Logger.getLogger(DA66Parser.class); private static String HEAD_HEAD = "00"; private static String HEAD_GEOM = "66"; // "Values" @@ -224,13 +224,13 @@ reset(); try { parse(file); - logger.info("parsing done"); + log.info("parsing done"); if (callback != null) { callback.parsed(DA66Parser.this); } } catch (IOException ioe) { - logger.error("IOException while parsing file"); + log.error("IOException while parsing file"); return false; } } @@ -311,7 +311,7 @@ */ private boolean addPoint(String y, String z, String idx) { if (z == null || y == null || idx == null) { - logger.error("Incomplete point definition"); + log.error("Incomplete point definition"); return false; } @@ -324,7 +324,7 @@ iz = Double.parseDouble(z) / 1000d; } catch(java.lang.NumberFormatException nfe) { - logger.error("Could not parse Number: " + nfe.getMessage()); + log.error("Could not parse Number: " + nfe.getMessage()); return false; } @@ -356,7 +356,7 @@ protected void handleLine(int lineNum, String line) { String head = line.substring(0,2); if (HEAD_HEAD.equals(head)) { - //logger.debug("New station"); + //log.debug("New station"); Matcher m = LINE_PATTERN.matcher(line); if (m.find()) { // Actually matches! @@ -367,13 +367,13 @@ data.put(station, currentLine); } else { - logger.error("HEAD line bad."); + log.error("HEAD line bad."); } } else if (HEAD_GEOM.equals(head)) { Matcher m = LINE_PATTERN.matcher(line); if (m.find()) { - //logger.info("Station: " + m.group(FIELD.STATION.getIdx())); + //log.info("Station: " + m.group(FIELD.STATION.getIdx())); // TODO if last station differs, error and abort if (m.group(FIELD.POINT_1_ID.getIdx()) != null) { // Point 1 @@ -385,7 +385,7 @@ } else { // Problematic point. - logger.error("A point could not be added"); + log.error("A point could not be added"); } } if (m.group(FIELD.POINT_2_ID.getIdx()) != null) { @@ -398,7 +398,7 @@ } else { // Problematic point. - logger.error("A point could not be added"); + log.error("A point could not be added"); } } if (m.group(FIELD.POINT_3_ID.getIdx()) != null) { @@ -411,7 +411,7 @@ } else { // Problematic point. - logger.error("A point could not be added"); + log.error("A point could not be added"); } } if (m.group(FIELD.POINT_4_ID.getIdx()) != null) { @@ -424,21 +424,21 @@ } else { // Problematic point. - logger.error("A point could not be added"); + log.error("A point could not be added"); } } } else { - logger.warn("Line could not be parsed: "); - logger.warn(line); + log.warn("Line could not be parsed: "); + log.warn(line); } } else if (HEAD_GEOM.equals(head)) { - logger.debug("Hit a 88"); + log.debug("Hit a 88"); } else { - logger.error("Do not know how to treat da66 line:"); - logger.error(line); + log.error("Do not know how to treat da66 line:"); + log.error(line); } } @@ -447,7 +447,7 @@ @Override protected void finish() { // TODO 'move' last line to match river axis - logger.info("Parsed " + data.size() + " lines"); + log.info("Parsed " + data.size() + " lines"); } @@ -456,12 +456,12 @@ DA66Parser parser = new DA66Parser(); - logger.warn("Start parsing files."); + log.warn("Start parsing files."); for (String arg: args) { parser.parseDA66s(new File(arg), null); - logger.warn("Parsing a file."); + log.warn("Parsing a file."); } - logger.error("Finished parsing files."); + log.error("Finished parsing files."); } } // vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 :