[PATCH 3 of 4] merge

[Wald Commits]

# HG changeset patch
# User Tom Gottfried <tom at intevation.de>
# Date 1372458058 -7200
# Node ID 17398e239c77164d51da229e4a79c7735dba8934
# Parent  769d9ec8abac67ceafaa57ced52ac096f10e080c
# Parent  7285f6e1be3d40fc220334966a175d1167e59ee0
merge

diff -r 769d9ec8abac -r 17398e239c77 .hgtags
--- a/.hgtags	Sat Jun 29 00:15:14 2013 +0200
+++ b/.hgtags	Sat Jun 29 00:20:58 2013 +0200
@@ -54,3 +54,4 @@
 5733d7f27196c5a8cf18231fbf187738f8fea560 3.0.7
 eec895f6ec801a7faaed96e9f01721e1143e7bb8 3.0.8
 41152c3a532d63a25e9fa348ca4286bdd76069ef 3.0.9
+5f4893db41e4fed644ddbd91bf4cdf0ac7952161 3.0.10
diff -r 769d9ec8abac -r 17398e239c77 artifacts/doc/conf/artifacts/winfo.xml
--- a/artifacts/doc/conf/artifacts/winfo.xml	Sat Jun 29 00:15:14 2013 +0200
+++ b/artifacts/doc/conf/artifacts/winfo.xml	Sat Jun 29 00:20:58 2013 +0200
@@ -444,10 +444,12 @@
             </outputmodes>
         </state>
 
+        <!-- The brigde to UeSF
         <transition transition="org.dive4elements.river.artifacts.transitions.DefaultTransition">
             <from state="state.winfo.waterlevel"/>
             <to state="state.winfo.uesk.dgm"/>
         </transition>
+        -->
 
         <state id="state.winfo.uesk.wsp" description="state.winfo.uesk.wsp" state="org.dive4elements.river.artifacts.states.WaterlevelSelectState" helpText="help.state.winfo.uesk.wsp">
             <data name="wsp" type="String" />
diff -r 769d9ec8abac -r 17398e239c77 artifacts/src/main/java/org/dive4elements/river/artifacts/model/FastCrossSectionChunk.java
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/FastCrossSectionChunk.java	Sat Jun 29 00:15:14 2013 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/FastCrossSectionChunk.java	Sat Jun 29 00:20:58 2013 +0200
@@ -19,6 +19,10 @@
 
 import org.apache.log4j.Logger;
 
+/**
+ * Number of FastCrossSectionLines, e.g. to store in cache and retrieve
+ * a single contain CrossSectionLine by its km.
+ */
 public class FastCrossSectionChunk
 implements   Serializable
 {
diff -r 769d9ec8abac -r 17398e239c77 artifacts/src/main/java/org/dive4elements/river/artifacts/states/CalculationSelect.java
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/states/CalculationSelect.java	Sat Jun 29 00:15:14 2013 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/states/CalculationSelect.java	Sat Jun 29 00:20:58 2013 +0200
@@ -77,10 +77,11 @@
         CALCULATION_DISCHARGE_CURVE,
         CALCULATION_HISTORICAL_DISCHARGE_CURVE,
         CALCULATION_DURATION_CURVE,
-        CALCULATION_DISCHARGE_LONGITUDINAL_CURVE,
+//        CALCULATION_DISCHARGE_LONGITUDINAL_CURVE,
         CALCULATION_W_DIFFERENCES,
-        CALCULATION_REFERENCE_CURVE,
-        CALCULATION_EXTREME};
+        CALCULATION_REFERENCE_CURVE //,
+//        CALCULATION_EXTREME
+    };
 
 
     /** Error message that is thrown if no mode has been chosen. */
diff -r 769d9ec8abac -r 17398e239c77 backend/src/main/java/org/dive4elements/river/importer/parsers/W80CSVParser.java
--- a/backend/src/main/java/org/dive4elements/river/importer/parsers/W80CSVParser.java	Sat Jun 29 00:15:14 2013 +0200
+++ b/backend/src/main/java/org/dive4elements/river/importer/parsers/W80CSVParser.java	Sat Jun 29 00:20:58 2013 +0200
@@ -192,8 +192,9 @@
 
     /**
      * Add a Point (YZ,Index) to the current cross section line.
-     * @param y The y coordinate of new point.
-     * @param z The z coordinate of new point.
+     * @param y The y coordinate of new point in GK.
+     * @param z The z coordinate of new point in GK.
+     * @param height The hight (3rd coord) of point, in meter.
      * @param idx Ignored, the parameter of new point.
      * @return true if point could been added, false otherwise (e.g. not
      *         parsable y or z values.