diff artifacts/src/main/java/org/dive4elements/river/exports/process/BedQualityDensityProcessor.java @ 7987:98ca61cb58fb facet-metadata

Split bed quality facets and updated processors and state.
author Raimund Renkert <rrenkert@intevation.de>
date Wed, 02 Jul 2014 09:31:14 +0200
parents e844be34a606
children 5277483044d9
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/exports/process/BedQualityDensityProcessor.java	Wed Jul 02 09:29:39 2014 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/exports/process/BedQualityDensityProcessor.java	Wed Jul 02 09:31:14 2014 +0200
@@ -11,8 +11,6 @@
 import java.util.Map;
 
 import org.apache.log4j.Logger;
-import org.jfree.data.xy.XYSeries;
-
 import org.dive4elements.artifactdatabase.state.ArtifactAndFacet;
 import org.dive4elements.artifacts.CallContext;
 import org.dive4elements.river.artifacts.model.FacetTypes;
@@ -21,8 +19,6 @@
 import org.dive4elements.river.jfree.StyledXYSeries;
 import org.dive4elements.river.themes.ThemeDocument;
 
-import org.dive4elements.river.artifacts.model.minfo.BedParametersResult;
-
 public class BedQualityDensityProcessor extends DefaultProcessor {
 
     private final static Logger logger =
@@ -43,22 +39,18 @@
         CallContext context = generator.getCallContext();
         StyledXYSeries series = new StyledXYSeries(bundle.getFacetDescription(),
                 theme);
-        Object data = bundle.getData(context);
         Map<String, String> metaData = bundle.getFacet().getMetaData();
         series.putMetaData(metaData, bundle.getArtifact(), context);
         yAxisLabel = metaData.get("Y");
-        String facetName = bundle.getFacetName();
-        double [][] points;
 
-        if (facetName.equals(FacetTypes.BED_QUALITY_SEDIMENT_DENSITY_TOPLAYER)) {
-            points = ((BedParametersResult) data).getDensityCapData();
-        } else if (facetName.equals(FacetTypes.BED_QUALITY_SEDIMENT_DENSITY_SUBLAYER)) {
-            points = ((BedParametersResult) data).getDensitySubData();
-        } else {
-            logger.error("Unknown facet name: " + facetName);
+        Object data = bundle.getData(context);
+        if (!(data instanceof double[][])) {
+            logger.error("Unknown data type: " + data.getClass().getName());
             return;
         }
-        StyledSeriesBuilder.addPoints(series, points, true);
+
+        double[][] values = (double[][])data;
+        StyledSeriesBuilder.addPoints(series, values, true);
 
         generator.addAxisSeries(series, axisName, visible);
     }

http://dive4elements.wald.intevation.org