Mercurial > dive4elements > river
diff flys-artifacts/src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java @ 1861:11c4b1429117
Cosmetics, resolve code duplicate.
flys-artifacts/trunk@3210 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author | Felix Wolfsteller <felix.wolfsteller@intevation.de> |
---|---|
date | Thu, 10 Nov 2011 10:18:31 +0000 |
parents | a97764363ba2 |
children | 7c52e9cb2a72 |
line wrap: on
line diff
--- a/flys-artifacts/src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java Thu Nov 10 10:13:57 2011 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java Thu Nov 10 10:18:31 2011 +0000 @@ -277,9 +277,12 @@ doQOut((WQKms) f.getData(artifact, context), facet, attr, visible); } else if (name.equals(LONGITUDINAL_ANNOTATION)) { - doAnnotationsOut(f.getData(artifact, context), facet, attr, visible); + doAnnotations((FLYSAnnotation) f.getData(artifact, context), + facet, attr, visible); } - else if (name.equals(STATIC_WKMS) || name.equals(HEIGHTMARKS_POINTS)) { + else if (name.equals(STATIC_WKMS) + || name.equals(HEIGHTMARKS_POINTS) + || name.equals(STATIC_WQKMS)) { doWOut((WKms) f.getData(artifact, context), facet, attr, visible); } else if (name.equals(W_DIFFERENCES)) { @@ -297,33 +300,6 @@ /** - * Register annotations available for the diagram. - * - * @param o list of annotations (data of facet). - * @param facet The facet. This facet does NOT support any data objects. Use - * FLYSArtifact.getNativeFacet() instead to retrieve a Facet which supports - * data. - * @param theme yet ignored. - * @param visible The visibility of the annotations. - */ - protected void doAnnotationsOut( - Object o, - Facet facet, - Document theme, - boolean visible - ) { - logger.debug("LongitudinalSectionGenerator.doAnnotationsOut"); - - // Add all annotations in list o to our annotation pool. - // TODO Duplicate in ComputedDischartgeCurveGenerator, merge - FLYSAnnotation fa = (FLYSAnnotation) o; - fa.setTheme(theme); - fa.setLabel(facet.getDescription()); - addAnnotations(fa, visible); - } - - - /** * Process the output for W facets in a longitudinal section curve. * * @param wqkms An array of WQKms values.