Mercurial > dive4elements > river

comparison flys-artifacts/src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java @ 1944:21a4d2c677a1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
comparison
equal deleted inserted replaced
1943:06d8d371d244 1944:21a4d2c677a1
23 import de.intevation.flys.artifacts.model.FacetTypes; 23 import de.intevation.flys.artifacts.model.FacetTypes;
24 import de.intevation.flys.artifacts.model.WKms; 24 import de.intevation.flys.artifacts.model.WKms;
25 import de.intevation.flys.artifacts.model.WQKms; 25 import de.intevation.flys.artifacts.model.WQKms;
26 26
27 import de.intevation.flys.jfree.FLYSAnnotation; 27 import de.intevation.flys.jfree.FLYSAnnotation;
28
29 import de.intevation.artifactdatabase.state.ArtifactAndFacet;
28 30
29 import de.intevation.flys.utils.FLYSUtils; 31 import de.intevation.flys.utils.FLYSUtils;
30 import de.intevation.flys.utils.DataUtil; 32 import de.intevation.flys.utils.DataUtil;
31 33
32 34
247 * Produce output. 249 * Produce output.
248 * @param facet current facet. 250 * @param facet current facet.
249 * @param attr theme for facet 251 * @param attr theme for facet
250 */ 252 */
251 public void doOut( 253 public void doOut(
252 Artifact artifact, 254 ArtifactAndFacet artifactAndFacet,
253 Facet facet, 255 Document attr,
254 Document attr, 256 boolean visible
255 boolean visible
256 ) { 257 ) {
257 String name = facet.getName(); 258 String name = artifactAndFacet.getFacetName();
258 259
259 logger.debug("LongitudinalSectionGenerator.doOut: " + name); 260 logger.debug("LongitudinalSectionGenerator.doOut: " + name);
260 261
261 if (name == null) { 262 if (name == null) {
262 logger.error("No facet name for doOut(). No output generated!"); 263 logger.error("No facet name for doOut(). No output generated!");
263 return; 264 return;
264 } 265 }
265 266
266 FLYSArtifact flys = (FLYSArtifact) artifact; 267 Facet facet = artifactAndFacet.getFacet();
267 Facet f = flys.getNativeFacet(facet); 268
268 269 if (facet == null) {
269 if (f == null) {
270 return; 270 return;
271 } 271 }
272 272
273 if (name.equals(LONGITUDINAL_W)) { 273 if (name.equals(LONGITUDINAL_W)) {
274 doWOut((WQKms) f.getData(artifact, context), facet, attr, visible); 274 doWOut((WQKms) artifactAndFacet.getData(context), facet, attr, visible);
275 } 275 }
276 else if (name.equals(LONGITUDINAL_Q)) { 276 else if (name.equals(LONGITUDINAL_Q)) {
277 doQOut((WQKms) f.getData(artifact, context), facet, attr, visible); 277 doQOut((WQKms) artifactAndFacet.getData(context), facet, attr, visible);
278 } 278 }
279 else if (name.equals(LONGITUDINAL_ANNOTATION)) { 279 else if (name.equals(LONGITUDINAL_ANNOTATION)) {
280 doAnnotations((FLYSAnnotation) f.getData(artifact, context), 280 doAnnotations((FLYSAnnotation) artifactAndFacet.getData(context),
281 facet, attr, visible); 281 facet, attr, visible);
282 } 282 }
283 else if (name.equals(STATIC_WKMS) 283 else if (name.equals(STATIC_WKMS)
284 || name.equals(HEIGHTMARKS_POINTS) 284 || name.equals(HEIGHTMARKS_POINTS)
285 || name.equals(STATIC_WQKMS)) { 285 || name.equals(STATIC_WQKMS)) {
286 doWOut((WKms) f.getData(artifact, context), facet, attr, visible); 286 doWOut((WKms) artifactAndFacet.getData(context), facet, attr, visible);
287 } 287 }
288 else if (name.equals(W_DIFFERENCES)) { 288 else if (name.equals(W_DIFFERENCES)) {
289 doWDifferencesOut( 289 doWDifferencesOut(
290 (WKms) f.getData(artifact, context), 290 (WKms) artifactAndFacet.getData(context),
291 facet, 291 facet,
292 attr, 292 attr,
293 visible); 293 visible);
294 } 294 }
295 else { 295 else {
http://dive4elements.wald.intevation.org