--- a/artifacts/doc/conf/artifacts/uinfo.xml	Mon May 07 17:25:53 2018 +0200
+++ b/artifacts/doc/conf/artifacts/uinfo.xml	Tue May 08 15:21:23 2018 +0200
@@ -70,7 +70,6 @@
       <data name="ld_to_part" type="Double" />
     </state>
 
-
     <transition transition="org.dive4elements.river.artifacts.transitions.DefaultTransition">
       <from state="state.uinfo.distance_only_part" />
       <to state="state.uinfo.salix_line" />
@@ -78,6 +77,9 @@
     </transition>
 
 
+
+
+
     <state id="state.uinfo.salix_line" description="state.uinfo.salix_line" state="org.dive4elements.river.artifacts.uinfo.salix.SalixLineState" helpText="help.state.uinfo.salix_line">
       <outputmodes>
 
@@ -97,55 +99,101 @@
         </outputmode>
       </outputmodes>
     </state>
- 
-
- 
-
 
 
+    <!-- Calculation Mode: Inundation Duration -->
 
-    <!-- Calculation Mode: Vegetation Zones -->
     <transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition">
       <from state="state.uinfo.calculation_mode" />
-      <to state="state.uinfo.vegetation_zones" />
-      <condition data="calculation_mode" value="uinfo_vegetation_zones" operator="equal" />
-
+      <to state="state.uinfo.distance_only" />
+      <condition data="calculation_mode" value="uinfo_inundation_duration" operator="equal" />
     </transition>
 
-    <state id="state.uinfo.vegetation_zones" description="state.uinfo.vegetation_zones" state="org.dive4elements.river.artifacts.uinfo.vegetationzones.VegetationZonesState" helpText="help.state.uinfo.vegetation_zones">
-      <outputmodes>
+    <transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition">
+      <from state="state.uinfo.distance_only" />
+      <to state="state.uinfo.year_epoch" />
+      <condition data="calculation_mode" value="uinfo_inundation_duration" operator="equal" />
+    </transition>
 
-        <!-- FIXME: i01n name in FLYSConstants -->
-        <outputmode name="uinfo_vegetation_zones_export" description="output.uinfo_vegetation_zones_export" mime-type="text/plain" type="export">
-          <facets>
-            <facet name="csv" description="facet.uinfo_vegetation_zones_export.csv" />
-            <facet name="pdf" description="facet.uinfo_vegetation_zones_export.pdf" />
-          </facets>
-        </outputmode>
 
-        <!-- FIXME: i01n name in FLYSConstants -->
-        <outputmode name="uinfo_vegetation_zones_report" description="output.uinfo_vegetation_zones_report" mime-type="text/xml" type="report">
-          <facets>
-            <facet name="report" description="facet.uinfo_vegetation_zones_report" />
-          </facets>
-        </outputmode>
-      </outputmodes>
+    <transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition">
+      <from state="state.uinfo.year_epoch" />
+      <to state="state.uinfo.load.year" />
+      <condition data="ye_select" value="state.uinfo.year" operator="equal" />
+    </transition>
+
+    <transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition">
+      <from state="state.uinfo.year_epoch" />
+      <to state="state.uinfo.load.epoch" />
+      <condition data="ye_select" value="state.uinfo.epoch" operator="equal" />
+    </transition>
+
+
+    <state id="state.uinfo.year_epoch" description="state.uinfo.year_epoch" state="org.dive4elements.river.artifacts.uinfo.inundationduration.YearChoice" helpText="help.state.uinfo.year">
+      <data name="ye_select" type="String" />
     </state>
 
 
+    <state id="state.uinfo.load.year" description="state.uinfo.load.year" state="org.dive4elements.river.artifacts.uinfo.inundationduration.LoadYearSelect" helpText="help.state.uinfo.load.year">
+      <data name="years" type="String" />
+    </state>
 
-
-
+    <state id="state.uinfo.load.epoch" description="state.uinfo.load.epoch" state="org.dive4elements.river.artifacts.uinfo.inundationduration.LoadEpochSelect" helpText="help.state.uinfo.load.epoch">
+      <data name="epochs" type="String" />
+    </state>
 
 
-    <!-- Calculation Mode: Inundation Duration -->
     <transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition">
