Mercurial > dive4elements > river
comparison artifacts/src/main/java/org/dive4elements/river/artifacts/states/SoundingsSelect.java @ 8559:6d8d7425a6b5
Bed heights are just bed heights since a while ('single' is obsolete).
author | "Tom Gottfried <tom@intevation.de>" |
---|---|
date | Mon, 16 Feb 2015 11:08:33 +0100 |
parents | e4606eae8ea5 |
children | 5e38e2924c07 |
comparison
equal
deleted
inserted
replaced
8558:d0ea092a32f5 | 8559:6d8d7425a6b5 |
---|---|
16 import org.dive4elements.artifacts.Artifact; | 16 import org.dive4elements.artifacts.Artifact; |
17 import org.dive4elements.artifacts.CallContext; | 17 import org.dive4elements.artifacts.CallContext; |
18 import org.dive4elements.artifacts.common.model.KVP; | 18 import org.dive4elements.artifacts.common.model.KVP; |
19 import org.dive4elements.artifacts.common.utils.XMLUtils; | 19 import org.dive4elements.artifacts.common.utils.XMLUtils; |
20 import org.dive4elements.artifacts.common.utils.XMLUtils.ElementCreator; | 20 import org.dive4elements.artifacts.common.utils.XMLUtils.ElementCreator; |
21 import org.dive4elements.river.model.BedHeightSingle; | 21 import org.dive4elements.river.model.BedHeight; |
22 import org.dive4elements.river.model.River; | 22 import org.dive4elements.river.model.River; |
23 import org.dive4elements.river.artifacts.D4EArtifact; | 23 import org.dive4elements.river.artifacts.D4EArtifact; |
24 import org.dive4elements.river.artifacts.resources.Resources; | 24 import org.dive4elements.river.artifacts.resources.Resources; |
25 import org.dive4elements.river.utils.Formatter; | 25 import org.dive4elements.river.utils.Formatter; |
26 import org.dive4elements.river.utils.RiverUtils; | 26 import org.dive4elements.river.utils.RiverUtils; |
118 double kmHi, | 118 double kmHi, |
119 ElementCreator creator, | 119 ElementCreator creator, |
120 Element select, | 120 Element select, |
121 CallContext context | 121 CallContext context |
122 ) { | 122 ) { |
123 List<BedHeightSingle> singles = | 123 List<BedHeight> singles = |
124 BedHeightSingle.getBedHeightSingles(river, kmLo, kmHi); | 124 BedHeight.getBedHeights(river, kmLo, kmHi); |
125 | 125 |
126 if (singles != null) { | 126 if (singles != null) { |
127 int size = singles.size(); | 127 int size = singles.size(); |
128 | 128 |
129 log.debug("Found " + size + " singles."); | 129 log.debug("Found " + size + " singles."); |
130 | 130 |
131 NumberFormat nf = Formatter.getCalculationKm(context.getMeta()); | 131 NumberFormat nf = Formatter.getCalculationKm(context.getMeta()); |
132 for (int i = 0; i < size; i++) { | 132 for (int i = 0; i < size; i++) { |
133 BedHeightSingle s = singles.get(i); | 133 BedHeight s = singles.get(i); |
134 | 134 |
135 String id = PREFIX_SINGLE + s.getId(); | 135 String id = PREFIX_SINGLE + s.getId(); |
136 String value = s.getDescription(); | 136 String value = s.getDescription(); |
137 | 137 |
138 Integer year = s.getYear(); | 138 Integer year = s.getYear(); |
202 | 202 |
203 | 203 |
204 protected String getLabelForSingle(CallContext cc, String value) { | 204 protected String getLabelForSingle(CallContext cc, String value) { |
205 String id = value.replace(PREFIX_SINGLE, ""); | 205 String id = value.replace(PREFIX_SINGLE, ""); |
206 try { | 206 try { |
207 BedHeightSingle s = BedHeightSingle.getBedHeightSingleById( | 207 BedHeight s = BedHeight.getBedHeightById( |
208 Integer.parseInt(id)); | 208 Integer.parseInt(id)); |
209 | 209 |
210 if (s != null) { | 210 if (s != null) { |
211 return s.getDescription(); | 211 return s.getDescription(); |
212 } | 212 } |