--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/states/BooleanChoiceState.java	Thu Jul 19 17:54:10 2018 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/states/BooleanChoiceState.java	Fri Jul 20 10:39:02 2018 +0200
@@ -7,40 +7,34 @@
  */
 package org.dive4elements.river.artifacts.states;
 
-import org.w3c.dom.Element;
-
 import org.apache.log4j.Logger;
-
+import org.dive4elements.artifactdatabase.ProtocolUtils;
 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.ProtocolUtils;
-
 import org.dive4elements.river.artifacts.resources.Resources;
+import org.w3c.dom.Element;
 
 /**
  * Generic state for a boolean choice. Only difference between real implementations are the human readable labels.
- * 
+ *
  * @author <a href="mailto:ingo.weinzierl@intevation.de">Ingo Weinzierl</a>
  * @author Gernot Belger
  */
 public abstract class BooleanChoiceState extends DefaultState {
 
-	private String optionMsg;
-	private String activeMsg;
-	private String inactiveMsg;
+    private final String optionMsg;
+    private final String activeMsg;
+    private final String inactiveMsg;
 
-    public BooleanChoiceState( String optionMsg, String activeMsg, String inactiveMsg ) {
-		this.optionMsg = optionMsg;
-		this.activeMsg = activeMsg;
-		this.inactiveMsg = inactiveMsg;
-	}
-    
-    private static final Logger log =
-        Logger.getLogger(BooleanChoiceState.class);
+    public BooleanChoiceState(final String optionMsg, final String activeMsg, final String inactiveMsg) {
+        this.optionMsg = optionMsg;
+        this.activeMsg = activeMsg;
+        this.inactiveMsg = inactiveMsg;
+    }
+
+    private static final Logger log = Logger.getLogger(BooleanChoiceState.class);
 
     @Override
     protected String getUIProvider() {
@@ -48,45 +42,30 @@
     }
 
     @Override
-    protected Element[] createItems(
-        XMLUtils.ElementCreator cr,
-        Artifact    artifact,
-        String      name,
-        CallContext context)
-    {
-        CallMeta meta = context.getMeta();
+    protected Element[] createItems(final XMLUtils.ElementCreator cr, final Artifact artifact, final String name, final CallContext context) {
+        final CallMeta meta = context.getMeta();
 
-        Element option = createItem(
-            cr,
-            new String[] { Resources.getMsg(meta, optionMsg, optionMsg), "true" });
+        final Element option = createItem(cr, new String[] { Resources.getMsg(meta, this.optionMsg, this.optionMsg), "true" });
 
         return new Element[] { option };
     }
 
-
     @Override
-    protected String getLabelFor(
-        CallContext cc,
-        String      name,
-        String      value,
-        String      type
-    ) {
+    protected String getLabelFor(final CallContext cc, final String name, final String value, final String type) {
         log.debug("GET LABEL FOR '" + name + "' / '" + value + "'");
         if (value != null && value.equals("true")) {
-            return Resources.getMsg(cc.getMeta(), activeMsg, activeMsg);
-        }
-        else {
-            return Resources.getMsg(cc.getMeta(), inactiveMsg, inactiveMsg);
+            return Resources.getMsg(cc.getMeta(), this.activeMsg, this.activeMsg);
+        } else {
+            return Resources.getMsg(cc.getMeta(), this.inactiveMsg, this.inactiveMsg);
         }
     }
 
+    protected static Element createItem(final XMLUtils.ElementCreator cr, final Object obj) {
+        final Element item = ProtocolUtils.createArtNode(cr, "item", null, null);
+        final Element label = ProtocolUtils.createArtNode(cr, "label", null, null);
+        final Element value = ProtocolUtils.createArtNode(cr, "value", null, null);
 
-    protected Element createItem(XMLUtils.ElementCreator cr, Object obj) {
-        Element item  = ProtocolUtils.createArtNode(cr, "item", null, null);
-        Element label = ProtocolUtils.createArtNode(cr, "label", null, null);
-        Element value = ProtocolUtils.createArtNode(cr, "value", null, null);
-
-        String[] arr = (String[]) obj;
+        final String[] arr = (String[]) obj;
 
         label.setTextContent(arr[0]);
         value.setTextContent(arr[1]);