Mercurial > dive4elements > river
comparison artifacts/src/main/java/org/dive4elements/river/utils/RiverUtils.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 | 30b1ddadf275 |
| children | 9483a5bf4219 |
comparison
equal
deleted
inserted
replaced
| 8755:30b1ddadf275 | 8756:26dedebbe39f |
|---|---|
| 522 double v; | 522 double v; |
| 523 | 523 |
| 524 try { | 524 try { |
| 525 v = Double.valueOf(parts[1]); | 525 v = Double.valueOf(parts[1]); |
| 526 | 526 |
| 527 namedMainValue = getNamedMainValue(winfo.getGauge(), v); | 527 namedMainValue = getNamedMainValue(getGauge(winfo), v); |
| 528 } | 528 } |
| 529 catch (NumberFormatException nfe) { | 529 catch (NumberFormatException nfe) { |
| 530 log.warn("Cannot parse Double of: '" + parts[1] + "'"); | 530 log.warn("Cannot parse Double of: '" + parts[1] + "'"); |
| 531 return name; | 531 return name; |
| 532 } | 532 } |
| 564 double v; | 564 double v; |
| 565 | 565 |
| 566 try { | 566 try { |
| 567 v = Double.valueOf(parts[1]); | 567 v = Double.valueOf(parts[1]); |
| 568 | 568 |
| 569 namedMainValue = getNamedMainValue(winfo.getGauge(), v); | 569 namedMainValue = getNamedMainValue(getGauge(winfo), v); |
| 570 } | 570 } |
| 571 catch (NumberFormatException nfe) { | 571 catch (NumberFormatException nfe) { |
| 572 log.warn("Cannot parse Double of: '" + parts[1] + "'"); | 572 log.warn("Cannot parse Double of: '" + parts[1] + "'"); |
| 573 return name; | 573 return name; |
| 574 } | 574 } |
| 603 | 603 |
| 604 if (wqmode != WQ_MODE.QGAUGE) { | 604 if (wqmode != WQ_MODE.QGAUGE) { |
| 605 return null; | 605 return null; |
| 606 } | 606 } |
| 607 else { | 607 else { |
| 608 return getNamedMainValue(winfo.getGauge(), value); | 608 return getNamedMainValue(getGauge(winfo), value); |
| 609 } | 609 } |
| 610 } | 610 } |
| 611 | 611 |
| 612 | 612 |
| 613 public static String getNamedMainValue(Gauge gauge, double value) { | 613 public static String getNamedMainValue(Gauge gauge, double value) { |