--- a/flys-artifacts/src/main/java/de/intevation/flys/exports/DeltaWtExporter.java	Tue Jun 05 15:37:38 2012 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/exports/DeltaWtExporter.java	Tue Jun 05 16:25:51 2012 +0000
@@ -7,13 +7,14 @@
 
 import de.intevation.flys.artifacts.model.CalculationResult;
 
-import de.intevation.flys.artifacts.model.fixings.DeltaWT;
-import de.intevation.flys.artifacts.model.fixings.DeltaWTsKM;
 import de.intevation.flys.artifacts.model.fixings.FixResult;
+import de.intevation.flys.artifacts.model.fixings.AnalysisPeriod;
+import de.intevation.flys.artifacts.model.fixings.QWD;
 
 import de.intevation.flys.artifacts.resources.Resources;
 
 import de.intevation.flys.utils.Formatter;
+import de.intevation.flys.utils.KMIndex;
 
 import java.io.IOException;
 import java.io.OutputStream;
@@ -55,13 +56,13 @@
 
     public static final String DEFAULT_CSV_T_DESC_HEADER = "Beschreibung";
 
-    protected List<DeltaWTsKM> deltaWTsKMs;
+    protected List<KMIndex<AnalysisPeriod []>> analysisPeriods;
 
     @Override
     public void init(Document request, OutputStream out, CallContext context) {
         log.debug("DeltaWtExporter.init");
         super.init(request, out, context);
-        deltaWTsKMs = new ArrayList<DeltaWTsKM>();
+        analysisPeriods = new ArrayList<KMIndex<AnalysisPeriod []>>();
     }
 
     @Override
@@ -94,8 +95,7 @@
             log.warn("Invalid data stored in result.");
         }
         FixResult result = (FixResult)data;
-        // TODO: replace old code
-        //deltaWTsKMs.add(result.getDeltaWTsKM());
+        analysisPeriods.add(result.getAnalysisPeriods());
     }
 
     @Override
@@ -113,34 +113,33 @@
         DateFormat dF = DateFormat.getDateInstance(DateFormat.SHORT, locale);
 
         if (debug) {
-            log.debug("DeltaWTsKMs: " + deltaWTsKMs.size());
+            log.debug("AnalysisPeriods: " + analysisPeriods.size());
         }
 
-        for (DeltaWTsKM deltaWTsKM: deltaWTsKMs) {
-            List<DeltaWTsKM.KM> dkms = deltaWTsKM.getKms();
-            if (debug) {
-                log.debug("DeltaWTsKM.KM: " + dkms.size());
-            }
-            for (DeltaWTsKM.KM dkm: dkms) {
-                double km = dkm.getKm();
-                String kmS = kmF.format(km);
-                List<DeltaWT> deltaWTs = dkm.getDeltaWTs();
-                if (debug) {
-                    log.debug("deltaWTs: " + deltaWTs.size());
-                }
-                for (DeltaWT dwt: deltaWTs) {
-                    double deltaW = dwt.getDeltaW();
-                    Date   date   = dwt.getDate();
-                    String desc   = dwt.getDescription();
+        for (KMIndex<AnalysisPeriod []> periods: analysisPeriods) {
 
-                    String deltaWS = dwF.format(deltaW);
-                    String dateS   = dF.format(date);
+            for (KMIndex.Entry<AnalysisPeriod []> kmEntry: periods) {
 
-                    writer.writeNext(new String[] {
-                        kmS,
-                        deltaWS,
-                        dateS,
-                        desc != null ? desc : "" });
+                String kmS = kmF.format(kmEntry.getKm());
+
+                for (AnalysisPeriod period: kmEntry.getValue()) {
+                    QWD [] qwds = period.getQWDs();
+                    if (qwds != null) {
+                        for (QWD qwd: qwds) {
+                            double deltaW = qwd.getDeltaW();
+                            Date   date   = qwd.getDate();
+                            String desc   = qwd.getDescription();
+
+                            String deltaWS = dwF.format(deltaW);
+                            String dateS   = dF.format(date);
+
+                            writer.writeNext(new String[] {
+                                kmS,
+                                deltaWS,
+                                dateS,
+                                desc != null ? desc : "" });
+                        }
+                    }
                 }
             }
         }