Mercurial > dive4elements > river
changeset 8200:9d2e69f971f5
sed -i src/**/*.java 's/logger/log/g'
line wrap: on
line diff
--- a/backend/src/main/java/org/dive4elements/river/importer/ImportRange.java Fri Sep 05 12:22:42 2014 +0200 +++ b/backend/src/main/java/org/dive4elements/river/importer/ImportRange.java Fri Sep 05 12:50:33 2014 +0200 @@ -19,7 +19,7 @@ public class ImportRange implements Comparable<ImportRange> { - /** Private logger. */ + /** Private log. */ private static Logger log = Logger.getLogger(ImportRange.class); protected BigDecimal a;
--- a/backend/src/main/java/org/dive4elements/river/importer/ImportRiver.java Fri Sep 05 12:22:42 2014 +0200 +++ b/backend/src/main/java/org/dive4elements/river/importer/ImportRiver.java Fri Sep 05 12:50:33 2014 +0200 @@ -63,7 +63,7 @@ /** Import all river-related data (files) that can be found. */ public class ImportRiver { - /** Private logger. */ + /** Private log. */ private static Logger log = Logger.getLogger(ImportRiver.class); public static final String PEGEL_GLT = "PEGEL.GLT";
--- a/backend/src/main/java/org/dive4elements/river/importer/ImportWstColumnValue.java Fri Sep 05 12:22:42 2014 +0200 +++ b/backend/src/main/java/org/dive4elements/river/importer/ImportWstColumnValue.java Fri Sep 05 12:50:33 2014 +0200 @@ -18,7 +18,7 @@ public class ImportWstColumnValue { - protected Logger logger = Logger.getLogger(ImportWstColumnValue.class); + protected Logger log = Logger.getLogger(ImportWstColumnValue.class); protected BigDecimal position; protected BigDecimal w;
--- a/backend/src/main/java/org/dive4elements/river/importer/Importer.java Fri Sep 05 12:22:42 2014 +0200 +++ b/backend/src/main/java/org/dive4elements/river/importer/Importer.java Fri Sep 05 12:50:33 2014 +0200 @@ -35,7 +35,7 @@ /** Data Importer. Further processing happens per-river. */ public class Importer { - /** Private logger. */ + /** Private log. */ private static Logger log = Logger.getLogger(Importer.class); private static String BWASTR_ID_CSV_FILE = "BWASTR_ID.csv";
--- a/backend/src/main/java/org/dive4elements/river/importer/parsers/AtFileParser.java Fri Sep 05 12:22:42 2014 +0200 +++ b/backend/src/main/java/org/dive4elements/river/importer/parsers/AtFileParser.java Fri Sep 05 12:50:33 2014 +0200 @@ -34,7 +34,7 @@ public static final String ENCODING = "ISO-8859-1"; - private static Logger logger = Logger.getLogger(AtFileParser.class); + private static Logger log = Logger.getLogger(AtFileParser.class); // regular expression from hell to find out time range public static final Pattern DATE_LINE = Pattern.compile( @@ -57,7 +57,7 @@ ) throws IOException { - logger.info("parsing AT file: " + file); + log.info("parsing AT file: " + file); BufferedReader br = null; @@ -109,7 +109,7 @@ String[] splits = tmp.replace(',', '.').split("\\s+"); if ((splits.length < 2) || (splits.length > 11)) { - logger.warn("Found an invalid row in the AT file."); + log.warn("Found an invalid row in the AT file."); continue; } @@ -141,10 +141,10 @@ } } catch (NumberFormatException pe) { - logger.warn("AT: invalid number " + pe.getMessage()); + log.warn("AT: invalid number " + pe.getMessage()); } catch (FileNotFoundException fnfe) { - logger.error(fnfe.getMessage()); + log.error(fnfe.getMessage()); } finally { if (br != null) { @@ -156,12 +156,12 @@ if (to != null && from.compareTo(to) > 0) { Date t = from; from = to; to = t; } - logger.info("from: " + from + " to: " + to); + log.info("from: " + from + " to: " + to); ImportTimeInterval interval = new ImportTimeInterval(from, to); dischargeTable.setTimeInterval(interval); } - logger.info("Finished parsing AT file: " + file); + log.info("Finished parsing AT file: " + file); return dischargeTable; } @@ -172,7 +172,7 @@ return null; } - logger.debug("day: " + day + " month: " + month + " year: " + year); + log.debug("day: " + day + " month: " + month + " year: " + year); int dayI = 15; if (day != null) { @@ -227,7 +227,7 @@ parser.parse(new File(arg)); } } catch(Exception e) { - logger.error("Exception caught " + e); + log.error("Exception caught " + e); } } }
--- a/backend/src/main/java/org/dive4elements/river/importer/parsers/BundesWasserStrassenParser.java Fri Sep 05 12:22:42 2014 +0200 +++ b/backend/src/main/java/org/dive4elements/river/importer/parsers/BundesWasserStrassenParser.java Fri Sep 05 12:50:33 2014 +0200 @@ -15,8 +15,8 @@ /** Parse CSV file that contains official numbers for rivers. */ public class BundesWasserStrassenParser extends LineParser { - /** Private logger. */ - private static final Logger logger = + /** Private log. */ + private static final Logger log = Logger.getLogger(BundesWasserStrassenParser.class); /** Map from rivernames to Official numbers. */ @@ -48,7 +48,7 @@ if (vals.length != 2) { vals = line.split(";"); if (vals.length != 2) { - logger.warn("Invalid bwastr-id line:\n" + line); + log.warn("Invalid bwastr-id line:\n" + line); return; } } @@ -59,7 +59,7 @@ numberMap.put(name, number); } catch (NumberFormatException e) { - logger.warn("Invalid number in bwastr-id line:\n" + line); + log.warn("Invalid number in bwastr-id line:\n" + line); } }
--- a/backend/src/main/java/org/dive4elements/river/importer/parsers/DA50Parser.java Fri Sep 05 12:22:42 2014 +0200 +++ b/backend/src/main/java/org/dive4elements/river/importer/parsers/DA50Parser.java Fri Sep 05 12:50:33 2014 +0200 @@ -31,8 +31,8 @@ */ public class DA50Parser extends LineParser implements CrossSectionParser { - /** Private logger. */ - private static Logger logger = Logger.getLogger(DA50Parser.class); + /** Private log. */ + private static Logger log = Logger.getLogger(DA50Parser.class); /** The current line to which add points. */ private List<XY> currentLine; @@ -84,13 +84,13 @@ reset(); try { parse(file); - logger.info("parsing done"); + log.info("parsing done"); if (callback != null) { callback.parsed(DA50Parser.this); } } catch (IOException ioe) { - logger.error("IOException while parsing file"); + log.error("IOException while parsing file"); return false; } } @@ -133,7 +133,7 @@ /** Called when file is fully consumed. */ @Override protected void finish() { - logger.info("Parsed " + data.size() + " lines"); + log.info("Parsed " + data.size() + " lines"); } @@ -142,12 +142,12 @@ DA50Parser parser = new DA50Parser(); - logger.warn("Start parsing files."); + log.warn("Start parsing files."); for (String arg: args) { parser.parseDA50s(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 :
--- 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 :
--- a/backend/src/main/java/org/dive4elements/river/importer/parsers/LineParser.java Fri Sep 05 12:22:42 2014 +0200 +++ b/backend/src/main/java/org/dive4elements/river/importer/parsers/LineParser.java Fri Sep 05 12:50:33 2014 +0200 @@ -32,7 +32,7 @@ */ public abstract class LineParser { - /** Private logger. */ + /** Private log. */ private static final Logger log = Logger.getLogger(LineParser.class); public static final String ENCODING = "ISO-8859-1";
--- a/backend/src/main/java/org/dive4elements/river/importer/parsers/W80CSVParser.java Fri Sep 05 12:22:42 2014 +0200 +++ b/backend/src/main/java/org/dive4elements/river/importer/parsers/W80CSVParser.java Fri Sep 05 12:50:33 2014 +0200 @@ -36,8 +36,8 @@ */ public class W80CSVParser extends LineParser implements CrossSectionParser { - /** Private logger. */ - private static Logger logger = Logger.getLogger(W80CSVParser.class); + /** Private log. */ + private static Logger log = Logger.getLogger(W80CSVParser.class); /** The current line to which add points. */ @@ -142,13 +142,13 @@ reset(); try { parse(file); - logger.info("parsing done"); + log.info("parsing done"); if (callback != null) { callback.parsed(W80CSVParser.this); } } catch (IOException ioe) { - logger.error("IOException while parsing file"); + log.error("IOException while parsing file"); return false; } } @@ -263,7 +263,7 @@ heightM = Double.parseDouble(height.replace(",",".")); } catch (java.lang.NumberFormatException nfe) { - logger.error("Skipping malformed w80csv line #" + lineNum); + log.error("Skipping malformed w80csv line #" + lineNum); return; } @@ -279,7 +279,7 @@ anchorDate = DateGuesser.guessDate(date); } catch (IllegalArgumentException iae) { - logger.warn("W80CSV: Invalid date '" + date + "'."); + log.warn("W80CSV: Invalid date '" + date + "'."); } } else { @@ -291,7 +291,7 @@ /** Called when file is fully consumed. */ @Override protected void finish() { - logger.info("Parsed " + data.size() + " lines"); + log.info("Parsed " + data.size() + " lines"); } @@ -300,12 +300,12 @@ W80CSVParser parser = new W80CSVParser(); - logger.warn("Start parsing files."); + log.warn("Start parsing files."); for (String arg: args) { - logger.warn("Parsing a file."); + log.warn("Parsing a file."); parser.parseW80CSVs(new File(arg), null); } - logger.error("Finished parsing files."); + log.error("Finished parsing files."); } } // vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 :
--- a/backend/src/main/java/org/dive4elements/river/importer/parsers/W80Parser.java Fri Sep 05 12:22:42 2014 +0200 +++ b/backend/src/main/java/org/dive4elements/river/importer/parsers/W80Parser.java Fri Sep 05 12:50:33 2014 +0200 @@ -36,8 +36,8 @@ */ public class W80Parser extends LineParser implements CrossSectionParser { - /** Private logger. */ - private static Logger logger = Logger.getLogger(W80Parser.class); + /** Private log. */ + private static Logger log = Logger.getLogger(W80Parser.class); /** The current line to which add points. */ @@ -137,13 +137,13 @@ reset(); try { parse(file); - logger.info("parsing done"); + log.info("parsing done"); if (callback != null) { callback.parsed(W80Parser.this); } } catch (IOException ioe) { - logger.error("IOException while parsing file"); + log.error("IOException while parsing file"); return false; } } @@ -265,7 +265,7 @@ anchorDate = DateGuesser.guessDate(date); } catch (IllegalArgumentException iae) { - logger.warn("W80: Invalid date '" + date + "'."); + log.warn("W80: Invalid date '" + date + "'."); } } else { @@ -277,7 +277,7 @@ /** Called when file is fully consumed. */ @Override protected void finish() { - logger.info("Parsed " + data.size() + " lines"); + log.info("Parsed " + data.size() + " lines"); } @@ -286,12 +286,12 @@ W80Parser parser = new W80Parser(); - logger.warn("Start parsing files."); + log.warn("Start parsing files."); for (String arg: args) { - logger.warn("Parsing a file."); + log.warn("Parsing a file."); parser.parseW80s(new File(arg), null); } - logger.error("Finished parsing files."); + log.error("Finished parsing files."); } } // vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 :
--- a/backend/src/main/java/org/dive4elements/river/model/BedHeightSingleValue.java Fri Sep 05 12:22:42 2014 +0200 +++ b/backend/src/main/java/org/dive4elements/river/model/BedHeightSingleValue.java Fri Sep 05 12:50:33 2014 +0200 @@ -36,7 +36,7 @@ public class BedHeightSingleValue implements Serializable { - private static Logger logger = + private static Logger log = Logger.getLogger(BedHeightSingleValue.class); private Integer id;
--- a/backend/src/main/java/org/dive4elements/river/model/CrossSection.java Fri Sep 05 12:22:42 2014 +0200 +++ b/backend/src/main/java/org/dive4elements/river/model/CrossSection.java Fri Sep 05 12:50:33 2014 +0200 @@ -45,7 +45,7 @@ public class CrossSection implements Serializable { - private static Logger logger = + private static Logger log = Logger.getLogger(CrossSection.class); public static final MathContext PRECISION = new MathContext(6); @@ -248,7 +248,7 @@ } } else { - logger.warn("No CS found that could be master."); + log.warn("No CS found that could be master."); } // TODO If there is none, might need a fallback.
--- a/backend/src/main/java/org/dive4elements/river/model/CrossSectionLine.java Fri Sep 05 12:22:42 2014 +0200 +++ b/backend/src/main/java/org/dive4elements/river/model/CrossSectionLine.java Fri Sep 05 12:50:33 2014 +0200 @@ -35,7 +35,7 @@ public class CrossSectionLine implements Serializable { - private static Logger logger = Logger.getLogger(CrossSectionLine.class); + private static Logger log = Logger.getLogger(CrossSectionLine.class); public static final double EPSILON = 1e-4;
--- a/backend/src/main/java/org/dive4elements/river/model/DischargeZone.java Fri Sep 05 12:22:42 2014 +0200 +++ b/backend/src/main/java/org/dive4elements/river/model/DischargeZone.java Fri Sep 05 12:50:33 2014 +0200 @@ -35,7 +35,7 @@ public class DischargeZone implements Serializable { - private static Logger logger = Logger.getLogger(DischargeZone.class); + private static Logger log = Logger.getLogger(DischargeZone.class); private Integer id;
--- a/backend/src/main/java/org/dive4elements/river/model/ElevationModel.java Fri Sep 05 12:22:42 2014 +0200 +++ b/backend/src/main/java/org/dive4elements/river/model/ElevationModel.java Fri Sep 05 12:50:33 2014 +0200 @@ -28,7 +28,7 @@ public class ElevationModel implements Serializable { - private static Logger logger = Logger.getLogger(ElevationModel.class); + private static Logger log = Logger.getLogger(ElevationModel.class); protected Integer id;
--- a/backend/src/main/java/org/dive4elements/river/model/FlowVelocityMeasurement.java Fri Sep 05 12:22:42 2014 +0200 +++ b/backend/src/main/java/org/dive4elements/river/model/FlowVelocityMeasurement.java Fri Sep 05 12:50:33 2014 +0200 @@ -30,7 +30,7 @@ public class FlowVelocityMeasurement implements Serializable { - private static Logger logger = + private static Logger log = Logger.getLogger(FlowVelocityMeasurement.class); private Integer id;
--- a/backend/src/main/java/org/dive4elements/river/model/FlowVelocityMeasurementValue.java Fri Sep 05 12:22:42 2014 +0200 +++ b/backend/src/main/java/org/dive4elements/river/model/FlowVelocityMeasurementValue.java Fri Sep 05 12:50:33 2014 +0200 @@ -31,7 +31,7 @@ public class FlowVelocityMeasurementValue implements Serializable { - private static Logger logger = + private static Logger log = Logger.getLogger(FlowVelocityMeasurementValue.class); private Integer id;
--- a/backend/src/main/java/org/dive4elements/river/model/FlowVelocityModel.java Fri Sep 05 12:22:42 2014 +0200 +++ b/backend/src/main/java/org/dive4elements/river/model/FlowVelocityModel.java Fri Sep 05 12:50:33 2014 +0200 @@ -35,7 +35,7 @@ public class FlowVelocityModel implements Serializable { - private static Logger logger = Logger.getLogger(FlowVelocityModel.class); + private static Logger log = Logger.getLogger(FlowVelocityModel.class); private Integer id;
--- a/backend/src/main/java/org/dive4elements/river/model/FlowVelocityModelValue.java Fri Sep 05 12:22:42 2014 +0200 +++ b/backend/src/main/java/org/dive4elements/river/model/FlowVelocityModelValue.java Fri Sep 05 12:50:33 2014 +0200 @@ -35,7 +35,7 @@ public class FlowVelocityModelValue implements Serializable { - private static Logger logger = + private static Logger log = Logger.getLogger(FlowVelocityModelValue.class);
--- a/backend/src/main/java/org/dive4elements/river/model/GrainFraction.java Fri Sep 05 12:22:42 2014 +0200 +++ b/backend/src/main/java/org/dive4elements/river/model/GrainFraction.java Fri Sep 05 12:50:33 2014 +0200 @@ -36,7 +36,7 @@ public static final String UNKNOWN = "unknown"; - private static Logger logger = Logger.getLogger(GrainFraction.class); + private static Logger log = Logger.getLogger(GrainFraction.class); private Integer id;
--- a/backend/src/main/java/org/dive4elements/river/model/SedimentLoadLSValue.java Fri Sep 05 12:22:42 2014 +0200 +++ b/backend/src/main/java/org/dive4elements/river/model/SedimentLoadLSValue.java Fri Sep 05 12:50:33 2014 +0200 @@ -28,7 +28,7 @@ public class SedimentLoadLSValue implements Serializable { - private static Logger logger = Logger.getLogger(SedimentLoadLSValue.class); + private static Logger log = Logger.getLogger(SedimentLoadLSValue.class); private Integer id;
--- a/backend/src/main/java/org/dive4elements/river/model/Wst.java Fri Sep 05 12:22:42 2014 +0200 +++ b/backend/src/main/java/org/dive4elements/river/model/Wst.java Fri Sep 05 12:50:33 2014 +0200 @@ -39,7 +39,7 @@ public class Wst implements Serializable { - private static Logger logger = Logger.getLogger(Wst.class); + private static Logger log = Logger.getLogger(Wst.class); private Integer id; private River river; @@ -187,7 +187,7 @@ } if (results.get(0)[0] == null || results.get(0)[1] == null) { - logger.warn("Could not process result from min/maxQ query."); + log.warn("Could not process result from min/maxQ query."); return null; } @@ -219,7 +219,7 @@ Object[] mm = minmaxQ.get(0); if (mm[0] == null || mm[1] == null) { - logger.warn ("No min/max Q for km " + km + " found."); + log.warn ("No min/max Q for km " + km + " found."); return null; }