comparison artifacts/src/main/java/org/dive4elements/river/artifacts/model/sq/MeasurementFactory.java @ 8856:5e38e2924c07 3.2.x

Fix code style.
author Tom Gottfried <tom@intevation.de>
date Thu, 18 Jan 2018 20:12:01 +0100
parents 2e11fc7f5d35
children 0a5239a1e46e
comparison
equal deleted inserted replaced
8855:d7c005e12af0 8856:5e38e2924c07
39 public class MeasurementFactory 39 public class MeasurementFactory
40 { 40 {
41 private static final Logger log = 41 private static final Logger log =
42 Logger.getLogger(MeasurementFactory.class); 42 Logger.getLogger(MeasurementFactory.class);
43 43
44 public static final String MINFO_DUMP_SQ_SEDDB_PREFIX = "minfo.dump.sq.seddb.prefix"; 44 public static final String MINFO_DUMP_SQ_SEDDB_PREFIX =
45 "minfo.dump.sq.seddb.prefix";
45 46
46 public static final String SQL_TOTALS = 47 public static final String SQL_TOTALS =
47 "SELECT " + 48 "SELECT " +
48 "m.Q_BPEGEL AS Q_BPEGEL,"+ 49 "m.Q_BPEGEL AS Q_BPEGEL,"+
49 "m.TSCHWEB AS TSCHWEB," + 50 "m.TSCHWEB AS TSCHWEB," +
124 125
125 private static final int index(String s) { 126 private static final int index(String s) {
126 return Integer.parseInt(s.substring(s.length()-2))-1; 127 return Integer.parseInt(s.substring(s.length()-2))-1;
127 } 128 }
128 129
129 public abstract static class CSVTransformer extends BasicTransformerAdapter { 130 public abstract static class CSVTransformer
131 extends BasicTransformerAdapter
132 {
130 private static final long serialVersionUID = 1L; 133 private static final long serialVersionUID = 1L;
131 134
132 private CSVWriter rawWriter; 135 private CSVWriter rawWriter;
133 private boolean metaDataWritten; 136 private boolean metaDataWritten;
134 137
290 293
291 CSVWriter csvWriter = 294 CSVWriter csvWriter =
292 getCVSWriter("totals", river, location, dateRange); 295 getCVSWriter("totals", river, location, dateRange);
293 296
294 try { 297 try {
295 TotalsTransformer totalTransformer = new TotalsTransformer(csvWriter); 298 TotalsTransformer totalTransformer =
299 new TotalsTransformer(csvWriter);
296 query.setResultTransformer(totalTransformer); 300 query.setResultTransformer(totalTransformer);
297 301
298 return (List<Measurement>)query.list(); 302 return (List<Measurement>)query.list();
299 } 303 }
300 finally { 304 finally {
477 } 481 }
478 482
479 return accumulated; 483 return accumulated;
480 } 484 }
481 485
482 protected static List<Measurement> separateByDate(List<Measurement> measurements) { 486 protected static List<Measurement> separateByDate(
483 487 List<Measurement> measurements
488 ) {
484 List<Measurement> result = new ArrayList<Measurement>(); 489 List<Measurement> result = new ArrayList<Measurement>();
485 490
486 List<Measurement> same = new ArrayList<Measurement>(); 491 List<Measurement> same = new ArrayList<Measurement>();
487 492
488 Date lastDate = null; 493 Date lastDate = null;
506 511
507 return result; 512 return result;
508 } 513 }
509 514
510 515
511 protected static Measurement processSameDate(List<Measurement> measurements) { 516 protected static Measurement processSameDate(
517 List<Measurement> measurements
518 ) {
512 int N = measurements.size(); 519 int N = measurements.size();
513 520
514 boolean debug = log.isDebugEnabled(); 521 boolean debug = log.isDebugEnabled();
515 if (debug && N > 0) { 522 if (debug && N > 0) {
516 log.debug("process same date for Q: " + measurements.get(0).Q()); 523 log.debug("process same date for Q: " + measurements.get(0).Q());

http://dive4elements.wald.intevation.org