# HG changeset patch
# User Tim Englich <tim.englich@intevation.de>
# Date 1272373824 0
# Node ID 2b87074321211dcf150fc579a552ecd93f0a507c
# Parent  1afa4f5d419035261e84c5ce3a490beeed013bf3
ISSUE262: Removed duplicate StateIds

gnv-artifacts/trunk@1002 c6561f87-3c4e-4783-a992-168aeb5c3f6f

diff -r 1afa4f5d4190 -r 2b8707432121 gnv-artifacts/ChangeLog
--- a/gnv-artifacts/ChangeLog	Tue Apr 27 12:52:37 2010 +0000
+++ b/gnv-artifacts/ChangeLog	Tue Apr 27 13:10:24 2010 +0000
@@ -1,3 +1,13 @@
+2010-04-27  Tim Englich  <tim.englich@intevation.de>
+
+	  ISSUE262
+
+	* doc/conf/products/horizontalprofile/conf_mesh_cross.xml: 
+	  Renamed StateIds because they were similar to the StateIds of
+	  the product Horrizontal Profile.
+	  This was done to prevent possible trouble using the Cachemechanism
+	  which use the StateId as part of the Key.
+
 2010-04-27  Ingo Weinzierl <ingo.weinzierl@intevation.de>
 
 	  Issue218 & Issue220
diff -r 1afa4f5d4190 -r 2b8707432121 gnv-artifacts/doc/conf/products/horizontalprofile/conf_mesh_cross.xml
--- a/gnv-artifacts/doc/conf/products/horizontalprofile/conf_mesh_cross.xml	Tue Apr 27 12:52:37 2010 +0000
+++ b/gnv-artifacts/doc/conf/products/horizontalprofile/conf_mesh_cross.xml	Tue Apr 27 13:10:24 2010 +0000
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <artifact name="horizontalProfileMeshCross">
   <states>
-        <state id="horizontalprofile_mesh_mapviewerswitch" description="horizontalprofile_mesh_area_one" state="de.intevation.gnv.state.DefaultAutoResumeState">
+        <state id="horizontalprofile_mesh_cross_mapviewerswitch" description="horizontalprofile_mesh_cross_area_one" state="de.intevation.gnv.state.DefaultAutoResumeState">
             <!-- Empty State which will be used to integrate the switch for a 
                  standalone and an mapviewer based call. -->
             <inputvalues>
@@ -11,18 +11,18 @@
         </state>
         
         <transition transition="de.intevation.gnv.transition.PresettingsValueCompareTransition">
-            <from state="horizontalprofile_mesh_mapviewerswitch"/>
-            <to state="horizontalprofile_mesh_area"/>
+            <from state="horizontalprofile_mesh_cross_mapviewerswitch"/>
+            <to state="horizontalprofile_mesh_cross_area"/>
             <condition inputvalue="geometry" value="POLYGON" operator="notequal"/>
         </transition>
         
         <transition transition="de.intevation.gnv.transition.PresettingsValueCompareTransition">
-            <from state="horizontalprofile_mesh_mapviewerswitch"/>
-            <to state="horizontalprofile_mesh_with_wkt"/>
+            <from state="horizontalprofile_mesh_cross_mapviewerswitch"/>
+            <to state="horizontalprofile_mesh_cross_with_wkt"/>
             <condition inputvalue="geometry" value="POLYGON" operator="equal"/>
         </transition>
         
-        <state id="horizontalprofile_mesh_with_wkt" description="timeseries_mesh" state="de.intevation.gnv.state.PreSettingsTransferState">
+        <state id="horizontalprofile_mesh_cross_with_wkt" description="timeseries_mesh" state="de.intevation.gnv.state.PreSettingsTransferState">
             <queryID>verticalprofile_mesh_with_wkt</queryID>
             <dataname>meshid</dataname>
             <data-multiselect>false</data-multiselect>
