--- a/gwt-client/src/main/java/org/dive4elements/river/client/server/ArtifactDescriptionFactory.java	Thu Aug 09 12:03:30 2018 +0200
+++ b/gwt-client/src/main/java/org/dive4elements/river/client/server/ArtifactDescriptionFactory.java	Thu Aug 09 15:22:31 2018 +0200
@@ -13,17 +13,10 @@
 
 import javax.xml.xpath.XPathConstants;
 
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
 import org.apache.log4j.Logger;
-
 import org.dive4elements.artifacts.common.ArtifactNamespaceContext;
 import org.dive4elements.artifacts.common.utils.ClientProtocolUtils;
 import org.dive4elements.artifacts.common.utils.XMLUtils;
-
 import org.dive4elements.river.client.shared.model.ArtifactDescription;
 import org.dive4elements.river.client.shared.model.DataItem;
 import org.dive4elements.river.client.shared.model.DataList;
@@ -34,13 +27,16 @@
 import org.dive4elements.river.client.shared.model.DoubleArrayData;
 import org.dive4elements.river.client.shared.model.DoubleRangeData;
 import org.dive4elements.river.client.shared.model.IntegerArrayData;
+import org.dive4elements.river.client.shared.model.IntegerOptionsData;
 import org.dive4elements.river.client.shared.model.IntegerRangeData;
-import org.dive4elements.river.client.shared.model.IntegerOptionsData;
 import org.dive4elements.river.client.shared.model.LongRangeData;
 import org.dive4elements.river.client.shared.model.OutputMode;
 import org.dive4elements.river.client.shared.model.Recommendation;
 import org.dive4elements.river.client.shared.model.WQDataItem;
