# HG changeset patch
# User Felix Wolfsteller <felix.wolfsteller@intevation.de>
# Date 1328711855 0
# Node ID bc23341bf3221d67f20a48c00ac1f87af3d82bd1
# Parent  a3dd443976bca741c988415660fdad9ab4695c79
Repair area over cross sections.

flys-artifacts/trunk@3969 c6561f87-3c4e-4783-a992-168aeb5c3f6f

diff -r a3dd443976bc -r bc23341bf322 flys-artifacts/ChangeLog
--- a/flys-artifacts/ChangeLog	Wed Feb 08 11:47:14 2012 +0000
+++ b/flys-artifacts/ChangeLog	Wed Feb 08 14:37:35 2012 +0000
@@ -1,3 +1,8 @@
+2012-02-08  Felix Wolfsteller	<felix.wolfsteller@intevation.de>
+
+	* src/main/java/de/intevation/flys/artifacts/model/CrossSectionFacet.java:
+	  Subclass BlackboardDataFacet to repair areas over cross sections.
+
 2012-02-08  Ingo Weinzierl <ingo@intevation.de>
 
 	* src/main/java/de/intevation/flys/exports/XYChartGenerator.java: Let text
@@ -5,6 +10,23 @@
 
 2012-02-08  Felix Wolfsteller	<felix.wolfsteller@intevation.de>
 
+	Fix flys/issue474 (manual points in reference curves).
+
+	* doc/conf/artifacts/winfo.xml,
+	  doc/conf/artifacts/manualpoints.xml:
+	  Add manualpoints to lists just so that really everybody knows.
+
+	* doc/conf/themes.xml: Add styles for manual points in ref curves.
+
+	* src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java:
+	  Add ref curve chart types.
+
+	* src/main/java/de/intevation/flys/exports/NormalizedReferenceCurveGenerator.java,
+	  src/main/java/de/intevation/flys/exports/ReferenceCurveGenerator.java:
+	  Handle manual point facets.
+
+2012-02-08  Felix Wolfsteller	<felix.wolfsteller@intevation.de>
+
 	Partial Fix flys/issue474.
 
 	* src/main/resources/messages.properties,
diff -r a3dd443976bc -r bc23341bf322 flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/CrossSectionFacet.java
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/CrossSectionFacet.java	Wed Feb 08 11:47:14 2012 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/CrossSectionFacet.java	Wed Feb 08 14:37:35 2012 +0000
@@ -20,7 +20,7 @@
  * Trival Facet for Cross Sections (profiles).
  */
 public class CrossSectionFacet
-extends      DefaultFacet
+extends      BlackboardDataFacet
 implements   FacetTypes {
 
     public static String BLACKBOARD_CS_MASTER_DATA
@@ -46,6 +46,7 @@
             keys.add(BLACKBOARD_CS_MASTER_DATA);
         }
         keys.add(artifact.identifier() + getIndex());
+        keys.addAll(super.getDataProviderKeys(art));
         return keys;
     }
 
@@ -72,8 +73,12 @@
             return getData(artifact, context);
         }
         else {
-            logger.warn("Cannot provide data for key: " + key);
-            return null;
+            Object obj = super.provideBlackboardData(artifact, key, param,
+                context);
+            if (obj == null) {
+                logger.warn("Cannot provide data for key: " + key);
+            }
+            return obj;
         }
     }