--- a/artifacts/doc/conf/artifacts/uinfo.xml	Mon May 07 10:51:36 2018 +0200
+++ b/artifacts/doc/conf/artifacts/uinfo.xml	Mon May 07 17:25:53 2018 +0200
@@ -1,103 +1,136 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <artifact name="uinfo">
 
-	<states>
-		<state id="state.uinfo.river" description="state.uinfo.river"
-			state="org.dive4elements.river.artifacts.states.RiverSelect"
-			helpText="help.state.uinfo.river">
-			<data name="river" type="String" />
-		</state>
+  <states>
+    <state id="state.uinfo.river" description="state.uinfo.river" state="org.dive4elements.river.artifacts.states.RiverSelect" helpText="help.state.uinfo.river">
+      <data name="river" type="String" />
+    </state>
 
-		<transition
-			transition="org.dive4elements.river.artifacts.transitions.DefaultTransition">
-			<from state="state.uinfo.river" />
-			<to state="state.uinfo.calculation_mode" />
-		</transition>
+    <transition transition="org.dive4elements.river.artifacts.transitions.DefaultTransition">
+      <from state="state.uinfo.river" />
+      <to state="state.uinfo.calculation_mode" />
+    </transition>
 
-		<state id="state.uinfo.calculation_mode"
-			description="state.uinfo.calculation_mode"
-			state="org.dive4elements.river.artifacts.uinfo.CalculationSelectUinfo"
-			helpText="help.state.uinfo.calculation_mode">
-			<data name="calculation_mode" type="String" />
-		</state>
+    <state id="state.uinfo.calculation_mode" description="state.uinfo.calculation_mode" state="org.dive4elements.river.artifacts.uinfo.CalculationSelectUinfo" helpText="help.state.uinfo.calculation_mode">
+      <data name="calculation_mode" type="String" />
+    </state>
 
-	<state id="state.uinfo.distance_only" description="state.uinfo.distance_only" state="org.dive4elements.river.artifacts.states.DistanceOnlySelect" helpText="help.state.uinfo.distance_only">
-      <data name="ld_from" type="Double"/>
-      <data name="ld_to" type="Double"/>
+    <state id="state.uinfo.distance_only" description="state.uinfo.distance_only" state="org.dive4elements.river.artifacts.states.DistanceOnlySelect" helpText="help.state.uinfo.distance_only">
+      <data name="ld_from" type="Double" />
+      <data name="ld_to" type="Double" />
     </state>
-    
 
 
-		<!-- Calculation Mode: Salix Linie  -->
-		
 
-	<transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition">
-      <from state="state.uinfo.calculation_mode"/>
-      <to state="state.uinfo.distance_only"/>
-      <condition data="calculation_mode" value="uinfo_salix_line" operator="equal"/>
+    <!-- Calculation Mode: Salix Linie -->
+
+
+    <transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition">
+      <from state="state.uinfo.calculation_mode" />
+      <to state="state.uinfo.distance_only" />
+      <condition data="calculation_mode" value="uinfo_salix_line" operator="equal" />
     </transition>
+
+
+    <transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition">
+      <from state="state.uinfo.distance_only" />
+      <to state="state.uinfo.use_scenario" />
+      <condition data="calculation_mode" value="uinfo_salix_line" operator="equal" />
+    </transition>
+
+
+    <state id="state.uinfo.use_scenario" description="state.uinfo.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.use_scenario" />
+      <to state="state.uinfo.scenario_type" />
+      <condition data="use_scenario" value="true" operator="equal" />
+    </transition>
+
+    <transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition">
+      <from state="state.uinfo.use_scenario" />
+      <to state="state.uinfo.distance_only_part" />
+      <condition data="use_scenario" value="false" operator="equal" />
+    </transition>
+
+    <state id="state.uinfo.scenario_type" description="state.uinfo.scenario_type" state="org.dive4elements.river.artifacts.uinfo.salix.ScenarioTypeState" helpText="help.state.uinfo.scenario_type">
+      <data name="scenario_selection" type="String" />
+    </state>
+
+    <transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition">
+      <from state="state.uinfo.scenario_type" />
+      <to state="state.uinfo.distance_only_part" />
+      <condition data="calculation_mode" value="uinfo_salix_line" operator="equal" />
+    </transition>
+
+    <state id="state.uinfo.distance_only_part" description="state.uinfo.distance_only_part" state="org.dive4elements.river.artifacts.states.DistanceOnlyPartSelect" helpText="help.state.uinfo.distance_only">
+      <data name="ld_from_part" type="Double" />
+      <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" />
+      <condition data="calculation_mode" value="uinfo_salix_line" operator="equal" />
+    </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>
+
+        <!-- FIXME: i01n name in FLYSConstants -->
+        <outputmode name="uinfo_salix_line_export" description="output.uinfo_salix_line_export" mime-type="text/plain" type="export">
+          <facets>
+            <facet name="csv" description="facet.uinfo_salix_line_export.csv" />
+            <facet name="pdf" description="facet.uinfo_salix_line_export.pdf" />
+          </facets>
+        </outputmode>
+
+        <!-- FIXME: i01n name in FLYSConstants -->
+        <outputmode name="uinfo_salix_line_report" description="output.uinfo_salix_line_report" mime-type="text/xml" type="report">
+          <facets>
+            <facet name="report" description="facet.uinfo_salix_line_report" />
+          </facets>
+        </outputmode>
+      </outputmodes>
+    </state>
  
 
-	<transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition">
-      <from state="state.uinfo.distance_only"/>
-      <to state="state.uinfo.use_scenario"/>
-      <condition data="calculation_mode" value="uinfo_salix_line" operator="equal"/>
-    </transition>
-		
-		
- 	<state id="state.uinfo.use_scenario" description="state.uinfo.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.use_scenario"/>
-      <to state="state.uinfo.scenario_type"/>
-      <condition data="calculation_mode" value="uinfo_salix_line" operator="equal"/>
-    </transition>
-			<!-- FIXME: der State soll nur angezeigt werden, wenn zuvor bei Szenario-Betrachtung "Ja" angeklickt wurde...  -->
- 	<state id="state.uinfo.scenario_type" description="state.uinfo.scenario_type" state="org.dive4elements.river.artifacts.uinfo.salix.ScenarioTypeState" helpText="help.state.uinfo.scenario_type">
-    <!--Probleme, wenn, der DefaultState genommen wird!  <data name="scenario_type" type="Integer"/> -->
-   	<data name ="test" type ="String" />
-    </state>
-    
-  
-		 
- 	<transition transition="org.dive4elements.river.artifacts.transitions.DefaultTransition">
-      <from state="state.uinfo.scenario_type"/>
-      <to state="state.uinfo.salix_line"/>
-      <!-- condition data="calculation_mode" value="uinfo_salix_line" operator="equal"/> -->
+ 
+
+
+
+
+    <!-- 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.salix_line"
-			description="state.uinfo.salix_line"
-			state="org.dive4elements.river.artifacts.uinfo.salix.SalixLineState"
-			helpText="help.state.uinfo.salix_line">
-			<outputmodes>
 
