Mercurial > dive4elements > river
diff artifacts/src/main/java/org/dive4elements/river/artifacts/states/WDifferencesState.java @ 8860:28df64078f27
Merge with 0862ea5d66baf60e7eee496d130a35157cc9ec12
author | gernotbelger |
---|---|
date | Fri, 19 Jan 2018 11:23:42 +0100 |
parents | 8c64617a7991 5e38e2924c07 |
children | 23264d1a528f |
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/states/WDifferencesState.java Thu Jan 18 18:34:41 2018 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/states/WDifferencesState.java Fri Jan 19 11:23:42 2018 +0100 @@ -110,7 +110,12 @@ * Access the data (wkms) of an artifact, coded in mingle. */ // FIXME: meanwhile used by several places outside this context; refactor into separate helper class to access waterlevels - public WKms getWKms(String mingle, CallContext context, double from, double to) { + public WKms getWKms( + String mingle, + CallContext context, + double from, + double to + ) { log.debug("WDifferencesState.getWKms " + mingle); String[] def = mingle.split(";"); String uuid = def[0]; @@ -121,7 +126,8 @@ context); if (d4eArtifact == null) { - log.warn("One of the artifacts (1) for diff calculation could not be loaded"); + log.warn("One of the artifacts (1) for diff calculation " + + "could not be loaded"); return null; } @@ -163,9 +169,10 @@ if (retval == null) { - log.error("Do not know how to handle (getWKms) minuend/subtrahend"); + log.error( + "Do not know how to handle (getWKms) minuend/subtrahend"); } else if (!Double.isNaN(from) && !Double.isNaN(to)) { - /* Filter out only the relevant data points for calulation results.*/ + /* Filter out only relevant data points for calulation results.*/ log.debug("Before filter: " + retval.size()); retval = retval.filteredKms(from, to); log.debug("After filter: " + retval.size()); @@ -199,7 +206,7 @@ double to = rangeAccess.getTo(true); // Load the Artifacts/facets that we want to subtract and display. // Expected format is: - // [42537f1e-3522-42ef-8968-635b03d8e9c6;longitudinal_section.w;0]#[1231f2-....] + //[42537f1e-3522-42ef-8968-635b03d8e9c6;longitudinal_section.w;0]#[...] String diffids = winfo.getDataAsString("diffids"); log.debug("WDifferencesState has: " + diffids); String datas[] = diffids.split("#");