--- a/flys-artifacts/src/main/java/de/intevation/flys/wsplgen/ProblemObserver.java	Thu Sep 08 11:29:04 2011 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/wsplgen/ProblemObserver.java	Thu Sep 08 14:42:36 2011 +0000
@@ -1,12 +1,11 @@
 package de.intevation.flys.wsplgen;
 
-import java.util.HashMap;
-import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 import org.apache.log4j.Logger;
 
+import de.intevation.flys.artifacts.model.WSPLGENCalculation;
 import de.intevation.flys.artifacts.model.WSPLGENJob;
 
 
@@ -35,16 +34,14 @@
     protected int error;
     protected int warning;
 
-    protected Map<Integer, String> errorMsg;
-    protected Map<Integer, String> warningMsg;
+    protected WSPLGENCalculation calculation;
 
 
     public ProblemObserver(WSPLGENJob job) {
         super(job);
-        error      = -1;
-        warning    = -1;
-        errorMsg   = new HashMap<Integer, String>();
-        warningMsg = new HashMap<Integer, String>();
+        error       = -1;
+        warning     = -1;
+        calculation = job.getCalculation();
     }
 
 
@@ -75,7 +72,7 @@
         }
 
         if (error > 0) {
-            errorMsg.put(new Integer(error), log);
+            calculation.addError(new Integer(error), log);
         }
 
         Matcher startWarning = WSPLGEN_WARNING_START.matcher(log);
@@ -90,18 +87,18 @@
         }
 
         if (warning > 0) {
-            warningMsg.put(new Integer(warning), log);
+            calculation.addWarning(new Integer(warning), log);
         }
     }
 
 
     public int numErrors() {
-        return errorMsg.size();
+        return calculation.numErrors();
     }
 
 
     public int numWarnings() {
-        return warningMsg.size();
+        return calculation.numWarnings();
     }
 }
 // vim:set ts=4 sw=4 si et sta sts=5 fenc=utf-8 :