Mercurial > dive4elements > river
diff artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/common/AbstractSInfoCalculationResults.java @ 9000:50cc99579a46
Work on uinfo
author | gernotbelger |
---|---|
date | Thu, 12 Apr 2018 19:16:10 +0200 |
parents | b194fa64506a |
children | 23945061daec |
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/common/AbstractSInfoCalculationResults.java Thu Apr 12 19:15:42 2018 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/common/AbstractSInfoCalculationResults.java Thu Apr 12 19:16:10 2018 +0200 @@ -9,69 +9,23 @@ */ package org.dive4elements.river.artifacts.sinfo.common; -import java.io.Serializable; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; + import org.apache.commons.lang.math.DoubleRange; -import org.dive4elements.river.artifacts.model.Calculation; +import org.dive4elements.river.artifacts.common.AbstractCalculationResults; + import org.dive4elements.river.artifacts.sinfo.util.RiverInfo; /** * @author Gernot Belger */ -public abstract class AbstractSInfoCalculationResults<RESULT extends AbstractSInfoCalculationResult> implements Serializable { - - private static final long serialVersionUID = 1L; - - private final List<RESULT> results = new ArrayList<>(); - - private final String calcModeLabel; - - private final String user; - - private final RiverInfo river; - - private final DoubleRange calcRange; - - public AbstractSInfoCalculationResults(final String calcModeLabel, final String user, final RiverInfo river, final DoubleRange calcRange) { - this.calcModeLabel = calcModeLabel; - this.user = user; - this.river = river; - this.calcRange = calcRange; - } - - public final String getCalcModeLabel() { - return this.calcModeLabel; - } +public abstract class AbstractSInfoCalculationResults<RESULT extends AbstractSInfoCalculationResult> extends AbstractCalculationResults<RESULT> { - public final String getUser() { - return this.user; - } - - public final RiverInfo getRiver() { - return this.river; - } - - public final DoubleRange getCalcRange() { - return this.calcRange; - } - - public final void addResult(final RESULT result, final Calculation problems) { - /* we assume error reporting was already done in this case */ - if (result == null) - return; - - if (result.isEmpty()) { - problems.addProblem("abstractsinfocalculationresults.emptyResult", result.getLabel()); - return; - } - - this.results.add(result); - } - - public final List<RESULT> getResults() { - return Collections.unmodifiableList(this.results); - } + private static final long serialVersionUID = 1L; + + //TODO: einen sinnvollen Grund finden, warum es diese Klasse noch geben muss, oder LĂ–SCHEN! + public AbstractSInfoCalculationResults(final String calcModeLabel, final String user, final RiverInfo river, final DoubleRange calcRange) { + super(calcModeLabel, user, river, calcRange); //TODO: Split! + } + } \ No newline at end of file