Mercurial > dive4elements > river
diff artifacts/src/main/java/org/dive4elements/river/artifacts/states/GaugeDischargeState.java @ 8860:28df64078f27
Merge with 0862ea5d66baf60e7eee496d130a35157cc9ec12
author | gernotbelger |
---|---|
date | Fri, 19 Jan 2018 11:23:42 +0100 |
parents | 5e38e2924c07 |
children | 0a5239a1e46e |
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/states/GaugeDischargeState.java Thu Jan 18 18:34:41 2018 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/states/GaugeDischargeState.java Fri Jan 19 11:23:42 2018 +0100 @@ -70,7 +70,8 @@ Date stopTime = validity.getStopTime(); String name = Resources.getMsg( meta, - "chart.discharge.curve.model" + (stopTime != null ? "" : ".nostop"), + "chart.discharge.curve.model" + + (stopTime != null ? "" : ".nostop"), new Object[] {gauge.getName(), validity.getStartTime(), stopTime @@ -126,7 +127,8 @@ ) { if (artifact instanceof GaugeDischargeArtifact) { log.debug("GaugeDischargeState.computeAdvance()"); - GaugeDischargeArtifact dischargeArtifact = (GaugeDischargeArtifact) artifact; + GaugeDischargeArtifact dischargeArtifact = + (GaugeDischargeArtifact)artifact; CalculationResult res; @@ -141,7 +143,8 @@ WQKms[] wqkms = (WQKms[]) res.getData(); if (wqkms != null && facets != null) { - log.debug("GaugeDischargeState.computeAdvance(): create facets"); + log.debug( + "GaugeDischargeState.computeAdvance(): create facets"); GaugeDischargeFacet facet = new GaugeDischargeFacet( 0, @@ -156,9 +159,11 @@ } else { if (wqkms == null) - log.debug("GaugeDischargeState.computeAdvance(): wqkms 0"); + log.debug( + "GaugeDischargeState.computeAdvance(): wqkms 0"); else - log.debug("GaugeDischargeState.computeAdvance(): facets 0"); + log.debug( + "GaugeDischargeState.computeAdvance(): facets 0"); } return res;