Mercurial > dive4elements > river
diff artifacts/src/main/java/org/dive4elements/river/artifacts/states/WQSelect.java @ 8756:26dedebbe39f
(issue1801) Code cleanups
Remove one indirecton level around RiverUtils.getGauge and remove
the old and now unused determineGauge method.
| author | Andre Heinecke <andre.heinecke@intevation.de> |
|---|---|
| date | Wed, 24 Jun 2015 15:49:23 +0200 |
| parents | e4606eae8ea5 |
| children | bd17bd07db69 |
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/states/WQSelect.java Wed Jun 24 14:07:26 2015 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/states/WQSelect.java Wed Jun 24 15:49:23 2015 +0200 @@ -178,7 +178,7 @@ NumberFormat nf = NumberFormat.getInstance( Resources.getLocale(cc.getMeta())); - Gauge gauge = winfo.getGauge(); + Gauge gauge = RiverUtils.getGauge(winfo); boolean debug = log.isDebugEnabled(); @@ -401,7 +401,7 @@ protected double[] determineMinMaxW(Artifact artifact) { log.debug("WQSelect.determineCurrentGauge"); - Gauge gauge = ((WINFOArtifact) artifact).getGauge(); + Gauge gauge = RiverUtils.getGauge((WINFOArtifact) artifact); double[] minmaxW = gauge != null ? gauge.determineMinMaxW() : null; double minW = minmaxW != null ? minmaxW[0] : Double.MIN_VALUE; @@ -461,7 +461,7 @@ WINFOArtifact flysArtifact = (WINFOArtifact) artifact; River river = RiverUtils.getRiver(flysArtifact); - Gauge gauge = flysArtifact.getGauge(); + Gauge gauge = RiverUtils.getGauge(flysArtifact); Wst wst = WstFactory.getWst(river); double[] minmaxQ = gauge != null