--- a/flys-client/src/main/java/de/intevation/flys/client/server/DataFactory.java	Wed May 16 08:16:13 2012 +0000
+++ b/flys-client/src/main/java/de/intevation/flys/client/server/DataFactory.java	Wed May 16 10:45:57 2012 +0000
@@ -42,41 +42,44 @@
      * @return a Data instance.
      */
     public static Data createDataFromElement(Element element) {
-        String name = element.getAttributeNS(NS_URI, "name");
-        String type = element.getAttributeNS(NS_URI, "type");
+        String name  = element.getAttributeNS(NS_URI, "name");
+        String type  = element.getAttributeNS(NS_URI, "type");
+        String label = element.getAttributeNS(NS_URI, "label");
+
+        label = label != null && label.length() > 0 ? label : name;
 
         try {
             logger.debug("Create Data instance for: " + name + " | " + type);
 
             if (type == null || type.length() == 0) {
-                return createDefaultData(element, name);
+                return createDefaultData(element, name, label);
             }
 
             type = type.toLowerCase();
 
             if (type.equals(StringData.TYPE)) {
-                return createStringData(element, name);
+                return createStringData(element, name, label);
             }
             else if (type.equals(IntegerData.TYPE)) {
-                return createIntegerData(element, name);
+                return createIntegerData(element, name, label);
             }
             else if (type.equals(IntegerOptionsData.TYPE)) {
-                return createIntegerOptionsData(element, name);
+                return createIntegerOptionsData(element, name, label);
             }
             else if (type.equals(IntegerRangeData.TYPE)) {
-                return createIntegerRangeData(element, name);
+                return createIntegerRangeData(element, name, label);
             }
             else if (type.equals(IntegerArrayData.TYPE)) {
-                return createIntegerArrayData(element, name);
+                return createIntegerArrayData(element, name, label);
             }
             else if (type.equals(DoubleArrayData.TYPE)) {
-                return createDoubleArrayData(element, name);
+                return createDoubleArrayData(element, name, label);
             }
             else if (type.equals(LongRangeData.TYPE)) {
-                return createLongRangeData(element, name);
+                return createLongRangeData(element, name, label);
             }
             else {
-                return createDefaultData(element, name);
+                return createDefaultData(element, name, label);
             }
         }
         catch (Exception e) {
@@ -96,9 +99,9 @@
      *
      * @return an instance of DefaultData.
      */
-    protected static Data createDefaultData(Element ele, String name) {
+    protected static Data createDefaultData(Element ele, String name, String label) {
         logger.debug("Create new DefaultData");
-        return new DefaultData(name, name, "default", extractDataItems(ele));
+        return new DefaultData(name, label, "default", extractDataItems(ele));
     }
 
 
@@ -111,8 +114,8 @@
      *
      * @return an instance of StringData.
      */
-    protected static Data createStringData(Element ele, String name) {
-        return new StringData(name, name, extractDataItems(ele));
+    protected static Data createStringData(Element ele, String name, String label) {
+        return new StringData(name, label, extractDataItems(ele));
     }
 
 
@@ -125,8 +128,8 @@
      *
      * @return an instance of IntegerData.
      */
-    protected static Data createIntegerData(Element ele, String name) {
-        return new IntegerData(name, name, extractDataItems(ele));
+    protected static Data createIntegerData(Element ele, String name, String label) {
+        return new IntegerData(name, label, extractDataItems(ele));
     }
 
 
@@ -139,8 +142,8 @@
      *
      * @return an instance of IntegerOptionsData.
      */
-    protected static Data createIntegerOptionsData(Element ele, String name) {
-        return new IntegerOptionsData(name, name, extractDataItems(ele));
+    protected static Data createIntegerOptionsData(Element ele, String name, String label) {
+        return new IntegerOptionsData(name, label, extractDataItems(ele));
     }
 
 
@@ -153,7 +156,7 @@
      *
      * @return an instance of IntegerRangeData.
      */
-    protected static Data createIntegerRangeData(Element ele, String name) {
+    protected static Data createIntegerRangeData(Element ele, String name, String label) {
         DataItem[] items    = extractDataItems(ele);
         String     rawValue = items[0].getStringValue();
 
@@ -161,7 +164,7 @@
 
         return new IntegerRangeData(
             name,
-            name,
+            label,
             Integer.valueOf(minmax[0]),
             Integer.valueOf(minmax[1]));
     }
@@ -176,7 +179,7 @@
      *
      * @return an instance of IntegerArrayData.
      */
-    protected static Data createIntegerArrayData(Element ele, String name) {
+    protected static Data createIntegerArrayData(Element ele, String name, String label) {
         DataItem[] items    = extractDataItems(ele);
         String     rawValue = items[0].getStringValue();
 
@@ -192,7 +195,7 @@
             }
         }
 
-        return new IntegerArrayData(name, items[0].getLabel(), integers);
+        return new IntegerArrayData(name, label, integers);
     }
 
 
@@ -205,7 +208,7 @@
      *
      * @return an instance of DoubleArrayData.
      */
-    protected static Data createDoubleArrayData(Element ele, String name) {
+    protected static Data createDoubleArrayData(Element ele, String name, String label) {
         DataItem[] items    = extractDataItems(ele);
         String     rawValue = items[0].getStringValue();
 
@@ -221,7 +224,7 @@
             }
         }
 
-        return new DoubleArrayData(name, items[0].getLabel(), doubles);
+        return new DoubleArrayData(name, label, doubles);
     }
 
 
@@ -270,7 +273,7 @@
      *
      * @return an instance of IntegerRangeData.
      */
-    protected static Data createLongRangeData(Element ele, String name) {
+    protected static Data createLongRangeData(Element ele, String name, String label) {
         DataItem[] items    = extractDataItems(ele);
         String     rawValue = items[0].getStringValue();
 
@@ -278,7 +281,7 @@
 
         return new LongRangeData(
             name,
-            name,
+            label,
             Long.valueOf(minmax[0]),
             Long.valueOf(minmax[1]));
     }