Mercurial > dive4elements > river
comparison artifacts/src/main/java/org/dive4elements/river/artifacts/states/SoundingsSelect.java @ 7833:f97162606fa2 minfo-opt
Avoid NPE in sounding select state if no year is set for bed heights.
| author | Raimund Renkert <rrenkert@intevation.de> |
|---|---|
| date | Thu, 03 Apr 2014 14:01:01 +0200 |
| parents | c053b2d813f9 |
| children | b320826b1183 |
comparison
equal
deleted
inserted
replaced
| 7832:1dbd4668e8ef | 7833:f97162606fa2 |
|---|---|
| 120 BedHeightSingle s = singles.get(i); | 120 BedHeightSingle s = singles.get(i); |
| 121 | 121 |
| 122 String id = PREFIX_SINGLE + s.getId(); | 122 String id = PREFIX_SINGLE + s.getId(); |
| 123 String value = s.getDescription(); | 123 String value = s.getDescription(); |
| 124 | 124 |
| 125 Integer year = s.getYear(); | |
| 125 Element item = creator.create("item"); | 126 Element item = creator.create("item"); |
| 126 creator.addAttr(item, "label", value, true); | 127 creator.addAttr(item, "label", value, true); |
| 127 creator.addAttr(item, "value", id, true); | 128 creator.addAttr(item, "value", id, true); |
| 128 creator.addAttr(item, "year", s.getYear().toString()); | 129 creator.addAttr(item, "year", |
| 130 year != null ? s.getYear().toString() : ""); | |
| 129 creator.addAttr(item, "type", s.getType().getName()); | 131 creator.addAttr(item, "type", s.getType().getName()); |
| 130 creator.addAttr(item, "range", | 132 creator.addAttr(item, "range", |
| 131 nf.format(s.getRange().getA()) + | 133 nf.format(s.getRange().getA()) + |
| 132 " - " + | 134 " - " + |
| 133 nf.format(s.getRange().getB())); | 135 nf.format(s.getRange().getB())); |