--- a/artifacts/src/main/java/org/dive4elements/river/exports/DiagramAttributes.java	Fri Sep 20 10:29:14 2013 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/exports/DiagramAttributes.java	Fri Sep 20 10:30:03 2013 +0200
@@ -58,27 +58,6 @@
         }
     } // class AxisAttributes
 
-    public static class AxisProcessor {
-        private Processor processor;
-        private String axisName;
-
-        public AxisProcessor() {
-        }
-
-        public AxisProcessor(Processor processor, String axisName) {
-            this.processor = processor;
-            this.axisName  = axisName;
-        }
-
-        public Processor getProcessor() {
-            return processor;
-        }
-
-        public String getAxisName() {
-            return axisName;
-        }
-    } // class AxisProcessor
-
     public static class Argument {
         private String expression;
         private String type;
@@ -160,14 +139,14 @@
     } // class Title
 
     private List<AxisAttributes> axesAttrs;
-    private List<AxisProcessor> axesProcessors;
+    private List<Processor> processors;
 
     private Title title;
     private Title subtitle;
 
     public DiagramAttributes() {
         axesAttrs      = new ArrayList<AxisAttributes>(5);
-        axesProcessors = new ArrayList<AxisProcessor>(5);
+        processors     = new ArrayList<Processor>(5);
     }
 
     public DiagramAttributes(Element config) {
@@ -200,8 +179,8 @@
         }
     }
 
-    public List<AxisProcessor> getAxesProcessors() {
-        return axesProcessors;
+    public List<Processor> getProcessors() {
+        return processors;
     }
 
     public Title getTitle() {
@@ -226,7 +205,8 @@
             try {
                 Processor processor =
                     (Processor)Class.forName(className).newInstance();
-                axesProcessors.add(new AxisProcessor(processor, axisName));
+                processor.setAxisName(axisName);
+                processors.add(processor);
             }
             catch (ClassNotFoundException cnfe) {
                 log.error(cnfe, cnfe);