[PATCH] Cleaned up generator dependencies

[Wald Commits]

# HG changeset patch
# User Sascha L. Teichmann <teichmann at intevation.de>
# Date 1409306170 -7200
# Node ID 87161da4b44465b0e9b67bc29d24b93dcdbb9656
# Parent  ecd84d8b908ac2c71529c058764f6ae616f760e3
Cleaned up generator dependencies.

diff -r ecd84d8b908a -r 87161da4b444 artifacts/doc/conf/generators/discharge-diagrams.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/artifacts/doc/conf/generators/discharge-diagrams.xml	Fri Aug 29 11:56:10 2014 +0200
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE discharge-diagrams [
+<!ENTITY sqrelation-defaults SYSTEM "sqrelation-diagram-defaults.xml">
+]>
+<discharge-diagrams>
+  <output-generator names="discharge_curve" class="org.dive4elements.river.exports.DischargeCurveGenerator"/>
+  <output-generator names="discharge_curve_chartinfo" class="org.dive4elements.river.exports.DischargeCurveInfoGenerator"/>
+  <output-generator names="computed_discharge_curve" class="org.dive4elements.river.exports.ComputedDischargeCurveGenerator"/>
+  <output-generator names="computed_discharge_curve_chartinfo" class="org.dive5elements.river.exports.ComputedDischargeCurveInfoGenerator"/>
+  <output-generator names="sq_relation_a,sq_relation_a_chartinfo" class="org.dive4elements.river.exports.DiagramGenerator" converter="org.dive4elements.river.exports.DiagramAttributes"><title key="chart.sq_relation_a.title" default=""/>
+      &sqrelation-defaults;
+    </output-generator>
+  <output-generator names="sq_relation_b,sq_relation_b_chartinfo" class="org.dive4elements.river.exports.DiagramGenerator" converter="org.dive4elements.river.exports.DiagramAttributes"><title key="chart.sq_relation_b.title" default=""/>
+      &sqrelation-defaults;
+    </output-generator>
+  <output-generator names="sq_relation_c,sq_relation_c_chartinfo" class="org.dive4elements.river.exports.DiagramGenerator" converter="org.dive4elements.river.exports.DiagramAttributes"><title key="chart.sq_relation_c.title" default=""/>
+      &sqrelation-defaults;
+    </output-generator>
+  <output-generator names="sq_relation_d,sq_relation_d_chartinfo" class="org.dive4elements.river.exports.DiagramGenerator" converter="org.dive4elements.river.exports.DiagramAttributes"><title key="chart.sq_relation_d.title" default=""/>
+      &sqrelation-defaults;
+    </output-generator>
+  <output-generator names="sq_relation_e,sq_relation_e_chartinfo" class="org.dive4elements.river.exports.DiagramGenerator" converter="org.dive4elements.river.exports.DiagramAttributes"><title key="chart.sq_relation_e.title" default=""/>
+      &sqrelation-defaults;
+    </output-generator>
+  <output-generator names="sq_relation_f,sq_relation_f_chartinfo" class="org.dive4elements.river.exports.DiagramGenerator" converter="org.dive4elements.river.exports.DiagramAttributes"><title key="chart.sq_relation_f.title" default=""/>
+      &sqrelation-defaults;
+  </output-generator>
+  <output-generator names="historical_discharge" class="org.dive4elements.river.exports.HistoricalDischargeCurveGenerator"/>
+  <output-generator names="historical_discharge_chartinfo" class="org.dive4elements.river.exports.HistoricalDischargeCurveInfoGenerator"/>
+  <output-generator names="historical_discharge_wq" class="org.dive4elements.river.exports.HistoricalDischargeWQCurveGenerator"/>
+  <output-generator names="historical_discharge_wq_chartinfo" class="org.dive4elements.river.exports.HistoricalDischargeWQCurveInfoGenerator"/>
+</discharge-diagrams>
diff -r ecd84d8b908a -r 87161da4b444 artifacts/doc/conf/generators/generators.xml
--- a/artifacts/doc/conf/generators/generators.xml	Fri Aug 29 11:43:15 2014 +0200
+++ b/artifacts/doc/conf/generators/generators.xml	Fri Aug 29 11:56:10 2014 +0200
@@ -1,50 +1,13 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE output-generators [
-  <!ENTITY sqrelation-defaults SYSTEM "sqrelation-diagram-defaults.xml">
+<!ENTITY discharge-diagrams "discharge-diagrams.xml">
+<!ENTITY longitudinal-diagrams "longitudinal-diagrams.xml">
 ]>
 <output-generators>
