Mercurial > dive4elements > river
diff artifacts/src/main/java/org/dive4elements/river/artifacts/uinfo/vegetationzones/VegetationZonesCalculation.java @ 9070:611a523fc42f
VegetationZoneAccessHelper, VegetationTablePanels verbessert
author | gernotbelger |
---|---|
date | Tue, 15 May 2018 18:04:36 +0200 |
parents | 1ffd38826175 |
children | 41f4bc83aa7a |
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/uinfo/vegetationzones/VegetationZonesCalculation.java Tue May 15 12:00:26 2018 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/uinfo/vegetationzones/VegetationZonesCalculation.java Tue May 15 18:04:36 2018 +0200 @@ -11,6 +11,7 @@ import java.util.ArrayList; import java.util.Collection; +import java.util.List; import org.apache.commons.lang.math.DoubleRange; import org.dive4elements.artifacts.CallContext; @@ -43,22 +44,23 @@ final String calcModeLabel = Resources.getMsg(this.context.getMeta(), uinfo.getCalculationMode().name()); final String user = CalculationUtils.findArtifactUser(this.context, uinfo); + // FIXME: remove, check other states as well final RiverAccess access = new RiverAccess(uinfo); final River river = access.getRiver(); final DoubleRange calcRange = null; final RiverInfo riverInfo = new RiverInfo(river); final VegetationzonesAccess vAccess = new VegetationzonesAccess(uinfo); - final ArrayList<String[]> zones = vAccess.getVegZones(); - + final String zonesRaw = vAccess.getVegZones(); + final List<VegetationZoneAccessHelper> helpers = VegetationZoneAccessHelper.parse(zonesRaw); final VegetationZonesCalculationResults results = new VegetationZonesCalculationResults(calcModeLabel, user, riverInfo, calcRange); final Collection<ResultRow> rows = new ArrayList<>(); - for (final String[] zone : zones) { + for (final VegetationZoneAccessHelper zone : helpers) { final ResultRow row2 = ResultRow.create().// - putValue(UInfoResultType.vegname, zone[0]).// - putValue(UInfoResultType.vegdauervon, zone[1]).// - putValue(UInfoResultType.vegdauerbis, zone[2]); + putValue(UInfoResultType.vegname, zone.getZoneName()).// + putValue(UInfoResultType.vegdauervon, zone.getMin_day_overflow()).// + putValue(UInfoResultType.vegdauerbis, zone.getMax_day_overflow()); rows.add(row2); }