--- a/artifacts/src/main/java/org/dive4elements/river/exports/process/FixWQProcessor.java	Mon Jul 30 16:43:44 2018 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/exports/process/FixWQProcessor.java	Tue Jul 31 11:25:38 2018 +0200
@@ -31,7 +31,6 @@
 import org.dive4elements.river.exports.DiagramGenerator;
 import org.dive4elements.river.exports.StyledSeriesBuilder;
 import org.dive4elements.river.exports.fixings.FixWQCurveGenerator;
-import org.dive4elements.river.java2d.ShapeUtils;
 import org.dive4elements.river.jfree.CollisionFreeXYTextAnnotation;
 import org.dive4elements.river.jfree.JFreeUtil;
 import org.dive4elements.river.jfree.RiverAnnotation;
@@ -129,7 +128,7 @@
                     dateFormat.format(qwd.getDate()),
                     qwd.getQ(),
                     qwd.getW());
-            List<XYTextAnnotation> annos = new ArrayList<XYTextAnnotation>();
+            List<XYTextAnnotation> annos = new ArrayList<>();
             annos.add(anno);
             generator.addAxisSeries(series, axisName, visible);
 
@@ -165,21 +164,14 @@
         // prevent potential side effects
         final ThemeDocument themeInterpolated = FixWQCurveGenerator.configureThemeInterpolated(theme, qwd);
 
-        XYSeries series = new StyledXYSeries(
-            bundle.getFacetDescription(),
-            themeInterpolated,
-            qwd.getInterpolated()
-                ? ShapeUtils.INTERPOLATED_SHAPE
-                : ShapeUtils.MEASURED_SHAPE);
-
+        final XYSeries series = new StyledXYSeries( bundle.getFacetDescription(), themeInterpolated, FixWQCurveGenerator.getWQDShape(qwd));
         series.add(qwd.getQ(), qwd.getW());
 
         generator.addAxisSeries(series, axisName, visible);
 
         if (visible && themeInterpolated.parseShowPointLabel()) {
 
-            List<XYTextAnnotation> textAnnos =
-                new ArrayList<XYTextAnnotation>();
+            final List<XYTextAnnotation> textAnnos = new ArrayList<>();
 
             DateFormat dateFormat = DateFormat.getDateInstance(
                 DateFormat.SHORT);
@@ -189,8 +181,7 @@
                 qwd.getW());
             textAnnos.add(anno);
 
-            RiverAnnotation flysAnno =
-                new RiverAnnotation(null, null, null, themeInterpolated);
+            RiverAnnotation flysAnno = new RiverAnnotation(null, null, null, themeInterpolated);
             flysAnno.setTextAnnotations(textAnnos);
             generator.addAnnotations(flysAnno);
         }
@@ -213,13 +204,7 @@
 
         final ThemeDocument themeInterpolated = FixWQCurveGenerator.configureThemeInterpolated(theme, qwd);
 
-        XYSeries series = new StyledXYSeries(
-            bundle.getFacetDescription(),
-            false, true, themeInterpolated,
-            qwd.getInterpolated()
-                ? ShapeUtils.INTERPOLATED_SHAPE
-                : ShapeUtils.MEASURED_SHAPE);
-
+        final XYSeries series = new StyledXYSeries( bundle.getFacetDescription(), false, true, themeInterpolated, FixWQCurveGenerator.getWQDShape(qwd) );
         series.add(qwd.getQ(), qwd.getW(), false);
 
         if (visible && themeInterpolated.parseShowPointLabel()) {
@@ -231,11 +216,9 @@
                 qwd.getQ(),
                 qwd.getW());
 
-            List<XYTextAnnotation> textAnnos =
-                new ArrayList<XYTextAnnotation>();
+            List<XYTextAnnotation> textAnnos = new ArrayList<>();
             textAnnos.add(anno);
-            RiverAnnotation flysAnno =
-                new RiverAnnotation(null, null, null, themeInterpolated);
+            RiverAnnotation flysAnno = new RiverAnnotation(null, null, null, themeInterpolated);
             flysAnno.setTextAnnotations(textAnnos);
             generator.addAnnotations(flysAnno);
         }
@@ -295,7 +278,7 @@
             DateFormat dateFormat = DateFormat.getDateInstance(
                 DateFormat.SHORT);
 
-            List<XYTextAnnotation> annos = new ArrayList<XYTextAnnotation>();
+            List<XYTextAnnotation> annos = new ArrayList<>();
 
             for (QWI qw: qws) {
                 series.add(qw.getQ(), qw.getW(), false);
@@ -400,7 +383,7 @@
         boolean          visible
     ) {
         Object data = bundle.getData(generator.getContext());
-        List<StickyAxisAnnotation> xy = new ArrayList<StickyAxisAnnotation>();
+        List<StickyAxisAnnotation> xy = new ArrayList<>();
         if (data instanceof double[][]) {
             log.debug("Got double[][]");
             double [][] values = (double [][]) data;
@@ -458,7 +441,7 @@
             Double ckm = (Double) generator.getContext()
                 .getContextValue(CURRENT_KM);
 
-            if (wqkms == null || wqkms.getKms().length == 0 || ckm == null) {
+            if (wqkms.getKms().length == 0 || ckm == null) {
                 log.info("addPointFromWQKms: No event data to show.");
                 return;
             }
@@ -471,8 +454,7 @@
                     series.add(wqkms.getQ(i), wqkms.getW(i), false);
                     generator.addAxisSeries(series, axisName, visible);
                     if(visible && theme.parseShowPointLabel()) {
-                        List<XYTextAnnotation> textAnnos =
-                            new ArrayList<XYTextAnnotation>();
+                        List<XYTextAnnotation> textAnnos = new ArrayList<>();
                         XYTextAnnotation anno =
                             new CollisionFreeXYTextAnnotation(
                                 bundle.getFacetDescription(),