diff artifacts/src/main/java/org/dive4elements/river/exports/process/AnnotationProcessor.java @ 7075:253d80af5b7f generator-refactoring

More Processor refactoring - Unify aandf aaf and bundle variable names to bundle - Factor out diagram inversion code - Add function with new signature to BedDiffYear and QOut processors
author Andre Heinecke <aheinecke@intevation.de>
date Fri, 20 Sep 2013 16:25:43 +0200
parents eb24d5203d17
children 41567bf1e131
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/exports/process/AnnotationProcessor.java	Fri Sep 20 15:44:39 2013 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/exports/process/AnnotationProcessor.java	Fri Sep 20 16:25:43 2013 +0200
@@ -32,7 +32,7 @@
     @Override
     public void doOut(
             DiagramGenerator generator,
-            ArtifactAndFacet aaf,
+            ArtifactAndFacet bundle,
             ThemeDocument    theme,
             boolean          visible) {
         if (!visible) {
@@ -40,21 +40,21 @@
             return;
         }
         CallContext context = generator.getCallContext();
-        if (!(aaf.getData(context) instanceof RiverAnnotation)) {
+        if (!(bundle.getData(context) instanceof RiverAnnotation)) {
             // Just a bit defensive should not happen
             logger.error("Incompatible facet in doOut");
             return;
         }
-        RiverAnnotation ra = (RiverAnnotation)aaf.getData(context);
+        RiverAnnotation ra = (RiverAnnotation)bundle.getData(context);
         ra.setTheme(theme);
-        ra.setLabel(aaf.getFacetDescription());
+        ra.setLabel(bundle.getFacetDescription());
         generator.addAnnotations(ra);
     }
 
     @Override
     public void doOut(
             XYChartGenerator generator,
-            ArtifactAndFacet aaf,
+            ArtifactAndFacet bundle,
             ThemeDocument    theme,
             boolean          visible,
             int              index)
@@ -64,14 +64,14 @@
             return;
         }
         CallContext context = generator.getCallContext();
-        if (!(aaf.getData(context) instanceof RiverAnnotation)) {
+        if (!(bundle.getData(context) instanceof RiverAnnotation)) {
             // Just a bit defensive should not happen
             logger.error("Incompatible facet in doOut");
             return;
         }
-        RiverAnnotation ra = (RiverAnnotation)aaf.getData(context);
+        RiverAnnotation ra = (RiverAnnotation)bundle.getData(context);
         ra.setTheme(theme);
-        ra.setLabel(aaf.getFacetDescription());
+        ra.setLabel(bundle.getFacetDescription());
         generator.addAnnotations(ra);
     }
 

http://dive4elements.wald.intevation.org