@@ -36,11 +36,11 @@
         </state>
         
         <transition transition="de.intevation.gnv.transition.DefaultTransition">
-            <from state="horizontalprofile_mesh_with_wkt"/>
-            <to state="horizontalprofile_mesh_linestring"/>
+            <from state="horizontalprofile_mesh_cross_with_wkt"/>
+            <to state="horizontalprofile_mesh_cross_linestring"/>
         </transition>
         
-        <state id="horizontalprofile_mesh_area" description="horizontalprofile_mesh_area_one" state="de.intevation.gnv.state.DefaultState">
+        <state id="horizontalprofile_mesh_cross_area" description="horizontalprofile_mesh_cross_area_one" state="de.intevation.gnv.state.DefaultState">
                <queryID>area_filter</queryID>
                <dataname>areaid</dataname>
                <data-multiselect>false</data-multiselect>
@@ -53,17 +53,17 @@
           </state>
           
           <transition transition="de.intevation.gnv.transition.ValueCompareTransition">
-              <from state="horizontalprofile_mesh_area"/>
-              <to state="horizontalprofile_mesh_subarea"/>
+              <from state="horizontalprofile_mesh_cross_area"/>
+              <to state="horizontalprofile_mesh_cross_subarea"/>
               <condition inputvalue="areaid" value="n/n" operator="notequal"/>
           </transition>
           <transition transition="de.intevation.gnv.transition.ValueCompareTransition">
-              <from state="horizontalprofile_mesh_area"/>
-              <to state="horizontalprofile_mesh_without_geom"/>
+              <from state="horizontalprofile_mesh_cross_area"/>
+              <to state="horizontalprofile_mesh_cross_without_geom"/>
               <condition inputvalue="areaid" value="n/n" operator="equal"/>
           </transition>
         
-          <state id="horizontalprofile_mesh_subarea" description="horizontalprofile_mesh_subaera" state="de.intevation.gnv.state.DefaultState">
+          <state id="horizontalprofile_mesh_cross_subarea" description="horizontalprofile_mesh_cross_subaera" state="de.intevation.gnv.state.DefaultState">
                <queryID>subarea_filter</queryID>
                <dataname>subareaid</dataname>
                <data-multiselect>false</data-multiselect>
@@ -76,11 +76,11 @@
          </state>
          
          <transition transition="de.intevation.gnv.transition.DefaultTransition">
-             <from state="horizontalprofile_mesh_subarea"/>
-             <to state="horizontalprofile_mesh"/>
+             <from state="horizontalprofile_mesh_cross_subarea"/>
+             <to state="horizontalprofile_mesh_cross"/>
          </transition>
          
-         <state id="horizontalprofile_mesh_without_geom" description="horizontalprofile_mesh_without_geom" state="de.intevation.gnv.state.DefaultState">
+         <state id="horizontalprofile_mesh_cross_without_geom" description="horizontalprofile_mesh_cross_without_geom" state="de.intevation.gnv.state.DefaultState">
               <queryID>verticalprofile_mesh</queryID>
               <dataname>meshid</dataname>
               <data-multiselect>false</data-multiselect>
@@ -92,18 +92,18 @@
          </state>
           
         <transition transition="de.intevation.gnv.transition.PresettingsValueCompareTransition">
-            <from state="horizontalprofile_mesh_without_geom"/>
-            <to state="horizontalprofile_mesh_linestring"/>
+            <from state="horizontalprofile_mesh_cross_without_geom"/>
+            <to state="horizontalprofile_mesh_cross_linestring"/>
             <condition inputvalue="geometry" value="LINESTRING" operator="notequal"/>
         </transition>
         
         <transition transition="de.intevation.gnv.transition.PresettingsValueCompareTransition">
