--- a/flys-client/src/main/java/de/intevation/flys/client/server/ArtifactDescriptionFactory.java	Wed May 16 13:43:15 2012 +0000
+++ b/flys-client/src/main/java/de/intevation/flys/client/server/ArtifactDescriptionFactory.java	Wed May 16 14:52:39 2012 +0000
@@ -181,10 +181,10 @@
                 list.add(new IntegerArrayData(name, label, null));
             }
             else if (type.equals("intoptions") && uiProvider.equals("parameter-matrix")) {
-                NodeList   choices = ClientProtocolUtils.getItemNodes(d);
-                DataItem[] opts    = extractIntegerOptions(choices);
-
-                list.add(new IntegerOptionsData(name, label, opts));
+                list.add(DataFactory.createIntegerOptionsData(d, name, label));
+            }
+            else if (type.equals("options")) {
+                list.add(DataFactory.createStringOptionsData(d, name, label));
             }
             else if (type.equals("intoptions")) {
                 NodeList   choices = ClientProtocolUtils.getItemNodes(d);
@@ -243,23 +243,6 @@
     }
 
 
-    protected static DataItem[] extractIntegerOptions(NodeList options) {
-        DataItem[] items = new DataItem[options.getLength()];
-
-        for (int i = 0, n = options.getLength(); i < n; i++) {
-            Element el = (Element) options.item(i);
-
-            String value = el.getTextContent();
-            String label = XMLUtils.xpathString(
-                el, "@art:label", ArtifactNamespaceContext.INSTANCE);
-
-            items[i] = new DefaultDataItem(label, label, value);
-        }
-
-        return items;
-    }
-
-
     /**
      * This method extract the {@link DataItem}s of the DESCRIBE document.
      *