-
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 
 /**
  * This factory class helps creating an {@link ArtifactDescription} based on the
@@ -52,9 +48,7 @@
  */
 public class ArtifactDescriptionFactory {
 
-    private static final Logger log =
-        Logger.getLogger(ArtifactDescriptionFactory.class);
-
+    private static final Logger log = Logger.getLogger(ArtifactDescriptionFactory.class);
 
     public static final String XPATH_STATE_NAME = "@art:name";
 
@@ -70,85 +64,71 @@
 
     public static final String XPATH_STATIC_ITEM_NODE = "art:item";
 
-    public static final String XPATH_RECOMMENDED_ARTIFACTS =
-        "/art:result/art:recommended-artifacts//*[@factory]";
+    public static final String XPATH_RECOMMENDED_ARTIFACTS = "/art:result/art:recommended-artifacts//*[@factory]";
 
     /**
      * This method creates the {@link ArtifactDescription} of the DESCRIBE
      * document <i>doc</i>.
      *
-     * @param doc A DESCRIBE document.
+     * @param doc
+     *            A DESCRIBE document.
      *
      * @return the {@link ArtifactDescription}.
      */
-    public static ArtifactDescription createArtifactDescription(Document doc) {
+    public static ArtifactDescription createArtifactDescription(final Document doc) {
         log.debug("ArtifactDescriptionFactory.createArtifactDescription");
 
-        Node currentState = ClientProtocolUtils.getCurrentState(doc);
-        Node staticNode   = ClientProtocolUtils.getStaticUI(doc);
-        Node dynamicNode  = ClientProtocolUtils.getDynamicUI(doc);
-        Node reachable    = ClientProtocolUtils.getReachableStates(doc);
-        NodeList outputs  = ClientProtocolUtils.getOutputModes(doc);
+        final Node currentState = ClientProtocolUtils.getCurrentState(doc);
+        final Node staticNode = ClientProtocolUtils.getStaticUI(doc);
+        final Node dynamicNode = ClientProtocolUtils.getDynamicUI(doc);
+        final Node reachable = ClientProtocolUtils.getReachableStates(doc);
+        final NodeList outputs = ClientProtocolUtils.getOutputModes(doc);
 
-        String state = (String) XMLUtils.xpath(
-            currentState,
-            XPATH_STATE_NAME,
-            XPathConstants.STRING,
-            ArtifactNamespaceContext.INSTANCE);
+        final String state = (String) XMLUtils.xpath(currentState, XPATH_STATE_NAME, XPathConstants.STRING, ArtifactNamespaceContext.INSTANCE);
 
         log.debug("Current state name: " + state);
 
-        DataList currentData = extractCurrentData(dynamicNode, state);
-        DataList[] old       = extractOldData(staticNode);
-        String[] states      = extractReachableStates(reachable);
-        OutputMode[] outs    = extractOutputModes(outputs);
-        Recommendation[] rec = extractRecommendedArtifacts(doc);
+        final DataList currentData = extractCurrentData(dynamicNode, state);
+        final DataList[] old = extractOldData(staticNode);
+        final String[] states = extractReachableStates(reachable);
+        final OutputMode[] outs = extractOutputModes(outputs);
+        final Recommendation[] rec = extractRecommendedArtifacts(doc);
 
-        return new DefaultArtifactDescription(
-            old,
-            currentData,
-            state,
-            states,
-            outs,
-            rec);
+        return new DefaultArtifactDescription(old, currentData, state, states, outs, rec);
     }
 
-
     /**
      * This method extracts the data that the user is able to enter in the
      * current state of the artifact.
      *
-     * @param dynamicNode The dynamic node of the DESCRIBE document.
-     * @param state The name of the current state.
+     * @param dynamicNode
+     *            The dynamic node of the DESCRIBE document.
+     * @param state
+     *            The name of the current state.
      *
      * @return A {@link Data} object that represents the data which might be
-     * entered by the user in the current state or null, if no data might be
-     * entered.
+     *         entered by the user in the current state or null, if no data might be
+     *         entered.
      */
-    protected static DataList extractCurrentData(
-        Node dynamicNode,
-        String state
-    ) {
+    protected static DataList extractCurrentData(final Node dynamicNode, final String state) {
         log.debug("ArtifactDescriptionFactory.extractCurrentData");
 
-        NodeList data     = ClientProtocolUtils.getSelectNode(dynamicNode);
-        String help       = extractHelpText(dynamicNode);
-        String uiProvider = extractUIProvider(dynamicNode);
+        final NodeList data = ClientProtocolUtils.getSelectNode(dynamicNode);
+        final String help = extractHelpText(dynamicNode);
+        final String uiProvider = extractUIProvider(dynamicNode);
 
         if (data == null || data.getLength() == 0) {
             return null;
         }
 
-        int      dataNum = data.getLength();
-        DataList list    = new DataList(state, dataNum, uiProvider, null, help);
+        final int dataNum = data.getLength();
+        final DataList list = new DataList(state, dataNum, uiProvider, null, help);
 
         for (int i = 0; i < dataNum; i++) {
-            Element   d  = (Element) data.item(i);
-            String label = ClientProtocolUtils.getLabel(d);
-            String name  = XMLUtils.xpathString(
-                d, "@art:name", ArtifactNamespaceContext.INSTANCE);
-            String type  = XMLUtils.xpathString(
-                d, "@art:type", ArtifactNamespaceContext.INSTANCE);
+            final Element d = (Element) data.item(i);
+            final String label = ClientProtocolUtils.getLabel(d);
+            final String name = XMLUtils.xpathString(d, "@art:name", ArtifactNamespaceContext.INSTANCE);
+            final String type = XMLUtils.xpathString(d, "@art:type", ArtifactNamespaceContext.INSTANCE);
 
             log.debug("Create new IntegerRangeData object for: " + name);
             log.debug("New Data is from type: " + type);
@@ -156,98 +136,77 @@
             // TODO replace with DataFactory.
 
             if (type == null || type.length() == 0) {
-                NodeList   choices   = ClientProtocolUtils.getItemNodes(d);
-                DataItem[] dataItems = extractCurrentDataItems(choices);
-                DataItem   def       = extractDefaultDataItem(d);
+                final NodeList choices = ClientProtocolUtils.getItemNodes(d);
+                final DataItem[] dataItems = extractCurrentDataItems(choices);
+                final DataItem def = extractDefaultDataItem(d);
 
                 list.add(new DefaultData(name, label, null, dataItems, def));
-            }
-            else if (type.equals("intrange")) {
-                String min = ClientProtocolUtils.getMinNode(d);
-                String max = ClientProtocolUtils.getMaxNode(d);
+            } else if (type.equals("intrange")) {
+                final String min = ClientProtocolUtils.getMinNode(d);
+                final String max = ClientProtocolUtils.getMaxNode(d);
 
-                String defMin = ClientProtocolUtils.getDefMin(d);
-                String defMax = ClientProtocolUtils.getDefMax(d);
+                final String defMin = ClientProtocolUtils.getDefMin(d);
+                final String defMax = ClientProtocolUtils.getDefMax(d);
 
                 try {
-                    int lower = Integer.parseInt(min);
-                    int upper = Integer.parseInt(max);
-
-                    if (defMin != null && defMax != null) {
-                        list.add(new IntegerRangeData(
-                                name, label,
-                                lower, upper,
-                                Integer.parseInt(defMin),
-                                Integer.parseInt(defMax)));
-                    }
-                    else {
-                        list.add(
-                            new IntegerRangeData(name, label, lower, upper));
-                    }
-                }
-                catch (NumberFormatException nfe) {
-                    log.warn("NumberFormatException: ", nfe);
-                }
-            }
-            else if (type.equals("longrange")) {
-                String min = ClientProtocolUtils.getMinNode(d);
-                String max = ClientProtocolUtils.getMaxNode(d);
-
-                String defMin = ClientProtocolUtils.getDefMin(d);
-                String defMax = ClientProtocolUtils.getDefMax(d);
-
-                try {
-                    long lower = Long.valueOf(min);
-                    long upper = Long.valueOf(max);
+                    final int lower = Integer.parseInt(min);
+                    final int upper = Integer.parseInt(max);
 
                     if (defMin != null && defMax != null) {
-                        list.add(new LongRangeData(
-                                name, label,
-                                lower, upper,
-                                Long.valueOf(defMin),
-                                Long.valueOf(defMax)));
+                        list.add(new IntegerRangeData(name, label, lower, upper, Integer.parseInt(defMin), Integer.parseInt(defMax)));
+                    } else {
+                        list.add(new IntegerRangeData(name, label, lower, upper));
                     }
                 }
-                catch (NumberFormatException nfe) {
+                catch (final NumberFormatException nfe) {
                     log.warn("NumberFormatException: ", nfe);
                 }
-            }
-            else if (type.equals("intarray")) {
+            } else if (type.equals("longrange")) {
+                final String min = ClientProtocolUtils.getMinNode(d);
+                final String max = ClientProtocolUtils.getMaxNode(d);
+
+                final String defMin = ClientProtocolUtils.getDefMin(d);
+                final String defMax = ClientProtocolUtils.getDefMax(d);
+
+                try {
+                    final long lower = Long.valueOf(min);
+                    final long upper = Long.valueOf(max);
+
+                    if (defMin != null && defMax != null) {
+                        list.add(new LongRangeData(name, label, lower, upper, Long.valueOf(defMin), Long.valueOf(defMax)));
+                    }
+                }
+                catch (final NumberFormatException nfe) {
+                    log.warn("NumberFormatException: ", nfe);
+                }
+            } else if (type.equals("intarray")) {
                 list.add(new IntegerArrayData(name, label, null));
-            }
-            else if (type.equals("intoptions")
-                && uiProvider.equals("parameter-matrix")
+            } else if (type.equals("intoptions") && uiProvider.startsWith("parameter-matrix")// uiProvider.equals("parameter-matrix") // what the...? used to be
+                                                                                             // "equals", but column-name for "itemname" refactoring created new
+                                                                                             // UIProviderFactory-Names starting with "parameter-matrix"
             ) {
                 list.add(DataFactory.createIntegerOptionsData(d, name, label));
-            }
-            else if (type.equals("options")) {
+            } else if (type.equals("options")) {
                 list.add(DataFactory.createStringOptionsData(d, name, label));
-            }
-            else if (type.equals("intoptions")) {
-                NodeList   choices = ClientProtocolUtils.getItemNodes(d);
-                DataItem[] opts    = extractCurrentDataItems(choices);
+            } else if (type.equals("intoptions")) {
+                final NodeList choices = ClientProtocolUtils.getItemNodes(d);
+                final DataItem[] opts = extractCurrentDataItems(choices);
 
                 list.add(new IntegerOptionsData(name, label, opts));
-            }
-            else if (type.equals("doublearray")) {
+            } else if (type.equals("doublearray")) {
                 list.add(new DoubleArrayData(name, label, null));
-            }
-            else if (type.equals("multiattribute")) {
+            } else if (type.equals("multiattribute")) {
                 list.add(DataFactory.createMultiAttributeData(d, name, label));
-            }
-            else {
+            } else {
                 log.warn("Unrecognized Dynamic data type.");
-                NodeList   choices   = ClientProtocolUtils.getItemNodes(d);
-                DataItem[] dataItems = extractCurrentDataItems(choices);
-                DataItem   def       = extractDefaultDataItem(d);
+                final NodeList choices = ClientProtocolUtils.getItemNodes(d);
+                final DataItem[] dataItems = extractCurrentDataItems(choices);
+                final DataItem def = extractDefaultDataItem(d);
 
-                String min = ClientProtocolUtils.getMinNode(d);
-                String max = ClientProtocolUtils.getMaxNode(d);
+                final String min = ClientProtocolUtils.getMinNode(d);
+                final String max = ClientProtocolUtils.getMaxNode(d);
                 if (min != null && max != null) {
-                    list.add(new DoubleRangeData(
-                        name, label,
-                        Double.valueOf(min), Double.valueOf(max),
-                        Double.valueOf(min), Double.valueOf(max)));
+                    list.add(new DoubleRangeData(name, label, Double.valueOf(min), Double.valueOf(max), Double.valueOf(min), Double.valueOf(max)));
                 }
 
                 list.add(new DefaultData(name, label, null, dataItems, def));
@@ -258,22 +217,20 @@
         return list;
     }
 
-
     /**
      * This method extracts the default value of a Data object.
      *
-     * @param data The data object node.
+     * @param data
+     *            The data object node.
      *
      * @return the default DataItem.
      */
-    protected static DataItem extractDefaultDataItem(Node data) {
+    protected static DataItem extractDefaultDataItem(final Node data) {
         log.debug("ArtifactDescriptionFactory.extractDefaultDataItem");
 
-        String value = XMLUtils.xpathString(
-            data, "@art:defaultValue", ArtifactNamespaceContext.INSTANCE);
+        final String value = XMLUtils.xpathString(data, "@art:defaultValue", ArtifactNamespaceContext.INSTANCE);
 
-        String label = XMLUtils.xpathString(
-            data, "@art:defaultLabel", ArtifactNamespaceContext.INSTANCE);
+        final String label = XMLUtils.xpathString(data, "@art:defaultLabel", ArtifactNamespaceContext.INSTANCE);
 
         if (value != null && label != null) {
             return new DefaultDataItem(label, null, value);
@@ -282,15 +239,15 @@
         return null;
     }
 
-
     /**
      * This method extract the {@link DataItem}s of the DESCRIBE document.
      *
-     * @param items The items in the DESCRIBE document.
+     * @param items
+     *            The items in the DESCRIBE document.
      *
      * @return the {@link DataItem}s.
      */
-    protected static DataItem[] extractCurrentDataItems(NodeList items) {
+    protected static DataItem[] extractCurrentDataItems(final NodeList items) {
         log.debug("ArtifactDescriptionFactory.extractCurrentDataItems");
 
         if (items == null || items.getLength() == 0) {
@@ -298,22 +255,21 @@
             return null;
         }
 
-        int count = items.getLength();
+        final int count = items.getLength();
 
-        List<DataItem> dataItems = new ArrayList<DataItem>(count);
+        final List<DataItem> dataItems = new ArrayList<DataItem>(count);
 
         for (int i = 0; i < count; i++) {
-            Node item    = items.item(i);
-            String label = ClientProtocolUtils.getLabel(item);
-            String value = ClientProtocolUtils.getValue(item);
+            final Node item = items.item(i);
+            final String label = ClientProtocolUtils.getLabel(item);
+            final String value = ClientProtocolUtils.getValue(item);
 
-            double[] mmQ = extractMinMaxQValues(item);
-            double[] mmW = extractMinMaxWValues(item);
+            final double[] mmQ = extractMinMaxQValues(item);
+            final double[] mmW = extractMinMaxWValues(item);
 
             if (mmQ != null || mmW != null) {
                 dataItems.add(new WQDataItem(label, null, value, mmQ, mmW));
-            }
-            else {
+            } else {
                 dataItems.add(new DefaultDataItem(label, null, value));
             }
         }
@@ -321,8 +277,7 @@
         return dataItems.toArray(new DataItem[count]);
     }
 
-
-    protected static double[] extractMinMaxQValues(Node item) {
+    protected static double[] extractMinMaxQValues(final Node item) {
         log.debug("ArtifactDescriptionFactory.extractMinMaxQValues");
 
         if (item == null) {
@@ -330,11 +285,7 @@
             return null;
         }
 
-        Node node = (Node) XMLUtils.xpath(
-            item,
-            "art:range[@art:type='Q']",
-            XPathConstants.NODE,
-            ArtifactNamespaceContext.INSTANCE);
+        final Node node = (Node) XMLUtils.xpath(item, "art:range[@art:type='Q']", XPathConstants.NODE, ArtifactNamespaceContext.INSTANCE);
 
         if (node == null) {
             log.debug("No min/max Q values found.");
@@ -344,8 +295,7 @@
         return extractMinMaxValues(node);
     }
 
-
-    protected static double[] extractMinMaxWValues(Node item) {
+    protected static double[] extractMinMaxWValues(final Node item) {
         log.debug("ArtifactDescriptionFactory.extractMinMaxWValues");
 
         if (item == null) {
@@ -353,11 +303,7 @@
             return null;
         }
 
-        Node node = (Node) XMLUtils.xpath(
-            item,
-            "art:range[@art:type='W']",
-            XPathConstants.NODE,
-            ArtifactNamespaceContext.INSTANCE);
+        final Node node = (Node) XMLUtils.xpath(item, "art:range[@art:type='W']", XPathConstants.NODE, ArtifactNamespaceContext.INSTANCE);
 
         if (node == null) {
             log.debug("No min/max W values found.");
@@ -367,15 +313,12 @@
         return extractMinMaxValues(node);
     }
 
-
-    protected static double[] extractMinMaxValues(Node node) {
+    protected static double[] extractMinMaxValues(final Node node) {
         log.debug("ArtifactDescriptionFactory.extractMinMaxValues");
 
-        String minStr = XMLUtils.xpathString(
-            node, "art:min/text()", ArtifactNamespaceContext.INSTANCE);
+        final String minStr = XMLUtils.xpathString(node, "art:min/text()", ArtifactNamespaceContext.INSTANCE);
 
-        String maxStr = XMLUtils.xpathString(
-            node, "art:max/text()", ArtifactNamespaceContext.INSTANCE);
+        final String maxStr = XMLUtils.xpathString(node, "art:max/text()", ArtifactNamespaceContext.INSTANCE);
 
         if (maxStr == null || minStr == null) {
             log.debug("No min/max values found.");
@@ -383,71 +326,59 @@
         }
 
         try {
-            double min = Double.valueOf(minStr);
-            double max = Double.valueOf(maxStr);
+            final double min = Double.valueOf(minStr);
+            final double max = Double.valueOf(maxStr);
 
             return new double[] { min, max };
         }
-        catch (NumberFormatException nfe) {
+        catch (final NumberFormatException nfe) {
             log.debug("Error while parsing min/max values.");
         }
 
         return null;
     }
 
-
     /**
      * This method extracts the data objects from the data node of the static ui
      * part of the DESCRIBE document.
      *
-     * @param staticNode The static ui node of the DESCRIBE.
+     * @param staticNode
+     *            The static ui node of the DESCRIBE.
      *
      * @return the DataList objects.
      */
-    protected static DataList[] extractOldData(Node staticNode) {
+    protected static DataList[] extractOldData(final Node staticNode) {
         log.debug("ArtifactDescriptionFactory.extractOldData()");
 
-        NodeList stateNodes = (NodeList) XMLUtils.xpath(
-            staticNode,
-            XPATH_STATIC_STATE_NODE,
-            XPathConstants.NODESET,
-            ArtifactNamespaceContext.INSTANCE);
+        final NodeList stateNodes = (NodeList) XMLUtils.xpath(staticNode, XPATH_STATIC_STATE_NODE, XPathConstants.NODESET, ArtifactNamespaceContext.INSTANCE);
 
         if (stateNodes == null || stateNodes.getLength() == 0) {
             log.debug("No old items found.");
             return null;
         }
 
-        int count       = stateNodes.getLength();
-        DataList[] data = new DataList[count];
+        final int count = stateNodes.getLength();
+        final DataList[] data = new DataList[count];
 
         for (int i = 0; i < count; i++) {
-            Node tmp = stateNodes.item(i);
+            final Node tmp = stateNodes.item(i);
 
-            String name = XMLUtils.xpathString(
-                tmp, "@art:name", ArtifactNamespaceContext.INSTANCE);
-            String uiprovider = XMLUtils.xpathString(
-                tmp, "@art:uiprovider", ArtifactNamespaceContext.INSTANCE);
-            String label = XMLUtils.xpathString(
-                tmp, "@art:label", ArtifactNamespaceContext.INSTANCE);
-            String help = XMLUtils.xpathString(
-                tmp, "@art:helpText", ArtifactNamespaceContext.INSTANCE);
+            final String name = XMLUtils.xpathString(tmp, "@art:name", ArtifactNamespaceContext.INSTANCE);
+            final String uiprovider = XMLUtils.xpathString(tmp, "@art:uiprovider", ArtifactNamespaceContext.INSTANCE);
+            final String label = XMLUtils.xpathString(tmp, "@art:label", ArtifactNamespaceContext.INSTANCE);
+            final String help = XMLUtils.xpathString(tmp, "@art:helpText", ArtifactNamespaceContext.INSTANCE);
 
-            NodeList dataNodes = (NodeList) XMLUtils.xpath(
-                tmp,
-                XPATH_STATIC_DATA_NODE,
-                XPathConstants.NODESET,
-                ArtifactNamespaceContext.INSTANCE);
+            final NodeList dataNodes = (NodeList) XMLUtils.xpath(tmp, XPATH_STATIC_DATA_NODE, XPathConstants.NODESET, ArtifactNamespaceContext.INSTANCE);
 
             if (dataNodes == null || dataNodes.getLength() == 0) {
                 continue;
             }
 
-            int size      = dataNodes.getLength();
-            DataList list = new DataList(name, size, uiprovider, label, help);
+            final int size = dataNodes.getLength();
+            final DataList list = new DataList(name, size, uiprovider, label, help);
 
             for (int j = 0; j < size; j++) {
-                Node dataNode = dataNodes.item(j);
+                final Node dataNode = dataNodes.item(j);
 
                 list.add(DataFactory.createDataFromElement((Element) dataNode));
 
@@ -458,68 +389,55 @@
         return data;
     }
 
-
     /**
      * This method extracts the UIProvider specified by the data node.
      *
-     * @param data The data node.
+     * @param data
+     *            The data node.
      *
      * @return the UIProvider that is specified in the data node.
      */
-    protected static String extractUIProvider(Node ui) {
-        return (String) XMLUtils.xpath(
-            ui,
-            XPATH_UIPROVIDER,
-            XPathConstants.STRING,
-            ArtifactNamespaceContext.INSTANCE);
+    protected static String extractUIProvider(final Node ui) {
+        return (String) XMLUtils.xpath(ui, XPATH_UIPROVIDER, XPathConstants.STRING, ArtifactNamespaceContext.INSTANCE);
     }
 
-
     /**
      * This method extracts the help text specified by the data node.
      *
-     * @param ui The data node.
+     * @param ui
+     *            The data node.
      *
      * @return the help text.
      */
-    protected static String extractHelpText(Node ui) {
-        return (String) XMLUtils.xpath(
-            ui,
-            XPATH_HELP_TEXT,
-            XPathConstants.STRING,
-            ArtifactNamespaceContext.INSTANCE);
+    protected static String extractHelpText(final Node ui) {
+        return (String) XMLUtils.xpath(ui, XPATH_HELP_TEXT, XPathConstants.STRING, ArtifactNamespaceContext.INSTANCE);
     }
 
-
     /**
      * This method extracts the reachable states of the current artifact.
      *
-     * @param reachable The reachable states node.
+     * @param reachable
+     *            The reachable states node.
      *
      * @return an array with identifiers of reachable states.
      */
-    protected static String[] extractReachableStates(Node reachable) {
+    protected static String[] extractReachableStates(final Node reachable) {
         log.debug("ArtifactDescriptionFactory.extractReachableStates()");
 
-        NodeList list = (NodeList) XMLUtils.xpath(
-            reachable,
-            XPATH_REACHABLE_STATE,
-            XPathConstants.NODESET,
-            ArtifactNamespaceContext.INSTANCE);
+        final NodeList list = (NodeList) XMLUtils.xpath(reachable, XPATH_REACHABLE_STATE, XPathConstants.NODESET, ArtifactNamespaceContext.INSTANCE);
 
         if (list == null || list.getLength() == 0) {
             return null;
         }
 
-        int count = list.getLength();
+        final int count = list.getLength();
 
-        String[] states = new String[count];
+        final String[] states = new String[count];
 
         for (int i = 0; i < count; i++) {
-            Node state = list.item(i);
+            final Node state = list.item(i);
 
-            String name = XMLUtils.xpathString(
-                state, "@art:name", ArtifactNamespaceContext.INSTANCE);
+            final String name = XMLUtils.xpathString(state, "@art:name", ArtifactNamespaceContext.INSTANCE);
 
             states[i] = name;
         }
@@ -527,72 +445,61 @@
         return states;
     }
 
-
     /**
      * This method extract available output modes of the the current artifact.
      *
-     * @param outputs A list of nodes that contain information about output
-     * modes.
+     * @param outputs
+     *            A list of nodes that contain information about output
+     *            modes.
      *
      * @return an array of Output modes.
      */
-    protected static OutputMode[] extractOutputModes(NodeList outputs) {
+    protected static OutputMode[] extractOutputModes(final NodeList outputs) {
         log.debug("ArtifactDescriptionFactory.extractOutputModes");
 
         if (outputs == null || outputs.getLength() == 0) {
             return null;
         }
 
-        int size = outputs.getLength();
+        final int size = outputs.getLength();
 
-        List<OutputMode> outs = new ArrayList<OutputMode>(size);
+        final List<OutputMode> outs = new ArrayList<OutputMode>(size);
 
         for (int i = 0; i < size; i++) {
-            Node out = outputs.item(i);
+            final Node out = outputs.item(i);
 
-            String name = XMLUtils.xpathString(
-                out, "@art:name", ArtifactNamespaceContext.INSTANCE);
-            String desc = XMLUtils.xpathString(
-                out, "@art:description", ArtifactNamespaceContext.INSTANCE);
-            String mimeType = XMLUtils.xpathString(
-                out, "@art:mime-type", ArtifactNamespaceContext.INSTANCE);
+            final String name = XMLUtils.xpathString(out, "@art:name", ArtifactNamespaceContext.INSTANCE);
+            final String desc = XMLUtils.xpathString(out, "@art:description", ArtifactNamespaceContext.INSTANCE);
+            final String mimeType = XMLUtils.xpathString(out, "@art:mime-type", ArtifactNamespaceContext.INSTANCE);
 
             if (name != null) {
                 outs.add(new DefaultOutputMode(name, desc, mimeType));
-            }
-            else {
+            } else {
                 log.debug("Found an invalid output mode.");
             }
         }
 
-        return (OutputMode[]) outs.toArray(new OutputMode[size]);
+        return outs.toArray(new OutputMode[size]);
     }
 
-
-    protected static Recommendation[] extractRecommendedArtifacts(Document doc){
+    protected static Recommendation[] extractRecommendedArtifacts(final Document doc) {
         log.debug("ArtifactDescriptionFactory.extractRecommendedArtifacts.");
 
-        NodeList list = (NodeList) XMLUtils.xpath(
-            doc,
-            XPATH_RECOMMENDED_ARTIFACTS,
-            XPathConstants.NODESET,
-            ArtifactNamespaceContext.INSTANCE);
+        final NodeList list = (NodeList) XMLUtils.xpath(doc, XPATH_RECOMMENDED_ARTIFACTS, XPathConstants.NODESET, ArtifactNamespaceContext.INSTANCE);
 
-        int num = list != null ? list.getLength() : 0;
+        final int num = list != null ? list.getLength() : 0;
 
-        Recommendation[] rec = new Recommendation[num];
+        final Recommendation[] rec = new Recommendation[num];
 
         for (int i = 0; i < num; i++) {
-            Element e           = (Element) list.item(i);
-            String  factory     = e.getAttribute("factory");
-            String  index       = e.getAttribute("ids");
-            String  targetOut   = e.getAttribute("target_out");
+            final Element e = (Element) list.item(i);
+            final String factory = e.getAttribute("factory");
+            final String index = e.getAttribute("ids");
+            final String targetOut = e.getAttribute("target_out");
 
             if (factory != null && factory.length() > 0) {
-                log.debug("Adding Recommendation. Factory: " + factory +
-                        " IDs: " + index + " target out " + targetOut);
-                rec[i] = new Recommendation(
-                    factory, index, null, null, targetOut);
+                log.debug("Adding Recommendation. Factory: " + factory + " IDs: " + index + " target out " + targetOut);
+                rec[i] = new Recommendation(factory, index, null, null, targetOut);
             }
         }