-				<!-- FIXME: i01n name in FLYSConstants -->
-				<outputmode name="uinfo_salix_line_export"
-					description="output.uinfo_salix_line_export" mime-type="text/plain"
-					type="export">
-					<facets>
-						<facet name="csv"
-							description="facet.uinfo_salix_line_export.csv" />
-						<facet name="pdf"
-							description="facet.uinfo_salix_line_export.pdf" />
-					</facets>
-				</outputmode>
+    <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_salix_line_report"
-					description="output.uinfo_salix_line_report" mime-type="text/xml"
-					type="report">
-					<facets>
-						<facet name="report"
-							description="facet.uinfo_salix_line_report" />
-					</facets>
-				</outputmode>
-			</outputmodes>
-		</state>
+        <!-- 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>
 
 
 
@@ -105,100 +138,33 @@
 
 
 
-
-
-
-
-
-
-
-
-
-		<!-- 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>
+    <!-- Calculation Mode: Inundation Duration -->
+    <transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition">
+      <from state="state.uinfo.calculation_mode" />
+      <to state="state.uinfo.inundation_duration" />
+      <condition data="calculation_mode" value="uinfo_inundation_duration" operator="equal" />
 
-				<!-- 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>
-
-
-
-
-
-
-
-		<!-- Calculation Mode: Inundation Duration -->
-		<transition
-			transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition">
-			<from state="state.uinfo.calculation_mode" />
-			<to state="state.uinfo.inundation_duration" />
-			<condition data="calculation_mode"
-				value="uinfo_inundation_duration" operator="equal" />
-			 
-		</transition>
+    </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>
+    <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>
 
-				<!-- FIXME: i01n name in FLYSConstants -->
-				<outputmode name="uinfo_inundation_duration_export"
-					description="output.uinfo_inundation_duration_export"
-					mime-type="text/plain" type="export">
-					<facets>
-						<facet name="csv"
-							description="facet.uinfo_inundation_duration_export.csv" />
-						<facet name="pdf"
-							description="facet.uinfo_inundation_duration_export.pdf" />
-					</facets>
-				</outputmode>
+        <!-- FIXME: i01n name in FLYSConstants -->
+        <outputmode name="uinfo_inundation_duration_export" description="output.uinfo_inundation_duration_export" mime-type="text/plain" type="export">
+          <facets>
+            <facet name="csv" description="facet.uinfo_inundation_duration_export.csv" />
+            <facet name="pdf" description="facet.uinfo_inundation_duration_export.pdf" />
+          </facets>
+        </outputmode>
 
-				<!-- FIXME: i01n name in FLYSConstants -->
-				<outputmode name="uinfo_inundation_duration_report"
-					description="output.uinfo_inundation_duration_report"
-					mime-type="text/xml" type="report">
-					<facets>
-						<facet name="report"
-							description="facet.uinfo_inundation_duration_report" />
-					</facets>
-				</outputmode>
-			</outputmodes>
-		</state>
+        <!-- FIXME: i01n name in FLYSConstants -->
+        <outputmode name="uinfo_inundation_duration_report" description="output.uinfo_inundation_duration_report" mime-type="text/xml" type="report">
+          <facets>
+            <facet name="report" description="facet.uinfo_inundation_duration_report" />
+          </facets>
+        </outputmode>
+      </outputmodes>
+    </state>
 
-	</states>
+  </states>
 </artifact>
\ No newline at end of file