-            <from state="horizontalprofile_mesh_without_geom"/>
-            <to state="horizontalprofile_meshpoint_parameter_presettings"/>
+            <from state="horizontalprofile_mesh_cross_without_geom"/>
+            <to state="horizontalprofile_meshpoint_cross_parameter_presettings"/>
             <condition inputvalue="geometry" value="LINESTRING" operator="equal"/>
         </transition>
           
-        <state id="horizontalprofile_mesh" description="horizontalprofile_mesh" state="de.intevation.gnv.state.DefaultState">
+        <state id="horizontalprofile_mesh_cross" description="horizontalprofile_mesh_cross" state="de.intevation.gnv.state.DefaultState">
            <queryID>verticalprofile_mesh_with_area</queryID>
            <dataname>meshid</dataname>
            <data-multiselect>false</data-multiselect>
@@ -116,18 +116,18 @@
        </state>
        
        <transition transition="de.intevation.gnv.transition.PresettingsValueCompareTransition">
-            <from state="horizontalprofile_mesh"/>
-            <to state="horizontalprofile_mesh_linestring"/>
+            <from state="horizontalprofile_mesh_cross"/>
+            <to state="horizontalprofile_mesh_cross_linestring"/>
             <condition inputvalue="geometry" value="LINESTRING" operator="notequal"/>
         </transition>
         
         <transition transition="de.intevation.gnv.transition.PresettingsValueCompareTransition">
-            <from state="horizontalprofile_mesh"/>
-            <to state="horizontalprofile_meshpoint_parameter_presettings"/>
+            <from state="horizontalprofile_mesh_cross"/>
+            <to state="horizontalprofile_meshpoint_cross_parameter_presettings"/>
             <condition inputvalue="geometry" value="LINESTRING" operator="equal"/>
         </transition>
        
-       <state id="horizontalprofile_mesh_linestring" description="horizontalprofile_mesh_coordinate" state="de.intevation.gnv.state.SingleInputState">
+       <state id="horizontalprofile_mesh_cross_linestring" description="horizontalprofile_mesh_cross_coordinate" state="de.intevation.gnv.state.SingleInputState">
            <dataname>mesh_linestring</dataname>
            <data-multiselect>false</data-multiselect>
            <inputvalues>
@@ -138,11 +138,11 @@
        </state>
        
        <transition transition="de.intevation.gnv.transition.DefaultTransition">
-           <from state="horizontalprofile_mesh_linestring"/>
-           <to state="horizontalprofile_meshpoint_parameter"/>
+           <from state="horizontalprofile_mesh_cross_linestring"/>
+           <to state="horizontalprofile_meshpoint_cross_parameter"/>
        </transition>
        
-       <state id="horizontalprofile_meshpoint_parameter" description="horizontalprofile_meshpoint_parameter" state="de.intevation.gnv.state.DefaultState">
+       <state id="horizontalprofile_meshpoint_cross_parameter" description="horizontalprofile_mesh_crosspoint_parameter" state="de.intevation.gnv.state.DefaultState">
            <queryID>verticalprofile_mesh_parameter</queryID>
            <dataname>parameterid</dataname>
            <presettings-name>parameter</presettings-name>
@@ -156,11 +156,11 @@
        </state>
        
        <transition transition="de.intevation.gnv.transition.DefaultTransition">
-           <from state="horizontalprofile_meshpoint_parameter"/>
-           <to state="horizontalprofile_meshpoint_depth"/>
+           <from state="horizontalprofile_meshpoint_cross_parameter"/>
+           <to state="horizontalprofile_meshpoint_cross_depth"/>
        </transition>
        
-       <state id="horizontalprofile_meshpoint_parameter_presettings" description="horizontalprofile_meshpoint_parameter" state="de.intevation.gnv.state.PreSettingsTransferState">
+       <state id="horizontalprofile_meshpoint_cross_parameter_presettings" description="horizontalprofile_meshpoint_cross_parameter" state="de.intevation.gnv.state.PreSettingsTransferState">
            <queryID>verticalprofile_mesh_parameter</queryID>
            <dataname>parameterid</dataname>
            <presettings-name>parameter</presettings-name>
