[PATCH] Close branch longitudinal-symmetry. Diagram refactoring is now done in branch generator-refactoring

[Wald Commits]

# HG changeset patch
# User Tom Gottfried <tom.gottfried at intevation.de>
# Date 1379675482 -7200
# Branch longitudinal-symmetry
# Node ID a1ff1b7e2deef58d2cbf71e8f833764685480d2a
# Parent  372c255714df194a204ea6d62d16b5b39d69b413
Close branch longitudinal-symmetry. Diagram refactoring is now done in branch generator-refactoring.

diff -r 372c255714df -r a1ff1b7e2dee artifacts/doc/conf/conf.xml
--- a/artifacts/doc/conf/conf.xml	Fri Aug 09 13:36:05 2013 +0200
+++ b/artifacts/doc/conf/conf.xml	Fri Sep 20 13:11:22 2013 +0200
@@ -291,7 +291,7 @@
         <output-generator name="cross_section_chartinfo">org.dive4elements.river.exports.CrossSectionInfoGenerator</output-generator>
         <output-generator name="computed_discharge_curve">org.dive4elements.river.exports.ComputedDischargeCurveGenerator</output-generator>
         <output-generator name="computed_discharge_curve_chartinfo">org.dive4elements.river.exports.ComputedDischargeCurveInfoGenerator</output-generator>
-        <output-generator name="longitudinal_section">org.dive4elements.river.exports.LongitudinalSectionGenerator</output-generator>
+        <output-generator name="longitudinal_section">org.dive4elements.river.exports.WLongitudinalSectionGenerator</output-generator>
         <output-generator name="longitudinal_section_chartinfo">org.dive4elements.river.exports.LongitudinalSectionInfoGenerator</output-generator>
         <output-generator name="duration_curve">org.dive4elements.river.exports.DurationCurveGenerator</output-generator>
         <output-generator name="duration_curve_chartinfo">org.dive4elements.river.exports.DurationCurveInfoGenerator</output-generator>
diff -r 372c255714df -r a1ff1b7e2dee artifacts/src/main/java/org/dive4elements/river/exports/LongitudinalSectionGenerator.java
--- a/artifacts/src/main/java/org/dive4elements/river/exports/LongitudinalSectionGenerator.java	Fri Aug 09 13:36:05 2013 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/exports/LongitudinalSectionGenerator.java	Fri Sep 20 13:11:22 2013 +0200
@@ -55,18 +55,18 @@
 extends      XYChartGenerator
 implements   FacetTypes
 {
-    public enum YAXIS {
-        W(0), // waterlevel
-        D(1), // waterlevel-difference
-        Q(2), // discharge
-        V(3), // flow velocity
-        T(4), // tau (shear stress)
-        O(3); // diameter
-        protected int idx;
-        private YAXIS(int c) {
-            idx = c;
-        }
-    }
+    // public enum YAXIS {
+    //     W(0), // waterlevel
+    //     D(1), // waterlevel-difference
+    //     Q(2), // discharge
+    //     V(3), // flow velocity
+    //     T(4), // tau (shear stress)
+    //     O(3); // diameter
+    //     protected int idx;
+    //     private YAXIS(int c) {
+    //         idx = c;
+    //     }
+    // }
 
     /** The logger that is used in this generator. */
     private static Logger logger =
@@ -83,8 +83,8 @@
     /** TODO:
      * create a class which extends this one to avoid following definition here 
      */
-    public static final String I18N_CHART_TITLE =
-        "chart.longitudinal.section.title";
+    //    public static final String I18N_CHART_TITLE =
+    //	"chart.longitudinal.section.title";
     public static final String I18N_CHART_TITLE_DEFAULT  = 
 	"L\u00e4ngsschnitt";