# HG changeset patch
# User Felix Wolfsteller <felix.wolfsteller@intevation.de>
# Date 1320843313 0
# Node ID 3918bd7eb4e121d4b37ded878fb0c58c7319e4d5
# Parent  8e5b4ea2851c648c05e36222198ab7fbee9bf359
Cosmetics, removed duplicate code.

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

diff -r 8e5b4ea2851c -r 3918bd7eb4e1 flys-artifacts/ChangeLog
--- a/flys-artifacts/ChangeLog	Wed Nov 09 12:48:36 2011 +0000
+++ b/flys-artifacts/ChangeLog	Wed Nov 09 12:55:13 2011 +0000
@@ -1,3 +1,8 @@
+2011-11-09  Felix Wolfsteller <felix.wolfsteller@intevation.de>
+
+	* src/main/java/de/intevation/flys/exports/DischargeCurveGenerator.java:
+	  Removed duplicate code.
+
 2011-11-09  Felix Wolfsteller <felix.wolfsteller@intevation.de>
 
 	* src/main/java/de/intevation/flys/artifacts/MainValuesArtifact.java
diff -r 8e5b4ea2851c -r 3918bd7eb4e1 flys-artifacts/src/main/java/de/intevation/flys/exports/DischargeCurveGenerator.java
--- a/flys-artifacts/src/main/java/de/intevation/flys/exports/DischargeCurveGenerator.java	Wed Nov 09 12:48:36 2011 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/exports/DischargeCurveGenerator.java	Wed Nov 09 12:55:13 2011 +0000
@@ -126,15 +126,11 @@
                 visible);
         }
         else if (name.equals(COMPUTED_DISCHARGE_MAINVALUES_Q)
-                || name.equals(MAINVALUES_Q))
-        {
-            doMainValueQAnnotations(
-                nativeFacet.getData(artifact, context), facet, theme, visible);
-        }
-        else if (name.equals(COMPUTED_DISCHARGE_MAINVALUES_W)
+                || name.equals(MAINVALUES_Q)
+                || name.equals(COMPUTED_DISCHARGE_MAINVALUES_W)
                 || name.equals(MAINVALUES_W))
         {
-            doMainValueWAnnotations(
+            doMainValueAnnotations(
                 nativeFacet.getData(artifact, context), facet, theme, visible);
         }
         else {
@@ -184,7 +180,7 @@
     /**
      * Store W MainValues as annotations for later plotting.
      */
-    protected void doMainValueWAnnotations(
+    protected void doMainValueAnnotations(
         Object   o,
         Facet    facet,
         Document theme,
@@ -197,26 +193,5 @@
         fa.setLabel(facet.getDescription());
         addAnnotations(fa, visible);
     }
-
-
-    /**
-     * Store Q MainValues as annotations for later plotting.
-     */
-    protected void doMainValueQAnnotations(
-        Object   o,
-        Facet    facet,
-        Document theme,
-        boolean  visible
-    ) {
-        logger.debug("ComputedDischargeCurveGenerator set Q MainValues.");
-
-        FLYSAnnotation fa = (FLYSAnnotation) o;
-        fa.setTheme(theme);
-        fa.setLabel(facet.getDescription());
-        addAnnotations(fa, visible);
-    }
-
-
-
 }
 // vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 :