@@ -175,11 +175,11 @@
        </state>
        
        <transition transition="de.intevation.gnv.transition.DefaultTransition">
-           <from state="horizontalprofile_meshpoint_parameter_presettings"/>
-           <to state="horizontalprofile_meshpoint_depth"/>
+           <from state="horizontalprofile_meshpoint_cross_parameter_presettings"/>
+           <to state="horizontalprofile_meshpoint_cross_depth"/>
        </transition>
        
-        <state id="horizontalprofile_meshpoint_depth" description="horizontalprofile_meshpoint_depth" state="de.intevation.gnv.state.DefaultState">
+        <state id="horizontalprofile_meshpoint_cross_depth" description="horizontalprofile_meshpoint_cross_depth" state="de.intevation.gnv.state.DefaultState">
            <queryID>horizontalprofile_meshpoint_depth</queryID>
            <dataname>depthid</dataname>
            <data-multiselect>true</data-multiselect>
@@ -193,11 +193,11 @@
        </state>
        
        <transition transition="de.intevation.gnv.transition.DefaultTransition">
-           <from state="horizontalprofile_meshpoint_depth"/>
-           <to state="horizontalprofile_mesh_year"/>
+           <from state="horizontalprofile_meshpoint_cross_depth"/>
+           <to state="horizontalprofile_mesh_cross_year"/>
        </transition>
 
-       <state id="horizontalprofile_mesh_year" description="horizontalprofile_mesh_year" state="de.intevation.gnv.state.DefaultState">
+       <state id="horizontalprofile_mesh_cross_year" description="horizontalprofile_mesh_cross_year" state="de.intevation.gnv.state.DefaultState">
            <queryID>verticalprofile_mesh_year</queryID>
            <dataname>yearid</dataname>
            <data-multiselect>true</data-multiselect>
@@ -213,11 +213,11 @@
        </state>
 
        <transition transition="de.intevation.gnv.transition.DefaultTransition">
-           <from state="horizontalprofile_mesh_year"/>
-           <to state="horizontalprofile_mesh_date"/>
+           <from state="horizontalprofile_mesh_cross_year"/>
+           <to state="horizontalprofile_mesh_cross_date"/>
        </transition>
        
-       <state id="horizontalprofile_mesh_date" description="horizontalprofile_mesh_date" state="de.intevation.gnv.state.DefaultState">
+       <state id="horizontalprofile_mesh_cross_date" description="horizontalprofile_mesh_cross_date" state="de.intevation.gnv.state.DefaultState">
            <queryID>verticalprofile_mesh_date</queryID>
            <dataname>dateid</dataname>
            <data-multiselect>true</data-multiselect>
@@ -233,11 +233,11 @@
        </state>
        
        <transition transition="de.intevation.gnv.transition.DefaultTransition">
-           <from state="horizontalprofile_mesh_date"/>
-           <to state="horizontalprofile_mesh_calculate_results"/>
+           <from state="horizontalprofile_mesh_cross_date"/>
+           <to state="horizontalprofile_mesh_cross_calculate_results"/>
        </transition>
        
-       <state id="horizontalprofile_mesh_calculate_results" description="horizontalprofile_mesh_calculate_results" state="de.intevation.gnv.state.profile.horizontal.HorizontalProfileMeshCrossOutputState">
+       <state id="horizontalprofile_mesh_cross_calculate_results" description="horizontalprofile_mesh_cross_calculate_results" state="de.intevation.gnv.state.profile.horizontal.HorizontalProfileMeshCrossOutputState">
            <queryID>horizontalprofile_mesh_cross_chart_data</queryID>
            <queryID-ijk>horizontalprofile_meshpoint_cross_ij</queryID-ijk>
            <queryID-odv>horizontalprofile_mesh_odv_data</queryID-odv>