Mercurial > dive4elements > river
comparison flys-artifacts/src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java @ 1102:7bd514eb4b2c
Commit accidentally omitted result of refactoring (WINFO/FLYSUtils/getRiver).
flys-artifacts/trunk@2605 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author | Felix Wolfsteller <felix.wolfsteller@intevation.de> |
---|---|
date | Mon, 29 Aug 2011 09:11:15 +0000 |
parents | f465785ed1ae |
children | eaf32c767bac |
comparison
equal
deleted
inserted
replaced
1101:82798c992975 | 1102:7bd514eb4b2c |
---|---|
290 */ | 290 */ |
291 public CalculationResult getWaterlevelData() | 291 public CalculationResult getWaterlevelData() |
292 { | 292 { |
293 logger.debug("WINFOArtifact.getWaterlevelData"); | 293 logger.debug("WINFOArtifact.getWaterlevelData"); |
294 | 294 |
295 River river = getRiver(); | 295 River river = FLYSUtils.getRiver(this); |
296 if (river == null) { | 296 if (river == null) { |
297 return error(new WQKms[0], "No river selected."); | 297 return error(new WQKms[0], "No river selected."); |
298 } | 298 } |
299 | 299 |
300 double[] kms = getKms(); | 300 double[] kms = getKms(); |
380 * @return the data computed by a duration curve computation. | 380 * @return the data computed by a duration curve computation. |
381 */ | 381 */ |
382 public CalculationResult getDurationCurveData() { | 382 public CalculationResult getDurationCurveData() { |
383 logger.debug("WINFOArtifact.getDurationCurveData"); | 383 logger.debug("WINFOArtifact.getDurationCurveData"); |
384 | 384 |
385 River r = getRiver(); | 385 River r = FLYSUtils.getRiver(this); |
386 | 386 |
387 if (r == null) { | 387 if (r == null) { |
388 return error(null, "Cannot determine river."); | 388 return error(null, "Cannot determine river."); |
389 } | 389 } |
390 | 390 |
439 * Returns the data that is used to create discharge curves. | 439 * Returns the data that is used to create discharge curves. |
440 * | 440 * |
441 */ | 441 */ |
442 public CalculationResult getDischargeCurveData() { | 442 public CalculationResult getDischargeCurveData() { |
443 | 443 |
444 River river = getRiver(); | 444 River river = FLYSUtils.getRiver(this); |
445 if (river == null) { | 445 if (river == null) { |
446 return error(new WQKms[0], "no river found"); | 446 return error(new WQKms[0], "no river found"); |
447 } | 447 } |
448 | 448 |
449 double [] distance = FLYSUtils.getKmRange(this); | 449 double [] distance = FLYSUtils.getKmRange(this); |
495 public CalculationResult getComputedDischargeCurveData() | 495 public CalculationResult getComputedDischargeCurveData() |
496 throws NullPointerException | 496 throws NullPointerException |
497 { | 497 { |
498 logger.debug("WINFOArtifact.getComputedDischargeCurveData"); | 498 logger.debug("WINFOArtifact.getComputedDischargeCurveData"); |
499 | 499 |
500 River r = getRiver(); | 500 River r = FLYSUtils.getRiver(this); |
501 | 501 |
502 if (r == null) { | 502 if (r == null) { |
503 return error(new WQKms[0], "Cannot determine river."); | 503 return error(new WQKms[0], "Cannot determine river."); |
504 } | 504 } |
505 | 505 |
550 */ | 550 */ |
551 public CalculationResult getDischargeLongitudinalSectionData() { | 551 public CalculationResult getDischargeLongitudinalSectionData() { |
552 | 552 |
553 logger.debug("WINFOArtifact.getDischargeLongitudinalSectionData"); | 553 logger.debug("WINFOArtifact.getDischargeLongitudinalSectionData"); |
554 | 554 |
555 River river = getRiver(); | 555 River river = FLYSUtils.getRiver(this); |
556 if (river == null) { | 556 if (river == null) { |
557 logger.debug("No river selected."); | 557 logger.debug("No river selected."); |
558 return error(new WQKms[0], "No river selected."); | 558 return error(new WQKms[0], "No river selected."); |
559 } | 559 } |
560 | 560 |
612 | 612 |
613 if (debug) { | 613 if (debug) { |
614 logger.debug("FLYSArtifact.getQsForWs"); | 614 logger.debug("FLYSArtifact.getQsForWs"); |
615 } | 615 } |
616 | 616 |
617 River r = getRiver(); | 617 River r = FLYSUtils.getRiver(this); |
618 if (r == null) { | 618 if (r == null) { |
619 logger.warn("no river found"); | 619 logger.warn("no river found"); |
620 return null; | 620 return null; |
621 } | 621 } |
622 | 622 |
654 } | 654 } |
655 | 655 |
656 return qs; | 656 return qs; |
657 } | 657 } |
658 | 658 |
659 /** | |
660 * Returns the selected River object based on the 'river' data that might | |
661 * have been inserted by the user. | |
662 * | |
663 * @return the selected River or null if no river has been chosen yet. | |
664 */ | |
665 public River getRiver() { | |
666 StateData dRiver = getData("river"); | |
667 | |
668 return dRiver != null | |
669 ? RiverFactory.getRiver((String) dRiver.getValue()) | |
670 : null; | |
671 } | |
672 | 659 |
673 /** | 660 /** |
674 * Determines the selected mode of distance/range input. | 661 * Determines the selected mode of distance/range input. |
675 * | 662 * |
676 * @return true, if the range mode is selected otherwise false. | 663 * @return true, if the range mode is selected otherwise false. |
784 * Returns the gauge based on the current distance and river. | 771 * Returns the gauge based on the current distance and river. |
785 * | 772 * |
786 * @return the gauge. | 773 * @return the gauge. |
787 */ | 774 */ |
788 public Gauge getGauge() { | 775 public Gauge getGauge() { |
789 River river = getRiver(); | 776 River river = FLYSUtils.getRiver(this); |
790 | 777 |
791 if (river == null) { | 778 if (river == null) { |
792 logger.debug("no river found"); | 779 logger.debug("no river found"); |
793 return null; | 780 return null; |
794 } | 781 } |
820 * | 807 * |
821 * @return the gauges based on the selected kilometer range. | 808 * @return the gauges based on the selected kilometer range. |
822 */ | 809 */ |
823 public List<Gauge> getGauges() { | 810 public List<Gauge> getGauges() { |
824 | 811 |
825 River river = getRiver(); | 812 River river = FLYSUtils.getRiver(this); |
826 if (river == null) { | 813 if (river == null) { |
827 return null; | 814 return null; |
828 } | 815 } |
829 | 816 |
830 double [] dist = FLYSUtils.getKmRange(this); | 817 double [] dist = FLYSUtils.getKmRange(this); |
831 if (dist == null) { | 818 if (dist == null) { |
832 return null; | 819 return null; |
833 } | 820 } |
834 | 821 |
835 return river.determineGauges(dist[0], dist[1]); | 822 return river.determineGauges(dist[0], dist[1]); |