-    <output-generator names="discharge_curve" class="org.dive4elements.river.exports.DischargeCurveGenerator"/>
-    <output-generator names="discharge_curve_chartinfo" class="org.dive4elements.river.exports.DischargeCurveInfoGenerator"/>
+    &longitudinal-diagrams;
+    &discharge-diagrams;
     <output-generator names="cross_section" class="org.dive4elements.river.exports.CrossSectionGenerator"/>
     <output-generator names="cross_section_chartinfo" class="org.dive4elements.river.exports.CrossSectionInfoGenerator"/>
-    <output-generator names="computed_discharge_curve" class="org.dive4elements.river.exports.ComputedDischargeCurveGenerator"/>
-    <output-generator names="computed_discharge_curve_chartinfo" class="org.dive4elements.river.exports.ComputedDischargeCurveInfoGenerator"/>
-    <output-generator names="sq_relation_a,sq_relation_a_chartinfo"
-      class="org.dive4elements.river.exports.DiagramGenerator"
-      converter="org.dive4elements.river.exports.DiagramAttributes">
-      <title key="chart.sq_relation_a.title" default=""/>
-      &sqrelation-defaults;
-    </output-generator>
-    <output-generator names="sq_relation_b,sq_relation_b_chartinfo"
-      class="org.dive4elements.river.exports.DiagramGenerator"
-      converter="org.dive4elements.river.exports.DiagramAttributes">
-      <title key="chart.sq_relation_b.title" default=""/>
-      &sqrelation-defaults;
-    </output-generator>
-    <output-generator names="sq_relation_c,sq_relation_c_chartinfo"
-      class="org.dive4elements.river.exports.DiagramGenerator"
-      converter="org.dive4elements.river.exports.DiagramAttributes">
-      <title key="chart.sq_relation_c.title" default=""/>
-      &sqrelation-defaults;
-    </output-generator>
-    <output-generator names="sq_relation_d,sq_relation_d_chartinfo"
-      class="org.dive4elements.river.exports.DiagramGenerator"
-      converter="org.dive4elements.river.exports.DiagramAttributes">
-      <title key="chart.sq_relation_d.title" default=""/>
-      &sqrelation-defaults;
-    </output-generator>
-    <output-generator names="sq_relation_e,sq_relation_e_chartinfo"
-      class="org.dive4elements.river.exports.DiagramGenerator"
-      converter="org.dive4elements.river.exports.DiagramAttributes">
-      <title key="chart.sq_relation_e.title" default=""/>
-      &sqrelation-defaults;
-    </output-generator>
-    <output-generator names="sq_relation_f,sq_relation_f_chartinfo"
-      class="org.dive4elements.river.exports.DiagramGenerator"
-      converter="org.dive4elements.river.exports.DiagramAttributes">
-      <title key="chart.sq_relation_f.title" default=""/>
-      &sqrelation-defaults;
-    </output-generator>
     <output-generator names="duration_curve" class="org.dive4elements.river.exports.DurationCurveGenerator"/>
     <output-generator names="duration_curve_chartinfo" class="org.dive4elements.river.exports.DurationCurveInfoGenerator"/>
     <output-generator names="waterlevel_export" class="org.dive4elements.river.exports.WaterlevelExporter"/>
@@ -64,10 +27,6 @@
     <output-generator names="reference_curve_normalized_chartinfo" class="org.dive4elements.river.exports.NormalizedReferenceCurveInfoGenerator"/>
     <output-generator names="reference_curve_chartinfo" class="org.dive4elements.river.exports.ReferenceCurveInfoGenerator"/>
     <output-generator names="reference_curve_export" class="org.dive4elements.river.exports.ReferenceCurveExporter"/>
-    <output-generator names="historical_discharge" class="org.dive4elements.river.exports.HistoricalDischargeCurveGenerator"/>
-    <output-generator names="historical_discharge_chartinfo" class="org.dive4elements.river.exports.HistoricalDischargeCurveInfoGenerator"/>
-    <output-generator names="historical_discharge_wq" class="org.dive4elements.river.exports.HistoricalDischargeWQCurveGenerator"/>
-    <output-generator names="historical_discharge_wq_chartinfo" class="org.dive4elements.river.exports.HistoricalDischargeWQCurveInfoGenerator"/>
     <output-generator names="historical_discharge_export" class="org.dive4elements.river.exports.HistoricalDischargeCurveExporter"/>
     <output-generator names="flow_velocity_export" class="org.dive4elements.river.exports.FlowVelocityExporter"/>
     <output-generator names="bedheight_middle_export" class="org.dive4elements.river.exports.MiddleBedHeightExporter"/>