# HG changeset patch # User Tom Gottfried # Date 1515755384 -3600 # Node ID ff27548d078c11333f11c1e09b05fa8e7c4168c4 # Parent e8d2042c96399184988217b54c8f15aeeb89b19b Whitespace cosmetics. diff -r e8d2042c9639 -r ff27548d078c backend/src/main/java/org/dive4elements/river/backend/utils/DBCPConnectionProvider.java --- a/backend/src/main/java/org/dive4elements/river/backend/utils/DBCPConnectionProvider.java Fri Jan 12 12:04:05 2018 +0100 +++ b/backend/src/main/java/org/dive4elements/river/backend/utils/DBCPConnectionProvider.java Fri Jan 12 12:09:44 2018 +0100 @@ -168,7 +168,8 @@ } // Copy all DBCP properties removing the prefix - for (Iterator iter = props.entrySet().iterator() ; iter.hasNext() ;) { + for (Iterator iter = props.entrySet().iterator(); + iter.hasNext(); ) { Map.Entry entry = (Map.Entry)iter.next(); String key = (String)entry.getKey(); if (key.startsWith(PREFIX)) { diff -r e8d2042c9639 -r ff27548d078c backend/src/main/java/org/dive4elements/river/importer/Config.java --- a/backend/src/main/java/org/dive4elements/river/importer/Config.java Fri Jan 12 12:04:05 2018 +0100 +++ b/backend/src/main/java/org/dive4elements/river/importer/Config.java Fri Jan 12 12:09:44 2018 +0100 @@ -109,7 +109,7 @@ public static final Config INSTANCE = new Config(); - private Config () { + private Config() { } public static final boolean getFlag(String key) { diff -r e8d2042c9639 -r ff27548d078c backend/src/main/java/org/dive4elements/river/importer/ImportSedimentLoad.java --- a/backend/src/main/java/org/dive4elements/river/importer/ImportSedimentLoad.java Fri Jan 12 12:04:05 2018 +0100 +++ b/backend/src/main/java/org/dive4elements/river/importer/ImportSedimentLoad.java Fri Jan 12 12:09:44 2018 +0100 @@ -33,7 +33,7 @@ this.values = new ArrayList(); } - public ImportSedimentLoad ( + public ImportSedimentLoad( ImportGrainFraction grainFraction, ImportTimeInterval timeInterval, ImportTimeInterval sqTimeInterval, diff -r e8d2042c9639 -r ff27548d078c backend/src/main/java/org/dive4elements/river/model/BedHeight.java --- a/backend/src/main/java/org/dive4elements/river/model/BedHeight.java Fri Jan 12 12:04:05 2018 +0100 +++ b/backend/src/main/java/org/dive4elements/river/model/BedHeight.java Fri Jan 12 12:09:44 2018 +0100 @@ -121,7 +121,7 @@ } @OneToOne - @JoinColumn(name = "river_id" ) + @JoinColumn(name = "river_id") public River getRiver() { return river; } diff -r e8d2042c9639 -r ff27548d078c backend/src/main/java/org/dive4elements/river/model/BedHeightValue.java --- a/backend/src/main/java/org/dive4elements/river/model/BedHeightValue.java Fri Jan 12 12:04:05 2018 +0100 +++ b/backend/src/main/java/org/dive4elements/river/model/BedHeightValue.java Fri Jan 12 12:09:44 2018 +0100 @@ -86,7 +86,7 @@ } @OneToOne - @JoinColumn(name = "bed_height_id" ) + @JoinColumn(name = "bed_height_id") public BedHeight getBedHeight() { return bedHeight; } diff -r e8d2042c9639 -r ff27548d078c backend/src/main/java/org/dive4elements/river/model/DischargeTable.java --- a/backend/src/main/java/org/dive4elements/river/model/DischargeTable.java Fri Jan 12 12:04:05 2018 +0100 +++ b/backend/src/main/java/org/dive4elements/river/model/DischargeTable.java Fri Jan 12 12:09:44 2018 +0100 @@ -82,7 +82,7 @@ } @OneToOne - @JoinColumn(name = "gauge_id" ) + @JoinColumn(name = "gauge_id") public Gauge getGauge() { return gauge; } @@ -119,7 +119,7 @@ } @OneToOne - @JoinColumn(name = "time_interval_id" ) + @JoinColumn(name = "time_interval_id") public TimeInterval getTimeInterval() { return timeInterval; } diff -r e8d2042c9639 -r ff27548d078c backend/src/main/java/org/dive4elements/river/model/DischargeTableValue.java --- a/backend/src/main/java/org/dive4elements/river/model/DischargeTableValue.java Fri Jan 12 12:04:05 2018 +0100 +++ b/backend/src/main/java/org/dive4elements/river/model/DischargeTableValue.java Fri Jan 12 12:09:44 2018 +0100 @@ -61,7 +61,7 @@ } @OneToOne - @JoinColumn(name = "table_id" ) + @JoinColumn(name = "table_id") public DischargeTable getDischargeTable() { return dischargeTable; } diff -r e8d2042c9639 -r ff27548d078c backend/src/main/java/org/dive4elements/river/model/DischargeZone.java --- a/backend/src/main/java/org/dive4elements/river/model/DischargeZone.java Fri Jan 12 12:04:05 2018 +0100 +++ b/backend/src/main/java/org/dive4elements/river/model/DischargeZone.java Fri Jan 12 12:09:44 2018 +0100 @@ -86,7 +86,7 @@ } @OneToOne - @JoinColumn(name = "river_id" ) + @JoinColumn(name = "river_id") public River getRiver() { return river; } diff -r e8d2042c9639 -r ff27548d078c backend/src/main/java/org/dive4elements/river/model/SQRelationValue.java --- a/backend/src/main/java/org/dive4elements/river/model/SQRelationValue.java Fri Jan 12 12:04:05 2018 +0100 +++ b/backend/src/main/java/org/dive4elements/river/model/SQRelationValue.java Fri Jan 12 12:09:44 2018 +0100 @@ -161,7 +161,7 @@ } @Column(name = "ntot") - public Integer getNTot () { + public Integer getNTot() { return nTot; } diff -r e8d2042c9639 -r ff27548d078c backend/src/main/java/org/dive4elements/river/model/Wst.java --- a/backend/src/main/java/org/dive4elements/river/model/Wst.java Fri Jan 12 12:04:05 2018 +0100 +++ b/backend/src/main/java/org/dive4elements/river/model/Wst.java Fri Jan 12 12:09:44 2018 +0100 @@ -219,7 +219,7 @@ Object[] mm = minmaxQ.get(0); if (mm[0] == null || mm[1] == null) { - log.warn ("No min/max Q for km " + km + " found."); + log.warn("No min/max Q for km " + km + " found."); return null; }