--- a/flys-artifacts/src/main/java/de/intevation/flys/exports/fixings/FixLongitudinalSectionGenerator.java	Fri Sep 14 14:20:42 2012 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/exports/fixings/FixLongitudinalSectionGenerator.java	Sat Sep 15 07:07:51 2012 +0000
@@ -1,60 +1,52 @@
 package de.intevation.flys.exports.fixings;
 
-import de.intevation.artifactdatabase.state.ArtifactAndFacet;
-
-import de.intevation.flys.artifacts.model.FacetTypes;
-
-import de.intevation.flys.artifacts.model.fixings.AnalysisPeriod;
-import de.intevation.flys.artifacts.model.fixings.QWD;
-
-import de.intevation.flys.exports.ChartGenerator;
-
-import de.intevation.flys.jfree.FLYSAnnotation;
-import de.intevation.flys.jfree.StyledAreaSeriesCollection;
-import de.intevation.flys.jfree.StyledXYSeries;
-
-import de.intevation.flys.utils.KMIndex;
-
 import java.awt.BasicStroke;
 import java.awt.Color;
 
 import org.apache.log4j.Logger;
-
 import org.jfree.chart.plot.Marker;
 import org.jfree.chart.plot.ValueMarker;
-
 import org.jfree.data.xy.XYSeries;
 import org.jfree.data.xy.XYSeriesCollection;
+import org.w3c.dom.Document;
 