-      <from state="state.uinfo.calculation_mode" />
-      <to state="state.uinfo.inundation_duration" />
+      <from state="state.uinfo.load.epoch" />
+      <to state="state.uinfo.inundation.use_scenario" />
       <condition data="calculation_mode" value="uinfo_inundation_duration" operator="equal" />
-
     </transition>
 
+    <transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition">
+      <from state="state.uinfo.load.year" />
+      <to state="state.uinfo.inundation.use_scenario" />
+      <condition data="calculation_mode" value="uinfo_inundation_duration" operator="equal" />
+    </transition>
+
+    <!-- Doppelter State, andere ID, damit keine Mehrfach-Condition benötigt wird -->
+    <state id="state.uinfo.inundation.use_scenario" description="state.uinfo.inundation.use_scenario" state="org.dive4elements.river.artifacts.uinfo.salix.UseScenarioChoice" helpText="help.state.uinfo.use_scenario">
+      <data name="use_scenario" type="Boolean" />
+    </state>
+
+
+    <transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition">
+      <from state="state.uinfo.inundation.use_scenario" />
+      <to state="state.uinfo.inundation.scenario" />
+      <condition data="use_scenario" value="true" operator="equal" />
+    </transition>
+
+    <transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition">
+      <from state="state.uinfo.inundation.use_scenario" />
+      <to state="state.uinfo.inundation.vegetation" />
+      <condition data="use_scenario" value="false" operator="equal" />
+    </transition>
+
+    <state id="state.uinfo.inundation.scenario" description="state.uinfo.inundation.scenario" state="org.dive4elements.river.artifacts.uinfo.inundationduration.LoadScenarioSelect" helpText="help.state.uinfo.use_scenario">
+      <data name="years" type="String" /> <!-- mittelwasserlage in cm! -->
+    </state>
+
+    <state id="state.uinfo.inundation.vegetation" description="state.uinfo.inundation.vegetation" state="org.dive4elements.river.artifacts.uinfo.salix.UseScenarioChoice" helpText="help.state.uinfo.use_scenario">
+      <data name="vegetation" type="Boolean" />
+    </state>
+
+    <transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition">
+      <from state="state.uinfo.inundation.scenario" />
+      <to state="state.uinfo.inundation.vegetation" />
+     <condition data="calculation_mode" value="uinfo_inundation_duration" operator="equal" />
+    </transition>
+
+
+    <transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition">
+      <from state="state.uinfo.inundation.vegetation" />
+      <to state="state.uinfo.inundation_duration" />
+     <condition data="calculation_mode" value="uinfo_inundation_duration" operator="equal" />
+    </transition>
+    
     <state id="state.uinfo.inundation_duration" description="state.uinfo.inundation_duration" state="org.dive4elements.river.artifacts.uinfo.inundationduration.InundationDurationState" helpText="help.state.uinfo.inundation_duration">
       <outputmodes>
 
@@ -167,4 +215,52 @@
     </state>
 
   </states>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  <!-- Calculation Mode: Vegetation Zones -->
+  <transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition">
+    <from state="state.uinfo.calculation_mode" />
+    <to state="state.uinfo.vegetation_zones" />
+    <condition data="calculation_mode" value="uinfo_vegetation_zones" operator="equal" />
+
+  </transition>
+
+  <state id="state.uinfo.vegetation_zones" description="state.uinfo.vegetation_zones" state="org.dive4elements.river.artifacts.uinfo.vegetationzones.VegetationZonesState" helpText="help.state.uinfo.vegetation_zones">
+    <outputmodes>
+
+      <!-- FIXME: i01n name in FLYSConstants -->
+      <outputmode name="uinfo_vegetation_zones_export" description="output.uinfo_vegetation_zones_export" mime-type="text/plain" type="export">
+        <facets>
+          <facet name="csv" description="facet.uinfo_vegetation_zones_export.csv" />
+          <facet name="pdf" description="facet.uinfo_vegetation_zones_export.pdf" />
+        </facets>
+      </outputmode>
+
+      <!-- FIXME: i01n name in FLYSConstants -->
+      <outputmode name="uinfo_vegetation_zones_report" description="output.uinfo_vegetation_zones_report" mime-type="text/xml" type="report">
+        <facets>
+          <facet name="report" description="facet.uinfo_vegetation_zones_report" />
+        </facets>
+      </outputmode>
+    </outputmodes>
+  </state>
+
+
 </artifact>
\ No newline at end of file