--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/states/CalculationSelect.java	Thu Oct 31 15:24:23 2019 +0100
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/states/CalculationSelect.java	Thu Oct 31 17:37:53 2019 +0100
@@ -9,19 +9,14 @@
 package org.dive4elements.river.artifacts.states;
 
 import org.apache.log4j.Logger;
-
-import org.w3c.dom.Element;
-
+import org.dive4elements.artifactdatabase.data.StateData;
 import org.dive4elements.artifacts.Artifact;
 import org.dive4elements.artifacts.CallContext;
 import org.dive4elements.artifacts.CallMeta;
-
 import org.dive4elements.artifacts.common.utils.XMLUtils;
-
-import org.dive4elements.artifactdatabase.data.StateData;
-
 import org.dive4elements.river.artifacts.D4EArtifact;
 import org.dive4elements.river.artifacts.resources.Resources;
+import org.w3c.dom.Element;
 
 /**
  * @author <a href="mailto:ingo.weinzierl@intevation.de">Ingo Weinzierl</a>
@@ -35,103 +30,68 @@
     public static final String FIELD_MODE = "calculation_mode";
 
     /** Constant value for the reference line calculation. */
-    public static final String CALCULATION_SURFACE_CURVE =
-        "calc.surface.curve";
+    public static final String CALCULATION_SURFACE_CURVE = "calc.surface.curve";
 
     /** Constant value for the differences calculation. */
-    public static final String CALCULATION_DURATION_CURVE =
-        "calc.duration.curve";
+    public static final String CALCULATION_DURATION_CURVE = "calc.duration.curve";
 
     /** Constant value for the flood map calculation. */
-    public static final String CALCULATION_FLOOD_MAP =
-        "calc.flood.map";
+    public static final String CALCULATION_FLOOD_MAP = "calc.flood.map";
 
     /** Constant value for the profile calculation. */
-    public static final String CALCULATION_DISCHARGE_LONGITUDINAL_CURVE =
-        "calc.discharge.longitudinal.section";
+    public static final String CALCULATION_DISCHARGE_LONGITUDINAL_CURVE = "calc.discharge.longitudinal.section";
 
     /** Constant value for the state discharge curve calculation. */
-    public static final String CALCULATION_DISCHARGE_CURVE =
-        "calc.discharge.curve";
+    public static final String CALCULATION_DISCHARGE_CURVE = "calc.discharge.curve";
 
     /** Constant value for the state w differences calculation. */
-    public static final String CALCULATION_W_DIFFERENCES =
-        "calc.w.differences";
+    public static final String CALCULATION_W_DIFFERENCES = "calc.w.differences";
 
     /** Constant value for the state reference curve calculation. */
-    public static final String CALCULATION_REFERENCE_CURVE =
-        "calc.reference.curve";
+    public static final String CALCULATION_REFERENCE_CURVE = "calc.reference.curve";
 
     /** Constant value for the historical discharge curve calculation. */
-    public static final String CALCULATION_HISTORICAL_DISCHARGE_CURVE =
-        "calc.historical.discharge.curve";
-
-    /** Constant value for the extreme W curve calculation. */
-    public static final String CALCULATION_EXTREME =
-        "calc.extreme.curve";
+    public static final String CALCULATION_HISTORICAL_DISCHARGE_CURVE = "calc.historical.discharge.curve";
 
     /** An array that holds all available calculation modes. */
-    public static final String[] CALCULATIONS = {
-        CALCULATION_SURFACE_CURVE,
-        CALCULATION_FLOOD_MAP,
-        CALCULATION_DISCHARGE_CURVE,
-        CALCULATION_HISTORICAL_DISCHARGE_CURVE,
-        CALCULATION_DURATION_CURVE,
-        CALCULATION_DISCHARGE_LONGITUDINAL_CURVE,
-        CALCULATION_W_DIFFERENCES,
-        CALCULATION_REFERENCE_CURVE //,
-//        CALCULATION_EXTREME
-    };
-
+    public static final String[] CALCULATIONS = { CALCULATION_SURFACE_CURVE, CALCULATION_FLOOD_MAP, CALCULATION_DISCHARGE_CURVE,
+            CALCULATION_HISTORICAL_DISCHARGE_CURVE, CALCULATION_DURATION_CURVE, CALCULATION_DISCHARGE_LONGITUDINAL_CURVE, CALCULATION_W_DIFFERENCES,
+            CALCULATION_REFERENCE_CURVE };
 
     /** Error message that is thrown if no mode has been chosen. */
-    public static final String ERROR_NO_CALCULATION_MODE =
-        "error_feed_no_calculation_mode";
+    public static final String ERROR_NO_CALCULATION_MODE = "error_feed_no_calculation_mode";
 
-    /** Error message that is thrown if an invalid calculation mode has been
-     * chosen. */
-    public static  final String ERROR_INVALID_CALCULATION_MODE =
-        "error_feed_invalid_calculation_mode";
-
+    /**
+     * Error message that is thrown if an invalid calculation mode has been
+     * chosen.
+     */
+    public static final String ERROR_INVALID_CALCULATION_MODE = "error_feed_invalid_calculation_mode";
 
     public CalculationSelect() {
     }
 
-
     /** Create choices (i18ned). */
     @Override
-    protected Element[] createItems(
-        XMLUtils.ElementCreator cr,
-        Artifact    artifact,
-        String      name,
-        CallContext context)
-    {
-        CallMeta meta   = context.getMeta();
-        Element[] calcs = new Element[CALCULATIONS.length];
+    protected Element[] createItems(final XMLUtils.ElementCreator cr, final Artifact artifact, final String name, final CallContext context) {
+        final CallMeta meta = context.getMeta();
+        final Element[] calcs = new Element[CALCULATIONS.length];
 
         for (int i = 0; i < CALCULATIONS.length; ++i) {
-            String calc = CALCULATIONS[i];
-            calcs[i] = createItem(
-                cr, new String[] {
-                    Resources.getMsg(meta, calc, calc),
-                    calc
-                });
+            final String calc = CALCULATIONS[i];
+            calcs[i] = createItem(cr, new String[] { Resources.getMsg(meta, calc, calc), calc });
         }
 
         return calcs;
     }
 
-
     /** Validate the chosen calculation. */
     @Override
-    public boolean validate(Artifact artifact)
-    throws IllegalArgumentException
-    {
+    public boolean validate(final Artifact artifact) throws IllegalArgumentException {
         log.debug("CalculationSelect.validate");
-        D4EArtifact flys = (D4EArtifact) artifact;
+        final D4EArtifact flys = (D4EArtifact) artifact;
 
-        StateData data = getData(flys, FIELD_MODE);
-        String    calc = (data != null) ? (String) data.getValue() : null;
+        final StateData data = getData(flys, FIELD_MODE);
+        String calc = (data != null) ? (String) data.getValue() : null;
 
         if (calc == null) {
             throw new IllegalArgumentException(ERROR_NO_CALCULATION_MODE);
@@ -139,7 +99,7 @@
 
         calc = calc.trim().toLowerCase();
 
-        for (String mode: CALCULATIONS) {
+        for (final String mode : CALCULATIONS) {
             if (mode.equals(calc)) {
                 return true;
             }