Mercurial > dive4elements > river
comparison artifacts/src/main/java/org/dive4elements/river/artifacts/WINFOArtifact.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 | bd17bd07db69 |
comparison
equal
deleted
inserted
replaced
| 8755:30b1ddadf275 | 8756:26dedebbe39f |
|---|---|
| 317 | 317 |
| 318 if (r == null) { | 318 if (r == null) { |
| 319 return error(null, "no.river.selected"); | 319 return error(null, "no.river.selected"); |
| 320 } | 320 } |
| 321 | 321 |
| 322 Gauge g = getGauge(); | 322 Gauge g = RiverUtils.getGauge(this); |
| 323 | 323 |
| 324 if (g == null) { | 324 if (g == null) { |
| 325 return error(null, "no.gauge.selected"); | 325 return error(null, "no.gauge.selected"); |
| 326 } | 326 } |
| 327 | 327 |
| 857 return result; | 857 return result; |
| 858 } | 858 } |
| 859 | 859 |
| 860 | 860 |
| 861 /** | 861 /** |
| 862 * Returns the gauge based on the current distance and river. | |
| 863 * | |
| 864 * @return the gauge. | |
| 865 */ | |
| 866 public Gauge getGauge() { | |
| 867 return RiverUtils.getGauge(this); | |
| 868 } | |
| 869 | |
| 870 | |
| 871 | |
| 872 | |
| 873 /** | |
| 874 * This method returns the Q values. | 862 * This method returns the Q values. |
| 875 * | 863 * |
| 876 * @return the selected Q values or null, if no Q values are selected. | 864 * @return the selected Q values or null, if no Q values are selected. |
| 877 */ | 865 */ |
| 878 public double[] getQs() { | 866 public double[] getQs() { |