--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/fixings/FixAnalysisResult.java	Sat Sep 08 14:19:40 2012 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/fixings/FixAnalysisResult.java	Sat Sep 08 14:42:16 2012 +0000
@@ -1,5 +1,6 @@
 package de.intevation.flys.artifacts.model.fixings;
 
+import java.util.Collection;
 import java.util.Date;
 import java.util.TreeSet;
 
@@ -40,24 +41,26 @@
         return result;
     }
 
-    public TreeSet<Date> getReferenceEventsDates() {
+    public Collection<Date> getReferenceEventsDates() {
         TreeSet<Date> dates = new TreeSet<Date>();
         for (KMIndex.Entry<QWD []> entry: referenced) {
-            for (int i = 0; i < entry.getValue().length; i++) {
-                QWD qwd = entry.getValue()[i];
-                dates.add(qwd.date);
+            QWD [] values = entry.getValue();
+            for (int i = 0; i < values.length; i++) {
+                dates.add(values[i].date);
             }
         }
         return dates;
     }
 
-    public TreeSet<Date> getAnalysisEventsDates(int analysisPeriod) {
+    public Collection<Date> getAnalysisEventsDates(int analysisPeriod) {
         TreeSet<Date> dates = new TreeSet<Date>();
         for (KMIndex.Entry<AnalysisPeriod []> entry: analysisPeriods) {
-            AnalysisPeriod period = entry.getValue()[analysisPeriod];
-            for (int i = 0; i < period.qwds.length; i++) {
-                QWD qwd = period.qwds[i];
-                dates.add(qwd.date);
+            QWD [] qwds = entry.getValue()[analysisPeriod].getQWDs();
+            if (qwds == null) {
+                continue;
+            }
+            for (int i = 0; i < qwds.length; i++) {
+                dates.add(qwds[i].date);
             }
         }
         return dates;