Mercurial > dive4elements > river
comparison flys-client/src/main/java/de/intevation/flys/client/client/ui/WQInputPanel.java @ 1275:ca2d5bcf67a3
Bugfix: #111 Reset the values of WQ range mode if single mode is selected and the other way arround.
flys-client/trunk@2851 c6561f87-3c4e-4783-a992-168aeb5c3f6f
| author | Ingo Weinzierl <ingo.weinzierl@intevation.de> |
|---|---|
| date | Wed, 28 Sep 2011 09:26:36 +0000 |
| parents | 2c8f1112be37 |
| children | 393e5d37d85d |
comparison
equal
deleted
inserted
replaced
| 1274:f76c90b3086f | 1275:ca2d5bcf67a3 |
|---|---|
| 746 else { | 746 else { |
| 747 saveSingleQValues(form); | 747 saveSingleQValues(form); |
| 748 } | 748 } |
| 749 } | 749 } |
| 750 | 750 |
| 751 return new Data[] { | 751 return getSingleData(); |
| 752 getDataMode(), | |
| 753 getQMode(), | |
| 754 getDataSelectionMode(), | |
| 755 getDataSingle() }; | |
| 756 } | 752 } |
| 757 else { | 753 else { |
| 758 Canvas member = container.getMember(0); | 754 Canvas member = container.getMember(0); |
| 759 if (member instanceof DoubleRangePanel) { | 755 if (member instanceof DoubleRangePanel) { |
| 760 DoubleRangePanel form = (DoubleRangePanel) member; | 756 DoubleRangePanel form = (DoubleRangePanel) member; |
| 765 else { | 761 else { |
| 766 saveRangeQValues(form); | 762 saveRangeQValues(form); |
| 767 } | 763 } |
| 768 } | 764 } |
| 769 | 765 |
| 770 return new Data[] { | 766 return getRangeData(); |
| 767 } | |
| 768 } | |
| 769 | |
| 770 | |
| 771 /** | |
| 772 * Collects the required data for single mode and resets the data for range | |
| 773 * mode. | |
| 774 */ | |
| 775 protected Data[] getSingleData() { | |
| 776 DataItem from = new DefaultDataItem("wq_from", "wq_from", ""); | |
| 777 DataItem to = new DefaultDataItem("wq_to", "wq_to", ""); | |
| 778 DataItem step = new DefaultDataItem("wq_step", "wq_step", ""); | |
| 779 | |
| 780 return new Data[] { | |
| 781 getDataMode(), | |
| 782 getQMode(), | |
| 783 getDataSelectionMode(), | |
| 784 getDataSingle(), | |
| 785 new DefaultData( | |
| 786 "wq_from", | |
| 787 null, | |
| 788 null, | |
| 789 new DataItem[] {from}), | |
| 790 new DefaultData( | |
| 791 "wq_to", | |
| 792 null, | |
| 793 null, | |
| 794 new DataItem[] {to}), | |
| 795 new DefaultData( | |
| 796 "wq_step", | |
| 797 null, | |
| 798 null, | |
| 799 new DataItem[] {step}) }; | |
| 800 } | |
| 801 | |
| 802 | |
| 803 /** | |
| 804 * Collects the required data for range mode and resets the data for single | |
| 805 * mode. | |
| 806 */ | |
| 807 protected Data[] getRangeData() { | |
| 808 DataItem item = new DefaultDataItem("wq_single", "wq_single", ""); | |
| 809 | |
| 810 return new Data[] { | |
| 771 getDataMode(), | 811 getDataMode(), |
| 772 getQMode(), | 812 getQMode(), |
| 773 getDataSelectionMode(), | 813 getDataSelectionMode(), |
| 774 getDataFrom(), | 814 getDataFrom(), |
| 775 getDataTo(), | 815 getDataTo(), |
| 776 getDataStep() }; | 816 getDataStep(), |
| 777 } | 817 new DefaultData( |
| 818 "wq_single", | |
| 819 null, | |
| 820 null, | |
| 821 new DataItem[] {item}) }; | |
| 778 } | 822 } |
| 779 | 823 |
| 780 | 824 |
| 781 /** | 825 /** |
| 782 * Returns the Data object for the 'mode' attribute. | 826 * Returns the Data object for the 'mode' attribute. |