Mercurial > dive4elements > river

comparison flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/SoundingsSelect.java @ 3785:a5f65e8983be

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merged revisions 5501-5502,5504-5508,5511-5513,5516-5519 via svnmerge from file:///home/clients/bsh/bsh-generischer-viewer/Material/SVN/flys-artifacts/trunk ........ r5501 | felix | 2012-09-18 11:49:45 +0200 (Di, 18 Sep 2012) | 1 line fix issue865 - missing showarea theme prop. ........ r5502 | clins | 2012-09-18 12:18:30 +0200 (Di, 18 Sep 2012) | 1 line Add robustness checks to prevent NPEs ........ r5504 | felix | 2012-09-18 14:03:15 +0200 (Di, 18 Sep 2012) | 1 line i18n for area label (fix issue487). ........ r5505 | clins | 2012-09-18 16:19:59 +0200 (Di, 18 Sep 2012) | 1 line Update themes to show point descriptions ........ r5506 | rrenkert | 2012-09-18 17:00:30 +0200 (Di, 18 Sep 2012) | 3 lines Removed incorrect characteristic diameter. ........ r5507 | rrenkert | 2012-09-18 17:03:20 +0200 (Di, 18 Sep 2012) | 3 lines Fixed some stupid bugs in bed quality data factory and calculation. ........ r5508 | teichmann | 2012-09-18 17:45:49 +0200 (Di, 18 Sep 2012) | 1 line The usual whitespace and import cleanups. ........ r5511 | teichmann | 2012-09-18 18:24:51 +0200 (Di, 18 Sep 2012) | 1 line Use generics aware Collections.emptyList(). ........ r5512 | teichmann | 2012-09-18 20:36:52 +0200 (Di, 18 Sep 2012) | 1 line Some more little steps towards "Auslagerung extremer Wasserspiegellagen". ........ r5513 | clins | 2012-09-18 23:38:19 +0200 (Di, 18 Sep 2012) | 1 line A and B facets of fix analyis are now deactivated by default ........ r5516 | bricks | 2012-09-19 10:45:51 +0200 (Mi, 19 Sep 2012) | 2 lines Add the gauge station to the GaugeOverviewInfoService xml response ........ r5517 | rrenkert | 2012-09-19 10:50:23 +0200 (Mi, 19 Sep 2012) | 3 lines Added CSV export to bed quality calculation. ........ r5518 | bricks | 2012-09-19 11:04:04 +0200 (Mi, 19 Sep 2012) | 2 lines Fix date in changelog entry ........ r5519 | teichmann | 2012-09-19 11:17:14 +0200 (Mi, 19 Sep 2012) | 1 line Removed trailing whitespace. ........ flys-artifacts/tags/2.9.1@5531 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author Ingo Weinzierl <ingo.weinzierl@intevation.de>
date Wed, 19 Sep 2012 14:58:31 +0000
parents 5d0419882382
children c79b98085096
comparison
equal deleted inserted replaced
3784:9f9d5ada96ca 3785:a5f65e8983be
73 double kmHi, 73 double kmHi,
74 List<KVP<String, String>> kvp 74 List<KVP<String, String>> kvp
75 ) { 75 ) {
76 List<BedHeightSingle> singles = 76 List<BedHeightSingle> singles =
77 BedHeightSingle.getBedHeightSingles(river, kmLo, kmHi); 77 BedHeightSingle.getBedHeightSingles(river, kmLo, kmHi);
78 78
79 if (singles != null) { 79 if (singles != null) {
80 int size = singles.size(); 80 int size = singles.size();
81 81
82 logger.debug("Found " + size + " singles."); 82 logger.debug("Found " + size + " singles.");
83 83
84 for (int i = 0; i < size; i++) { 84 for (int i = 0; i < size; i++) {
85 BedHeightSingle s = singles.get(i); 85 BedHeightSingle s = singles.get(i);
86 86
87 String id = PREFIX_SINGLE + s.getId(); 87 String id = PREFIX_SINGLE + s.getId();
88 String value = s.getDescription(); 88 String value = s.getDescription();
102 List<BedHeightEpoch> epochs = 102 List<BedHeightEpoch> epochs =
103 BedHeightEpoch.getBedHeightEpochs(river, kmLo, kmHi); 103 BedHeightEpoch.getBedHeightEpochs(river, kmLo, kmHi);
104 104
105 if (epochs != null) { 105 if (epochs != null) {
106 int size = epochs.size(); 106 int size = epochs.size();
107 107
108 logger.debug("Found " + size + " epochs."); 108 logger.debug("Found " + size + " epochs.");
109 109
110 for (int i = 0; i < size; i++) { 110 for (int i = 0; i < size; i++) {
111 BedHeightEpoch e = epochs.get(i); 111 BedHeightEpoch e = epochs.get(i);
112 112
113 String id = PREFIX_EPOCH + e.getId(); 113 String id = PREFIX_EPOCH + e.getId();
114 String value = e.getDescription(); 114 String value = e.getDescription();
http://dive4elements.wald.intevation.org