-import org.w3c.dom.Document;
+import de.intevation.artifactdatabase.state.ArtifactAndFacet;
+import de.intevation.flys.artifacts.model.FacetTypes;
+import de.intevation.flys.artifacts.model.fixings.AnalysisPeriod;
+import de.intevation.flys.artifacts.model.fixings.QWD;
+import de.intevation.flys.exports.ChartGenerator;
+import de.intevation.flys.jfree.FLYSAnnotation;
+import de.intevation.flys.jfree.StyledAreaSeriesCollection;
+import de.intevation.flys.jfree.StyledXYSeries;
+import de.intevation.flys.utils.KMIndex;
 
 public class FixLongitudinalSectionGenerator
 extends FixChartGenerator
 implements FacetTypes
 {
     private static Logger logger =
-        Logger.getLogger(FixLongitudinalSectionGenerator.class);
+            Logger.getLogger(FixLongitudinalSectionGenerator.class);
 
     public static final String I18N_CHART_TITLE =
-        "chart.fixings.longitudinalsection.title";
+            "chart.fixings.longitudinalsection.title";
 
     public static final String I18N_CHART_SUBTITLE =
-        "chart.fixings.longitudinalsection.subtitle";
+            "chart.fixings.longitudinalsection.subtitle";
 
     public static final String I18N_XAXIS_LABEL =
-        "chart.fixings.longitudinalsection.xaxis.label";
+            "chart.fixings.longitudinalsection.xaxis.label";
 
     public static final String I18N_YAXIS_LABEL =
-        "chart.fixings.longitudinalsection.yaxis.label";
+            "chart.fixings.longitudinalsection.yaxis.label";
 
     public static final String I18N_CHART_TITLE_DEFAULT  =
-        "Fixierungsanalyse";
+            "Fixierungsanalyse";
 
     public static final String I18N_XAXIS_LABEL_DEFAULT  =
-        "[km]";
+            "[km]";
 
     public static final String I18N_YAXIS_LABEL_DEFAULT  =
-        "delta W [cm]";
+            "delta W [cm]";
 
     public static enum YAXIS {
         dW(0);
@@ -86,10 +78,15 @@
         }
         else if (name.equals(LONGITUDINAL_ANNOTATION)) {
             doAnnotations(
-                 (FLYSAnnotation) aaf.getData(context),
-                 aaf,
-                 doc,
-                 visible);
+                    (FLYSAnnotation) aaf.getData(context),
+                    aaf,
+                    doc,
+                    visible);
+        }
+        else if (FacetTypes.IS.MANUALPOINTS(name)) {
+            doPoints (aaf.getData(context),
+                    aaf,
+                    doc, visible, YAXIS.dW.idx);
         }
         else {
             logger.warn("Unknown facet name " + name);
@@ -99,9 +96,9 @@
 
     @SuppressWarnings("unchecked")
     protected void doSectorAverageOut(
-        ArtifactAndFacet aaf,
-        Document doc,
-        boolean visible)
+            ArtifactAndFacet aaf,
+            Document doc,
+            boolean visible)
     {
         logger.debug("doSectorAverageOut" + aaf.getFacet().getIndex());
 
@@ -109,7 +106,7 @@
         int sectorNdx = index & 3;
 
         KMIndex<AnalysisPeriod> kms =
-            (KMIndex<AnalysisPeriod>)aaf.getData(context);
+                (KMIndex<AnalysisPeriod>)aaf.getData(context);
 
         if(kms == null) {
             return;
@@ -135,9 +132,9 @@
 
     @SuppressWarnings("unchecked")
     protected void doSectorAverageDeviationOut(
-        ArtifactAndFacet aaf,
-        Document doc,
-        boolean visible)
+            ArtifactAndFacet aaf,
+            Document doc,
+            boolean visible)
     {
         logger.debug("doSectorAverageOut" + aaf.getFacet().getIndex());
 
@@ -145,7 +142,7 @@
         int sectorNdx = index & 3;
 
         KMIndex<AnalysisPeriod> kms =
-            (KMIndex<AnalysisPeriod>)aaf.getData(context);
+                (KMIndex<AnalysisPeriod>)aaf.getData(context);
 
         if(kms == null) {
             return;
@@ -153,9 +150,9 @@
 
         StyledAreaSeriesCollection area = new StyledAreaSeriesCollection(doc);
         XYSeries upper =
-            new StyledXYSeries(aaf.getFacetDescription(), false, doc);
+                new StyledXYSeries(aaf.getFacetDescription(), false, doc);
         XYSeries lower =
-            new StyledXYSeries(aaf.getFacetDescription() + " ", false, doc);
+                new StyledXYSeries(aaf.getFacetDescription() + " ", false, doc);
 
 
         for (KMIndex.Entry<AnalysisPeriod> entry: kms) {
@@ -182,14 +179,14 @@
 
     @SuppressWarnings("unchecked")
     protected void doReferenceDeviationOut(
-        ArtifactAndFacet aaf,
-        Document doc,
-        boolean visible)
+            ArtifactAndFacet aaf,
+            Document doc,
+            boolean visible)
     {
         logger.debug("doReferenceOut");
 
         KMIndex<double[]> kms =
-            (KMIndex<double[]>)aaf.getData(context);
+                (KMIndex<double[]>)aaf.getData(context);
 
         if(kms == null) {
             return;
@@ -197,9 +194,9 @@
 
         StyledAreaSeriesCollection area = new StyledAreaSeriesCollection(doc);
         XYSeries upper =
-            new StyledXYSeries(aaf.getFacetDescription(), false, doc);
+                new StyledXYSeries(aaf.getFacetDescription(), false, doc);
         XYSeries lower =
-            new StyledXYSeries(aaf.getFacetDescription() + " ", false, doc);
+                new StyledXYSeries(aaf.getFacetDescription() + " ", false, doc);
 
 
         for (KMIndex.Entry<double[]> entry: kms) {
@@ -226,14 +223,14 @@
 
     @SuppressWarnings("unchecked")
     protected void doAnalysisEventsOut(
-        ArtifactAndFacet aaf,
-        Document doc,
-        boolean visible)
+            ArtifactAndFacet aaf,
+            Document doc,
+            boolean visible)
     {
         logger.debug("doAnalysisEventsOut");
 
         KMIndex<QWD> kms =
-            (KMIndex<QWD>)aaf.getData(context);
+                (KMIndex<QWD>)aaf.getData(context);
 
         if(kms == null) {
             return;
@@ -247,7 +244,7 @@
             double km = entry.getKm();
             QWD qwd = entry.getValue();
 
-                series.add(km, qwd.getDeltaW());
+            series.add(km, qwd.getDeltaW());
         }
         col.addSeries(series);
 
@@ -256,14 +253,14 @@
 
     @SuppressWarnings("unchecked")
     protected void doReferenceEventsOut(
-        ArtifactAndFacet aaf,
-        Document doc,
-        boolean visible)
+            ArtifactAndFacet aaf,
+            Document doc,
+            boolean visible)
     {
         logger.debug("doReferenceEventOut");
 
         KMIndex<QWD> kms =
-            (KMIndex<QWD>)aaf.getData(context);
+                (KMIndex<QWD>)aaf.getData(context);
 
         if(kms == null) {
             return;
@@ -309,7 +306,7 @@
             }
 
             @Override
-             public String getId(int idx) {
+            public String getId(int idx) {
                 YAXIS[] yaxes = YAXIS.values();
                 return yaxes[idx].toString();
             }