# HG changeset patch # User Felix Wolfsteller # Date 1320920440 0 # Node ID 4cc21f0a470efe4d375908f013e4bc6f7dd48426 # Parent 11c4b1429117038989b956292519073c9fa6af2f Handle Annotation Facets in DischargeLongitudinalSection diagrams. flys-artifacts/trunk@3211 c6561f87-3c4e-4783-a992-168aeb5c3f6f diff -r 11c4b1429117 -r 4cc21f0a470e flys-artifacts/ChangeLog --- a/flys-artifacts/ChangeLog Thu Nov 10 10:18:31 2011 +0000 +++ b/flys-artifacts/ChangeLog Thu Nov 10 10:20:40 2011 +0000 @@ -1,3 +1,10 @@ +2011-11-10 Felix Wolfsteller + + Handle Annotations in DischargeLongitudinalSection diagrams. + + * src/main/java/de/intevation/flys/exports/DischargeLongitudinalSectionGenerator.java: + Call doAnnotations for LONGITUDINAL_ANNOTATION facets. + 2011-11-10 Felix Wolfsteller Resolve code duplicate. diff -r 11c4b1429117 -r 4cc21f0a470e flys-artifacts/src/main/java/de/intevation/flys/exports/DischargeLongitudinalSectionGenerator.java --- a/flys-artifacts/src/main/java/de/intevation/flys/exports/DischargeLongitudinalSectionGenerator.java Thu Nov 10 10:18:31 2011 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/exports/DischargeLongitudinalSectionGenerator.java Thu Nov 10 10:20:40 2011 +0000 @@ -14,6 +14,8 @@ import de.intevation.flys.artifacts.model.WQCKms; import de.intevation.flys.artifacts.model.WQKms; +import de.intevation.flys.jfree.FLYSAnnotation; + /** * An OutGenerator that generates discharge longitudinal section curves. @@ -27,7 +29,6 @@ Logger.getLogger(DischargeLongitudinalSectionGenerator.class); - public DischargeLongitudinalSectionGenerator() { super(); } @@ -61,7 +62,11 @@ else if (name.equals(DISCHARGE_LONGITUDINAL_Q)) { doQOut((WQKms) f.getData(artifact, context), facet, attr, visible); } - else if (name.equals(DISCHARGE_LONGITUDINAL_C)) { + else if (name.equals(LONGITUDINAL_ANNOTATION)) { + doAnnotations((FLYSAnnotation) f.getData(artifact, context), + facet, attr, visible); + } + if (name.equals(DISCHARGE_LONGITUDINAL_C)) { doCorrectedWOut( (WQCKms) f.getData(artifact, context), facet,