Mercurial > dive4elements > river
comparison artifacts/src/main/java/org/dive4elements/river/artifacts/model/Calculation6.java @ 7261:a56fe3bc6700
Refactoring: Let RiverAccess.getRiver return an River.
Renamed getRiver in getRiverName. Update Callers.
author | Felix Wolfsteller <felix.wolfsteller@intevation.de> |
---|---|
date | Tue, 08 Oct 2013 14:50:58 +0200 |
parents | fe03337c8011 |
children | b8f343230eab |
comparison
equal
deleted
inserted
replaced
7260:0b32f8980fed | 7261:a56fe3bc6700 |
---|---|
44 EvaluationMode mode = access.getEvaluationMode(); | 44 EvaluationMode mode = access.getEvaluationMode(); |
45 Timerange tr = access.getEvaluationTimerange(); | 45 Timerange tr = access.getEvaluationTimerange(); |
46 double [] vs = mode != null && mode == EvaluationMode.W | 46 double [] vs = mode != null && mode == EvaluationMode.W |
47 ? access.getWs() | 47 ? access.getWs() |
48 : access.getQs(); | 48 : access.getQs(); |
49 riverName = access.getRiver(); | 49 riverName = access.getRiverName(); |
50 | 50 |
51 Long officialGaugeNumber = access.getOfficialGaugeNumber(); | 51 Long officialGaugeNumber = access.getOfficialGaugeNumber(); |
52 | 52 |
53 if (mode == null) { | 53 if (mode == null) { |
54 // TODO: i18n | 54 // TODO: i18n |