diff artifacts/src/main/java/org/dive4elements/river/artifacts/common/AbstractCalculationResults.java @ 9170:9b2e46090099

tkh cast exception fix gigantic refactoring 2
author gernotbelger
date Thu, 21 Jun 2018 14:32:11 +0200
parents bb929b444ea5
children
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/common/AbstractCalculationResults.java	Thu Jun 21 10:41:55 2018 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/common/AbstractCalculationResults.java	Thu Jun 21 14:32:11 2018 +0200
@@ -10,17 +10,23 @@
 package org.dive4elements.river.artifacts.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.sinfo.util.RiverInfo;
 
 /**
  * @author Gernot Belger
  */
-public abstract class AbstractCalculationResults implements Serializable {
+public abstract class AbstractCalculationResults<RESULT extends AbstractCalculationResult> implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    private final List<RESULT> results = new ArrayList<>();
+
     private final String calcModeLabel;
 
     private final String user;
@@ -51,4 +57,23 @@
     public final DoubleRange getCalcRange() {
         return this.calcRange;
     }
+
+    //// COPY FROM AbtractCalculationListResults -> further refactoring necessary?
+    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);
+    }
+
 }
\ No newline at end of file

http://dive4elements.wald.intevation.org