--- a/flys-artifacts/src/main/java/de/intevation/flys/exports/minfo/BedQualityGenerator.java	Fri Sep 14 12:17:14 2012 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/exports/minfo/BedQualityGenerator.java	Fri Sep 14 12:20:57 2012 +0000
@@ -9,6 +9,8 @@
 import de.intevation.flys.artifacts.model.FacetTypes;
 import de.intevation.flys.artifacts.model.minfo.BedBedQualityResult;
 import de.intevation.flys.artifacts.model.minfo.BedLoadBedQualityResult;
+import de.intevation.flys.artifacts.model.minfo.BedQualityResult;
+import de.intevation.flys.exports.StyledSeriesBuilder;
 import de.intevation.flys.exports.XYChartGenerator;
 import de.intevation.flys.jfree.StyledXYSeries;
 
@@ -143,25 +145,40 @@
             return;
         }
 
-        if (name.equals(BED_QUALITY_BED_DIAMETER)) {
-            doBedDiameterOut(
+        // TODO BED_QUALITY_BED_DIAMETER_TOPLAYER
+        if (name.equals(BED_QUALITY_BED_DIAMETER_TOPLAYER)) {
+            doBedDiameterTopLayerOut(
                 (BedBedQualityResult) artifactAndFacet.getData(context),
                 artifactAndFacet, attr, visible);
         }
+        else if (name.equals(BED_QUALITY_BED_DIAMETER_SUBLAYER)) {
+            doBedDiameterSubLayerOut(
+                (BedBedQualityResult) artifactAndFacet.getData(context),
+                artifactAndFacet, attr, visible);
+        }
+        // TODO BED_QUALITY_BED_DIAMETER_SUBLAYER
         else if (name.equals(BED_QUALITY_BEDLOAD_DIAMETER)) {
-            doBedloadDiameterOut(
+            doBedLoadDiameterOut(
                 (BedLoadBedQualityResult) artifactAndFacet.getData(context),
                 artifactAndFacet, attr, visible);
         }
-        else if (name.equals(BED_QUALITY_POROSITY_TOPLAYER)
-            || name.equals(BED_QUALITY_POROSITY_SUBLAYER)) {
-            doPorosityOut(
+        else if (name.equals(BED_QUALITY_POROSITY_TOPLAYER)) {
+            doPorosityTopLayerOut(
                 (BedBedQualityResult) artifactAndFacet.getData(context),
                 artifactAndFacet, attr, visible);
         }
-        else if (name.equals(BED_QUALITY_SEDIMENT_DENSITY_TOPLAYER)
-            || name.equals(BED_QUALITY_SEDIMENT_DENSITY_SUBLAYER)) {
-            doDensityOut(
+        else if (name.equals(BED_QUALITY_POROSITY_SUBLAYER)) {
+            doPorositySubLayerOut(
+                (BedBedQualityResult) artifactAndFacet.getData(context),
+                artifactAndFacet, attr, visible);
+        }
+        else if (name.equals(BED_QUALITY_SEDIMENT_DENSITY_TOPLAYER)) {
+            doDensityTopLayerOut(
+                (BedBedQualityResult) artifactAndFacet.getData(context),
+                artifactAndFacet, attr, visible);
+        }
+        else if (name.equals(BED_QUALITY_SEDIMENT_DENSITY_SUBLAYER)) {
+            doDensitySubLayerOut(
                 (BedBedQualityResult) artifactAndFacet.getData(context),
                 artifactAndFacet, attr, visible);
         }
@@ -175,50 +192,80 @@
         }
     }
 
-    protected void doBedDiameterOut(BedBedQualityResult data,
+    protected void doBedDiameterTopLayerOut(BedBedQualityResult data,
         ArtifactAndFacet aandf, Document theme, boolean visible) {
-        logger.debug("BedQuality.doBedDiameterOut");
+        logger.debug("BedQuality.doBedDiameterTopLayerOut");
 
         XYSeries series = new StyledXYSeries(aandf.getFacetDescription(), theme);
-
-        // StyledSeriesBuilder.addPoints(series, data.getMiddleHeightsPoints(),
-        // true);
+        StyledSeriesBuilder.addPoints(series, data.getDiameterCapData(), true);
 
         addAxisSeries(series, YAXIS.W.idx, visible);
     }
 
-    protected void doBedloadDiameterOut(BedLoadBedQualityResult data,
+    protected void doBedDiameterSubLayerOut(BedBedQualityResult data,
         ArtifactAndFacet aandf, Document theme, boolean visible) {
-        logger.debug("BedQuality.doBedloadDiameterOut");
+        logger.debug("BedQuality.doBedDiameterSubLayerOut");
 
         XYSeries series = new StyledXYSeries(aandf.getFacetDescription(), theme);
-
-        // StyledSeriesBuilder.addPoints(series, data.getMiddleHeightsPoints(),
-        // true);
+        StyledSeriesBuilder.addPoints(series, data.getDiameterSubData(), true);
 
         addAxisSeries(series, YAXIS.W.idx, visible);
     }
 
-    protected void doPorosityOut(BedBedQualityResult data,
+    protected void doBedLoadDiameterOut(BedQualityResult data,
         ArtifactAndFacet aandf, Document theme, boolean visible) {
-        logger.debug("BedQuality.doPorosityOut");
+        logger.debug("BedQuality.doBedLoadDiameterOut");
+
+        XYSeries series = new StyledXYSeries(aandf.getFacetDescription(), theme);
+        StyledSeriesBuilder.addPoints(series, data.getDiameterData(), true);
+
+        addAxisSeries(series, YAXIS.W.idx, visible);
+    }
+
+    protected void doPorosityTopLayerOut(BedBedQualityResult data,
+        ArtifactAndFacet aandf, Document theme, boolean visible) {
+        logger.debug("BedQuality.doPorosityTopLayerOut");
 
         XYSeries series = new StyledXYSeries(aandf.getFacetDescription(), theme);
 
-        // StyledSeriesBuilder.addPoints(series, data.getMiddleHeightsPoints(),
-        // true);
+        StyledSeriesBuilder.addPoints(series, data.getPorosityTopLayerData(),
+            true);
 
         addAxisSeries(series, YAXIS.P.idx, visible);
     }
 
-    protected void doDensityOut(BedBedQualityResult data,
+    protected void doPorositySubLayerOut(BedBedQualityResult data,
+        ArtifactAndFacet aandf, Document theme, boolean visible) {
+        logger.debug("BedQuality.doPorositySubLayerOut");
+
+        XYSeries series = new StyledXYSeries(aandf.getFacetDescription(), theme);
+
+        StyledSeriesBuilder.addPoints(series, data.getPorositySubLayerData(),
+            true);
+
+        addAxisSeries(series, YAXIS.P.idx, visible);
+    }
+
+    protected void doDensityTopLayerOut(BedBedQualityResult data,
         ArtifactAndFacet aandf, Document theme, boolean visible) {
         logger.debug("BedQuality.doDensityOut");
 
         XYSeries series = new StyledXYSeries(aandf.getFacetDescription(), theme);
 
-        // StyledSeriesBuilder.addPoints(series, data.getMiddleHeightsPoints(),
-        // true);
+        StyledSeriesBuilder.addPoints(series, data.getDensityTopLayerData(),
+            true);
+
+        addAxisSeries(series, YAXIS.D.idx, visible);
+    }
+
+    protected void doDensitySubLayerOut(BedBedQualityResult data,
+        ArtifactAndFacet aandf, Document theme, boolean visible) {
+        logger.debug("BedQuality.doDensityOut");
+
+        XYSeries series = new StyledXYSeries(aandf.getFacetDescription(), theme);
+
+        StyledSeriesBuilder.addPoints(series, data.getDensitySubLayerData(),
+            true);
 
         addAxisSeries(series, YAXIS.D.idx, visible);
     }