Mercurial > dive4elements > river
diff flys-artifacts/src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java @ 1944:21a4d2c677a1
Changed doOut signature, side effect from blackboard feature (to come).
flys-artifacts/trunk@3334 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author | Felix Wolfsteller <felix.wolfsteller@intevation.de> |
---|---|
date | Wed, 30 Nov 2011 10:10:42 +0000 |
parents | 0fa53fa65401 |
children | 65f9d707caff |
line wrap: on
line diff
--- a/flys-artifacts/src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java Mon Nov 28 15:00:46 2011 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java Wed Nov 30 10:10:42 2011 +0000 @@ -26,6 +26,8 @@ import de.intevation.flys.jfree.FLYSAnnotation; +import de.intevation.artifactdatabase.state.ArtifactAndFacet; + import de.intevation.flys.utils.FLYSUtils; import de.intevation.flys.utils.DataUtil; @@ -249,12 +251,11 @@ * @param attr theme for facet */ public void doOut( - Artifact artifact, - Facet facet, - Document attr, - boolean visible + ArtifactAndFacet artifactAndFacet, + Document attr, + boolean visible ) { - String name = facet.getName(); + String name = artifactAndFacet.getFacetName(); logger.debug("LongitudinalSectionGenerator.doOut: " + name); @@ -263,31 +264,30 @@ return; } - FLYSArtifact flys = (FLYSArtifact) artifact; - Facet f = flys.getNativeFacet(facet); + Facet facet = artifactAndFacet.getFacet(); - if (f == null) { + if (facet == null) { return; } if (name.equals(LONGITUDINAL_W)) { - doWOut((WQKms) f.getData(artifact, context), facet, attr, visible); + doWOut((WQKms) artifactAndFacet.getData(context), facet, attr, visible); } else if (name.equals(LONGITUDINAL_Q)) { - doQOut((WQKms) f.getData(artifact, context), facet, attr, visible); + doQOut((WQKms) artifactAndFacet.getData(context), facet, attr, visible); } else if (name.equals(LONGITUDINAL_ANNOTATION)) { - doAnnotations((FLYSAnnotation) f.getData(artifact, context), + doAnnotations((FLYSAnnotation) artifactAndFacet.getData(context), facet, attr, visible); } else if (name.equals(STATIC_WKMS) || name.equals(HEIGHTMARKS_POINTS) || name.equals(STATIC_WQKMS)) { - doWOut((WKms) f.getData(artifact, context), facet, attr, visible); + doWOut((WKms) artifactAndFacet.getData(context), facet, attr, visible); } else if (name.equals(W_DIFFERENCES)) { doWDifferencesOut( - (WKms) f.getData(artifact, context), + (WKms) artifactAndFacet.getData(context), facet, attr, visible);