--- a/gnv-artifacts/doc/conf/products/timeseries/conf_timeseriespoint.xml	Tue Dec 08 11:18:27 2009 +0000
+++ b/gnv-artifacts/doc/conf/products/timeseries/conf_timeseriespoint.xml	Tue Dec 08 13:38:21 2009 +0000
@@ -50,16 +50,6 @@
                  this state. -->
             <data-noselect>true</data-noselect>
             
-            <reachablestates>
-                   <!-- reachablestates are those state which can be
-                        reached as next Step. The state notifies in 
-                        describe-output which states can be reached.
-                        The User / calling program can choose which state 
-                        he/it wants to use next  -->
-                   <state>timeseries_subarea</state>
-                   <state>timeseries_without_geom</state>
-            </reachablestates>
-            
             <inputvalues>
                 <!-- At this place it is necessary to configure the Elements
                      which must be feed and can be used in this state.
@@ -74,14 +64,21 @@
             </inputvalues>
         </state>
         
+        <transition transition="de.intevation.gnv.transition.ValueCompareTransition">
+            <from state="timeseries_area"/>
+            <to state="timeseries_subarea"/>
+            <condition inputvalue="areaid" value="n/n" operator="notequal"/>
+        </transition>
+        <transition transition="de.intevation.gnv.transition.ValueCompareTransition">
+            <from state="timeseries_area"/>
+            <to state="timeseries_without_geom"/>
+            <condition inputvalue="areaid" value="n/n" operator="equal"/>
+        </transition>
+        
         <state id="timeseries_subarea" description="timeseries_subaera" state="de.intevation.gnv.state.DefaultState">
             <queryID>subarea_filter</queryID>
             <dataname>subareaid</dataname>
             <data-multiselect>false</data-multiselect>
-            <reachablestates>
-                   <state>timeseries_timeseriespoint</state>
-            </reachablestates>
-
             <inputvalues>
                 <inputvalue name="sourceid" type="Integer" multiselect="false" usedinquery="0"/>
                 <inputvalue name="fisname" type="String" multiselect="false" usedinquery="0"/>
@@ -90,27 +87,31 @@
             </inputvalues>
         </state>
         
+        <transition transition="de.intevation.gnv.transition.DefaultTransition">
+            <from state="timeseries_subarea"/>
+            <to state="timeseries_timeseriespoint"/>
+        </transition>
+        
         <state id="timeseries_without_geom" description="timeseries_mesh_without_geom" state="de.intevation.gnv.state.DefaultState">
            <queryID>timeseries_timeseriespoint</queryID>
            <dataname>featureid</dataname>
            <data-multiselect>false</data-multiselect>
-           <reachablestates>
-                  <state>timeseries_parameter</state>
-           </reachablestates>
            <inputvalues>
                <inputvalue name="sourceid" type="Integer" multiselect="false" usedinquery="1"/>
                <inputvalue name="fisname" type="String" multiselect="false" usedinquery="0"/>
                <inputvalue name="featureid" type="Integer" multiselect="false" usedinquery="0"/>
            </inputvalues>
        </state>
-        
+       
+       <transition transition="de.intevation.gnv.transition.DefaultTransition">
+            <from state="timeseries_without_geom"/>
+            <to state="timeseries_parameter"/>
+        </transition>
+       
         <state id="timeseries_timeseriespoint" description="timeseries_timeseriespoint" state="de.intevation.gnv.state.DefaultState">
             <queryID>timeseries_timeseriespoint_with_area</queryID>
             <dataname>featureid</dataname>
             <data-multiselect>false</data-multiselect>
-            <reachablestates>
-                <state>timeseries_parameter</state>
-            </reachablestates>
             <inputvalues>
                 <inputvalue name="sourceid" type="Integer" multiselect="false" usedinquery="1"/>
                 <inputvalue name="fisname" type="String" multiselect="false" usedinquery="0"/>
@@ -119,27 +120,31 @@
             </inputvalues>
         </state>
         
+        <transition transition="de.intevation.gnv.transition.DefaultTransition">
+            <from state="timeseries_timeseriespoint"/>
+            <to state="timeseries_parameter"/>
+        </transition>
+        
         <state id="timeseries_parameter" description="timeseries_parameter" state="de.intevation.gnv.state.DefaultState">
             <queryID>timeseries_parameter</queryID>
             <dataname>parameterid</dataname>
             <data-multiselect>true</data-multiselect>
-            <reachablestates>
-                <state>timeseries_depth_height</state>
-            </reachablestates>
             <inputvalues>
                 <inputvalue name="featureid" type="Integer" multiselect="false"/>
                 <inputvalue name="fisname" type="String" multiselect="false" usedinquery="0"/>
                 <inputvalue name="parameterid" type="Integer" multiselect="true" usedinquery="0"/>
             </inputvalues>
-        </state>           
+        </state>
+        
+        <transition transition="de.intevation.gnv.transition.DefaultTransition">
+            <from state="timeseries_parameter"/>
+            <to state="timeseries_depth_height"/>
+        </transition>
         
          <state id="timeseries_depth_height" description="timeseries_depth_height" state="de.intevation.gnv.state.DefaultState">
             <queryID>timeseries_depth_height</queryID>
             <dataname>measurementid</dataname>
             <data-multiselect>true</data-multiselect>
-            <reachablestates>
-                 <state>timeseries_interval</state>
-            </reachablestates>
             <inputvalues>
                 <inputvalue name="featureid" type="Integer" multiselect="false"/>
                 <inputvalue name="parameterid" type="Integer" multiselect="true"/>
@@ -148,13 +153,15 @@
             </inputvalues>
         </state>
         
+        <transition transition="de.intevation.gnv.transition.DefaultTransition">
+            <from state="timeseries_depth_height"/>
+            <to state="timeseries_interval"/>
+        </transition>
+        
         <state id="timeseries_interval" description="timeseries_interval" state="de.intevation.gnv.state.MinMaxState">
             <queryID>timeseries_interval</queryID>
             <dataname>timeinterval</dataname>
             <data-multiselect>false</data-multiselect>
-            <reachablestates>
-                <state>timeseries_calculate_results</state>
-            </reachablestates>
             <inputvalues>
                 <inputvalue name="fisname" type="String" multiselect="false" usedinquery="0"/>
                 <inputvalue name="parameterid" type="Integer" multiselect="true"/>
@@ -164,6 +171,11 @@
             </inputvalues>
         </state>
         
+        <transition transition="de.intevation.gnv.transition.DefaultTransition">
+            <from state="timeseries_interval"/>
+            <to state="timeseries_calculate_results"/>
+        </transition>
+        
         <!--  Last state is the Output-state. At this place the differen OutputModes are configured.
               For each OutputMode it might be necessary to configure separat Databasequery which collect the
               Data. -->