Mercurial > dive4elements > river
diff flys-artifacts/src/main/java/de/intevation/flys/exports/DurationCurveGenerator.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 | 9e9cfc036a3f |
children | 65f9d707caff |
line wrap: on
line diff
--- a/flys-artifacts/src/main/java/de/intevation/flys/exports/DurationCurveGenerator.java Mon Nov 28 15:00:46 2011 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/exports/DurationCurveGenerator.java Wed Nov 30 10:10:42 2011 +0000 @@ -17,6 +17,7 @@ import de.intevation.artifacts.Artifact; import de.intevation.artifactdatabase.state.Facet; +import de.intevation.artifactdatabase.state.ArtifactAndFacet; import de.intevation.flys.artifacts.FLYSArtifact; import de.intevation.flys.artifacts.model.FacetTypes; @@ -146,12 +147,11 @@ @Override public void doOut( - Artifact artifact, - Facet facet, - Document attr, - boolean visible + ArtifactAndFacet artifactFacet, + Document attr, + boolean visible ) { - String name = facet != null ? facet.getName() : null; + String name = artifactFacet.getFacetName(); logger.debug("DurationCurveGenerator.doOut: " + name); @@ -160,14 +160,11 @@ return; } - FLYSArtifact flys = (FLYSArtifact) artifact; - Facet f = flys.getNativeFacet(facet); - if (name.equals(DURATION_W)) { - doWOut((WQDay) f.getData(artifact, context), attr, visible); + doWOut((WQDay) artifactFacet.getData(context), attr, visible); } else if (name.equals(DURATION_Q)) { - doQOut((WQDay) f.getData(artifact, context), attr, visible); + doQOut((WQDay) artifactFacet.getData(context), attr, visible); } else if (name.equals(COMPUTED_DISCHARGE_MAINVALUES_Q) || name.equals(MAINVALUES_Q) @@ -175,8 +172,8 @@ || name.equals(MAINVALUES_W) ) { doAnnotations( - (FLYSAnnotation) f.getData(artifact, context), - facet, attr, visible); + (FLYSAnnotation) artifactFacet.getData(context), + artifactFacet.getFacet(), attr, visible); } else { logger.warn("Unknown facet name: " + name);