[Dive4elements-commits] [PATCH 2 of 2] merge

[Wald Commits]

# HG changeset patch
# User Tom Gottfried <tom at intevation.de>
# Date 1372243505 -7200
# Node ID fab4abd00ef26af5a62a7cb224e08b7388fd19e7
# Parent  e32b166c881bb691529e8fb14a1ed769be5c5f1d
# Parent  641fd5bd6965fdfd12ca0cc2dcbdaf57e3f3a44d
merge

diff -r e32b166c881b -r fab4abd00ef2 artifacts/src/main/java/org/dive4elements/river/exports/MiddleBedHeightGenerator.java
--- a/artifacts/src/main/java/org/dive4elements/river/exports/MiddleBedHeightGenerator.java	Wed Jun 26 12:40:27 2013 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/exports/MiddleBedHeightGenerator.java	Wed Jun 26 12:45:05 2013 +0200
@@ -219,6 +219,13 @@
                 visible,
                 YAXIS.H.idx);
         }
+        else if (name.equals(LONGITUDINAL_ANNOTATION)) {
+            doAnnotations(
+                (RiverAnnotation) artifactAndFacet.getData(context),
+                 artifactAndFacet,
+                 attr,
+                 visible);
+        }
         else if (bedp.canHandle(name)) {
             bedp.doOut(this, artifactAndFacet, attr, visible, YAXIS.P.idx);
         }