--- a/flys-artifacts/src/main/java/de/intevation/flys/exports/fixings/FixWQCurveGenerator.java	Sat Sep 08 13:36:06 2012 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/exports/fixings/FixWQCurveGenerator.java	Sat Sep 08 14:19:40 2012 +0000
@@ -14,7 +14,7 @@
 import de.intevation.flys.artifacts.model.WQKms;
 import de.intevation.flys.artifacts.model.fixings.FixFunction;
 import de.intevation.flys.artifacts.model.fixings.FixWQCurveFacet;
-import de.intevation.flys.artifacts.model.fixings.QW;
+import de.intevation.flys.artifacts.model.fixings.QWI;
 import de.intevation.flys.artifacts.model.fixings.QWD;
 import de.intevation.flys.artifacts.resources.Resources;
 import de.intevation.flys.exports.ChartGenerator;
@@ -200,7 +200,7 @@
     protected void doReferenceEventsOut(ArtifactAndFacet aaf, Document doc, boolean visible) {
        logger.debug("doReferenceEventsOut");
 
-       QW qwd = (QW)aaf.getData(context);
+       QWI qwd = (QWI)aaf.getData(context);
        if(qwd != null) {
             XYSeries series = new StyledXYSeries(aaf.getFacetDescription(), doc);
             List<XYTextAnnotation> textAnnos = new ArrayList<XYTextAnnotation>();
@@ -261,7 +261,7 @@
     protected void doOutlierOut(ArtifactAndFacet aaf, Document doc, boolean visible) {
         logger.debug("doOutlierOut");
 
-        QW[] qws = (QW[])aaf.getData(context);
+        QWI[] qws = (QWI[])aaf.getData(context);
         addQWSeries(qws, aaf, doc, visible);
     }
 
@@ -431,30 +431,39 @@
     }
 
 
-    protected void addQWSeries(QW[] qws, ArtifactAndFacet aaf, Document theme, boolean visible) {
-         if(qws != null) {
-            XYSeries series = new StyledXYSeries(aaf.getFacetDescription(), theme);
-            List<XYTextAnnotation> textAnnos = new ArrayList<XYTextAnnotation>();
-
-            DateFormat dateFormat = DateFormat.getDateInstance(
-                DateFormat.SHORT);
-
-            for(QW qw : qws) {
-                series.add(qw.getQ(), qw.getW());
+    protected void addQWSeries(
+        QWI []           qws,
+        ArtifactAndFacet aaf,
+        Document         theme,
+        boolean          visible
+    ) {
+        if (qws == null) {
+            return;
+        }
 
-                XYTextAnnotation anno = new CollisionFreeXYTextAnnotation(
-                    dateFormat.format(qw.getDate()),
-                    qw.getQ(),
-                    qw.getW());
-                textAnnos.add(anno);
-            }
+        XYSeries series = new StyledXYSeries(aaf.getFacetDescription(), theme);
+        List<XYTextAnnotation> textAnnos =
+            new ArrayList<XYTextAnnotation>(qws.length);
 
-            addAxisSeries(series, 0, visible);
-            if(visible && ThemeUtil.parseShowPointLabel(theme)) {
-                FLYSAnnotation flysAnno = new FLYSAnnotation(null, null, null, theme);
-                flysAnno.setTextAnnotations(textAnnos);
-                addAnnotations(flysAnno);
-            }
+        DateFormat dateFormat = DateFormat.getDateInstance(
+            DateFormat.SHORT);
+
+        for (QWI qw: qws) {
+            series.add(qw.getQ(), qw.getW());
+
+            XYTextAnnotation anno = new CollisionFreeXYTextAnnotation(
+                dateFormat.format(qw.getDate()),
+                qw.getQ(),
+                qw.getW());
+            textAnnos.add(anno);
+        }
+
+        addAxisSeries(series, 0, visible);
+        if (visible && ThemeUtil.parseShowPointLabel(theme)) {
+            FLYSAnnotation flysAnno =
+                new FLYSAnnotation(null, null, null, theme);
+            flysAnno.setTextAnnotations(textAnnos);
+            addAnnotations(flysAnno);
         }
     }