--- a/artifacts/src/main/java/org/dive4elements/river/exports/minfo/BedQualityExporter.java	Tue Mar 17 18:52:00 2015 +0100
+++ b/artifacts/src/main/java/org/dive4elements/river/exports/minfo/BedQualityExporter.java	Wed Mar 18 18:42:08 2015 +0100
@@ -22,10 +22,8 @@
 
 import au.com.bytecode.opencsv.CSVWriter;
 import org.dive4elements.river.artifacts.model.CalculationResult;
-import org.dive4elements.river.artifacts.model.minfo.BedDiameterResult;
-import org.dive4elements.river.artifacts.model.minfo.BedParametersResult;
 import org.dive4elements.river.artifacts.model.minfo.BedQualityResult;
-import org.dive4elements.river.artifacts.model.minfo.BedloadDiameterResult;
+import org.dive4elements.river.artifacts.model.minfo.BedQualityResultValue;
 import org.dive4elements.river.exports.AbstractExporter;
 import org.dive4elements.river.utils.Formatter;
 
@@ -41,20 +39,8 @@
 
     private static final String CSV_HEADER_KM =
         "export.minfo.bedquality.km";
-    private static final String CSV_HEADER_DENSITY_CAP =
-        "export.minfo.bedquality.density_cap";
-    private static final String CSV_HEADER_DENSITY_SUB =
-        "export.minfo.bedquality.density_sub";
-    private static final String CSV_HEADER_POROSITY_CAP =
-        "export.minfo.bedquality.porosity_cap";
-    private static final String CSV_HEADER_POROSITY_SUB =
-        "export.minfo.bedquality.porosity_sub";
-    private static final String CSV_HEADER_BEDLOAD =
-        "export.minfo.bedquality.bedload";
-    private static final String CSV_HEADER_BED_CAP =
-        "export.minfo.bedquality.bed_cap";
-    private static final String CSV_HEADER_BED_SUB =
-        "export.minfo.bedquality.bed_sub";
+    private static final String CSV_HEADER_BASE =
+        "export.minfo.bedquality";
 
     private BedQualityResult[] results;
 
@@ -68,53 +54,18 @@
         double[] kms = new RangeAccess((D4EArtifact) master).getKmSteps();
 
         int cols = 1;
