Mercurial > dive4elements > river
comparison flys-client/src/main/java/de/intevation/flys/client/client/ui/ParameterList.java @ 3719:e82acd5c86f7
Merged revisions 5495-5496,5509,5514-5515,5521-5526 via svnmerge from
file:///home/clients/bsh/bsh-generischer-viewer/Material/SVN/flys-client/trunk
........
r5495 | ingo | 2012-09-17 14:55:09 +0200 (Mo, 17 Sep 2012) | 1 line
Added missing i18n strings for minfo state description.
........
r5496 | ingo | 2012-09-17 15:47:43 +0200 (Mo, 17 Sep 2012) | 1 line
Tagged 'flys-client' as 2.9.1
........
r5509 | teichmann | 2012-09-18 17:54:37 +0200 (Di, 18 Sep 2012) | 1 line
Removed trailing whitespace.
........
r5514 | bricks | 2012-09-19 09:56:42 +0200 (Mi, 19 Sep 2012) | 2 lines
Add missing Changelog entry for r5472
........
r5515 | bricks | 2012-09-19 09:59:35 +0200 (Mi, 19 Sep 2012) | 2 lines
Implement a scrolling gauge info tree
........
r5521 | bricks | 2012-09-19 14:41:48 +0200 (Mi, 19 Sep 2012) | 2 lines
Add station info to the gauges
........
r5522 | bricks | 2012-09-19 14:43:43 +0200 (Mi, 19 Sep 2012) | 2 lines
Improve the handling of the GaugePanel in the ParameterList
........
r5523 | bricks | 2012-09-19 14:51:02 +0200 (Mi, 19 Sep 2012) | 4 lines
Improve the GaugePanel
Be locale aware and only load the gauge info if the river name changes.
........
r5524 | bricks | 2012-09-19 15:14:46 +0200 (Mi, 19 Sep 2012) | 5 lines
Fix a NullPointerException
When iterating over a list it must be checked if the reference to the list is
valid.
........
r5525 | bricks | 2012-09-19 15:16:24 +0200 (Mi, 19 Sep 2012) | 2 lines
Don't display the GaugePanel if no river is selected
........
r5526 | bricks | 2012-09-19 15:18:36 +0200 (Mi, 19 Sep 2012) | 2 lines
Use the wstunit from the river as unit for the Pegelnullpunkt
........
flys-client/tags/2.9.1@5528 c6561f87-3c4e-4783-a992-168aeb5c3f6f
| author | Ingo Weinzierl <ingo.weinzierl@intevation.de> |
|---|---|
| date | Wed, 19 Sep 2012 14:42:48 +0000 |
| parents | 4e33aa341e51 |
| children | 22cd60315e08 |
comparison
equal
deleted
inserted
replaced
| 3718:1598d324fbc2 | 3719:e82acd5c86f7 |
|---|---|
| 222 super.removeMembers(components); | 222 super.removeMembers(components); |
| 223 gaugeSection.setExpanded(false); | 223 gaugeSection.setExpanded(false); |
| 224 } | 224 } |
| 225 }; | 225 }; |
| 226 gaugePanel.setWidth100(); | 226 gaugePanel.setWidth100(); |
| 227 gaugePanel.setHeight("20%"); | 227 gaugePanel.setHeight100(); |
| 228 | 228 |
| 229 // This canvas is used to render helper widgets. | 229 // This canvas is used to render helper widgets. |
| 230 final SectionStackSection helperSection = new SectionStackSection(); | 230 final SectionStackSection helperSection = new SectionStackSection(); |
| 231 helperSection.setExpanded(false); | 231 helperSection.setExpanded(false); |
| 232 helperSection.setTitle(MSG.helperPanelTitle()); | 232 helperSection.setTitle(MSG.helperPanelTitle()); |
| 699 Canvas[] c = helperPanel.getMembers(); | 699 Canvas[] c = helperPanel.getMembers(); |
| 700 if (c != null && c.length > 0) { | 700 if (c != null && c.length > 0) { |
| 701 helperPanel.removeMembers(c); | 701 helperPanel.removeMembers(c); |
| 702 } | 702 } |
| 703 | 703 |
| 704 c = gaugePanel.getMembers(); | |
| 705 if (c != null && c.length > 0) { | |
| 706 gaugePanel.removeMembers(c); | |
| 707 } | |
| 708 | |
| 709 Artifact art = event.getNewValue(); | 704 Artifact art = event.getNewValue(); |
| 710 ArtifactDescription desc = art.getArtifactDescription(); | 705 ArtifactDescription desc = art.getArtifactDescription(); |
| 711 | 706 |
| 712 DataList currentData = desc.getCurrentData(); | 707 DataList currentData = desc.getCurrentData(); |
| 713 if (currentData != null) { | 708 if (currentData != null) { |
| 746 // we have reached a final state with no more user input | 741 // we have reached a final state with no more user input |
| 747 setCurrentData(null, null); | 742 setCurrentData(null, null); |
| 748 } | 743 } |
| 749 } | 744 } |
| 750 if (art instanceof WINFOArtifact) { | 745 if (art instanceof WINFOArtifact) { |
| 751 renderGaugeInfo(desc.getRiver()); | 746 String river = desc.getRiver(); |
| 752 gaugePanel.show(); | 747 if (river != null) { |
| 748 renderGaugeInfo(desc.getRiver()); | |
| 749 } | |
| 750 else { | |
| 751 gaugePanel.hide(); | |
| 752 } | |
| 753 } | 753 } |
| 754 | 754 |
| 755 addOldDatas( | 755 addOldDatas( |
| 756 desc.getOldData(), | 756 desc.getOldData(), |
| 757 event.getType() == ParameterChangeEvent.Type.BACK); | 757 event.getType() == ParameterChangeEvent.Type.BACK); |