Mercurial > dive4elements > river
diff 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 |
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/states/SoundingsSelect.java Mon Feb 16 10:12:12 2015 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/states/SoundingsSelect.java Mon Feb 16 11:08:33 2015 +0100 @@ -18,7 +18,7 @@ import org.dive4elements.artifacts.common.model.KVP; import org.dive4elements.artifacts.common.utils.XMLUtils; import org.dive4elements.artifacts.common.utils.XMLUtils.ElementCreator; -import org.dive4elements.river.model.BedHeightSingle; +import org.dive4elements.river.model.BedHeight; import org.dive4elements.river.model.River; import org.dive4elements.river.artifacts.D4EArtifact; import org.dive4elements.river.artifacts.resources.Resources; @@ -120,8 +120,8 @@ Element select, CallContext context ) { - List<BedHeightSingle> singles = - BedHeightSingle.getBedHeightSingles(river, kmLo, kmHi); + List<BedHeight> singles = + BedHeight.getBedHeights(river, kmLo, kmHi); if (singles != null) { int size = singles.size(); @@ -130,7 +130,7 @@ NumberFormat nf = Formatter.getCalculationKm(context.getMeta()); for (int i = 0; i < size; i++) { - BedHeightSingle s = singles.get(i); + BedHeight s = singles.get(i); String id = PREFIX_SINGLE + s.getId(); String value = s.getDescription(); @@ -204,7 +204,7 @@ protected String getLabelForSingle(CallContext cc, String value) { String id = value.replace(PREFIX_SINGLE, ""); try { - BedHeightSingle s = BedHeightSingle.getBedHeightSingleById( + BedHeight s = BedHeight.getBedHeightById( Integer.parseInt(id)); if (s != null) {