-        for (BedQualityResult result : results) {
-            BedDiameterResult[]     beds  = result.getBedResults();
-            BedloadDiameterResult[] loads = result.getBedloadResults();
-
-            cols += beds.length * 2;
-            if (beds.length > 0) {
-                cols += 4;
-            }
-            cols += loads.length;
+        for (BedQualityResult result: results) {
+            cols += result.getValues().size();
         }
 
         List<double[]> rows = new ArrayList<double[]>(kms.length);
         for (double km: kms) {
             double[] row = new double[cols];
             row[0] = km;
-            for (int j = 0; j < results.length; j++) {
-
-                BedloadDiameterResult[] loads = results[j].getBedloadResults();
-
-                for(int k = 0; k < loads.length; k++) {
-                    // k + 1: shift km column.
-                    // j* loads.length: shift periods.
-                    row[(k + 1) + (j * loads.length)] =
-                        loads[k].getDiameterInterpol(km);
-                }
-
-                BedDiameterResult[] beds = results[j].getBedResults();
-                if (beds.length == 0) {
-                    continue;
-                }
-                for (int k = 0; k < beds.length; k++) {
-                    // k * 2 + 1: shift km column.
-                    // j * beds.length * 2: shift periods.
-                    // loads.length * results.length: shift bed load columns.
-                    int ndx = (k * 2 + 1) + (j * beds.length * 2) + (loads.length * results.length);
-                    row[ndx] = beds[k].getDiameterCapInterpol(km);
-                    row[ndx + 1] = beds[k].getDiameterSubInterpol(km);
-                }
-
-                BedParametersResult[] params = results[j].getParameters();
-                for(int k = 0; k < params.length; k++) {
-                    // loads.length + (beds.lenght * 2) * (j + 1): shift bed and bedload columns.
-                    int ndx = 1 + (loads.length + (beds.length * 2) * (j + 1));
-                    row[ndx] = params[k].getDensityCapInterpol(km);
-                    row[ndx + 1] = params[k].getDensitySubInterpol(km);
-                    row[ndx + 2] = params[k].getPorosityCapInterpol(km);
-                    row[ndx + 3] = params[k].getPorositySubInterpol(km);
+            for (BedQualityResult result: results) {
+                int i = 1;
+                for (BedQualityResultValue value: result.getValues()) {
+                    row[i++] = value.getDataInterpolated(km);
                 }
             }
             rows.add(row);
@@ -170,48 +121,25 @@
         log.debug("writeCSVHeader()");
 
         List<String> header = new ArrayList<String>();
-        if (results != null)  {
-            header.add(msg(CSV_HEADER_KM, "km"));
-            for (int i = 0; i < results.length; i++) {
-                DateFormat df = Formatter.getDateFormatter(context.getMeta(), "dd.MM.yyyy");
-                String d1 = df.format(results[i].getDateRange().getFrom());
-                String d2 = df.format(results[i].getDateRange().getTo());
-                BedloadDiameterResult[] loads = results[i].getBedloadResults();
-                BedDiameterResult[] beds = results[i].getBedResults();
-                BedParametersResult[] params = results[i].getParameters();
-                for (int j = 0; j < loads.length; j++) {
-                    header.add(msg(CSV_HEADER_BEDLOAD, CSV_HEADER_BEDLOAD) +
-                        " - " +
-                        msg(loads[j].getType().toString(),
-                            loads[j].getType().toString()) + " - " +
-                        d1 + "-" + d2);
-                }
-                for (int j = 0; j < beds.length; j++) {
-                    header.add(msg(CSV_HEADER_BED_CAP, CSV_HEADER_BED_CAP) + " - " +
-                        msg(beds[j].getType().toString(),
-                            beds[j].getType().toString()) + " - " +
-                        d1 + "-" + d2);
-                    header.add(msg(CSV_HEADER_BED_SUB, CSV_HEADER_BED_SUB) + " - " +
-                        msg(beds[j].getType().toString(),
-                            beds[j].getType().toString()) + " - " +
-                        d1 + "-" + d2);
-                }
-                if (beds.length == 0) {
-                    continue;
-                }
-                if (params.length > 0) {
-                    header.add(
-                        msg(CSV_HEADER_DENSITY_CAP, CSV_HEADER_DENSITY_CAP) +
-                        " - " + d1 + "-" + d2);
-                    header.add(
-                        msg(CSV_HEADER_DENSITY_SUB, CSV_HEADER_DENSITY_SUB) +
-                        " - " + d1 + "-" + d2);
-                    header.add(
-                        msg(CSV_HEADER_POROSITY_CAP, CSV_HEADER_POROSITY_CAP) +
-                        " - " + d1 + "-" + d2);
-                    header.add(
-                        msg(CSV_HEADER_POROSITY_SUB, CSV_HEADER_POROSITY_SUB) +
-                        " - " + d1 + "-" + d2);
+        if (results == null)  {
+            writer.writeNext(header.toArray(new String[header.size()]));
+            return;
+        }
+
+        header.add(msg(CSV_HEADER_KM, "km"));
+        DateFormat df = Formatter.getDateFormatter(context.getMeta(), "dd.MM.yyyy");
+        for (BedQualityResult result: results) {
+            String d1 = df.format(result.getDateRange().getFrom());
+            String d2 = df.format(result.getDateRange().getTo());
+            for (BedQualityResultValue value: result.getValues()) {
+                String i18n;
+                if (value.isDiameterResult()) {
+                    i18n = CSV_HEADER_BASE + ".diameter." + value.getType();
+                    header.add(msg(i18n, i18n) +
+                        " - " + value.getName() + " - " + d1 + "-" + d2);
+                } else {
+                    i18n = CSV_HEADER_BASE + "." + value.getName() + "." + value.getType();
+                    header.add(msg(i18n, i18n) + " - " + d1 + "-" + d2);
                 }
             }
         }