Mercurial > dive4elements > river
changeset 7248:1dff8e71c4d6
Removed trailing whitespace.
| author | Sascha L. Teichmann <teichmann@intevation.de> |
|---|---|
| date | Sat, 05 Oct 2013 12:13:14 +0200 |
| parents | 720c5bbe2a16 |
| children | b5e0b28c1516 |
| files | artifacts/src/main/java/org/dive4elements/river/artifacts/datacage/templating/FunctionResolver.java artifacts/src/main/java/org/dive4elements/river/artifacts/model/LinearInterpolated.java artifacts/src/main/java/org/dive4elements/river/artifacts/model/OfficialLineFinder.java artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/SedimentLoadFactory.java artifacts/src/main/java/org/dive4elements/river/artifacts/model/sq/SQRelationCalculation.java artifacts/src/main/java/org/dive4elements/river/exports/DiagramGenerator.java |
| diffstat | 6 files changed, 8 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/datacage/templating/FunctionResolver.java Sat Oct 05 12:06:25 2013 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/datacage/templating/FunctionResolver.java Sat Oct 05 12:13:14 2013 +0200 @@ -165,7 +165,7 @@ Object stateId = args.get(1); return artifactName instanceof String - && stateId instanceof String + && stateId instanceof String ? allStateSuccessors((String)artifactName, (String)stateId) : Collections.<String>emptySet(); } @@ -253,7 +253,7 @@ Object locations = args.get(1); Object from = args.get(2); - if ((mode instanceof String && mode.equals("location")) || + if ((mode instanceof String && mode.equals("location")) || (locations instanceof String && !((String)locations).isEmpty())) { if (!(locations instanceof String)) { return -FAR_AWAY;
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/LinearInterpolated.java Sat Oct 05 12:06:25 2013 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/LinearInterpolated.java Sat Oct 05 12:13:14 2013 +0200 @@ -161,7 +161,7 @@ } public LinearInterpolated sub( - LinearInterpolated other, + LinearInterpolated other, double from, double to ) { @@ -169,7 +169,7 @@ } public LinearInterpolated max( - LinearInterpolated other, + LinearInterpolated other, double from, double to ) {
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/OfficialLineFinder.java Sat Oct 05 12:06:25 2013 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/OfficialLineFinder.java Sat Oct 05 12:13:14 2013 +0200 @@ -53,7 +53,7 @@ public ValueRange( double start, - double end, + double end, double value, int wstId, int columnPos,
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/SedimentLoadFactory.java Sat Oct 05 12:06:25 2013 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/SedimentLoadFactory.java Sat Oct 05 12:13:14 2013 +0200 @@ -450,7 +450,7 @@ String fraction = (String) row[3]; - TreeMap<Double,MeasurementStation> relevantStations = + TreeMap<Double,MeasurementStation> relevantStations = fraction.equals("suspended_sediment") /* || TODO clarify: fraction.equals("susp_sand") */ ? suspStations : floatStations;
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/sq/SQRelationCalculation.java Sat Oct 05 12:06:25 2013 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/sq/SQRelationCalculation.java Sat Oct 05 12:13:14 2013 +0200 @@ -416,7 +416,7 @@ if (bP == -1 || mP == -1 || aO == -1 || bO == -1) { log.error("index not found: " - + bP + " " + mP + " " + + bP + " " + mP + " " + aO + " " + bO); return coeffs; }
--- a/artifacts/src/main/java/org/dive4elements/river/exports/DiagramGenerator.java Sat Oct 05 12:06:25 2013 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/exports/DiagramGenerator.java Sat Oct 05 12:13:14 2013 +0200 @@ -73,7 +73,7 @@ * * This class is the glue between output processors and facets. * The generator creates one diagram and calls the appropiate - * processors for the state and + * processors for the state and * * With respect to datasets, ranges and axis, there are following requirements: * <ul>