--- a/gnv-artifacts/src/main/java/de/intevation/gnv/transition/TransitionBase.java	Wed Sep 09 13:14:12 2009 +0000
+++ b/gnv-artifacts/src/main/java/de/intevation/gnv/transition/TransitionBase.java	Wed Sep 09 15:28:18 2009 +0000
@@ -24,6 +24,8 @@
 import de.intevation.gnv.geobackend.base.query.QueryExecutorFactory;
 import de.intevation.gnv.geobackend.base.query.exception.QueryException;
 import de.intevation.gnv.geobackend.util.DateUtils;
+import de.intevation.gnv.transition.describedata.DefaultKeyValueDescribeData;
+import de.intevation.gnv.transition.describedata.KeyValueDescibeData;
 import de.intevation.gnv.transition.describedata.MinMaxDescribeData;
 import de.intevation.gnv.transition.exception.TransitionException;
 
@@ -219,7 +221,14 @@
         if (this.descibeData == null){
             this.descibeData = new ArrayList<Object>();
         }
-        this.descibeData.add(result);
+        
+        Iterator<Result> it = result.iterator();
+        Collection<KeyValueDescibeData> keyValueDescibeData = new ArrayList<KeyValueDescibeData>(result.size());
+        while(it.hasNext()){
+            Result resultValue = it.next();
+            keyValueDescibeData.add(new DefaultKeyValueDescribeData(resultValue.getInteger("KEY").intValue(), resultValue.getString("VALUE")));
+        }
+        this.descibeData.add(keyValueDescibeData);
     }
     
     /**
@@ -244,19 +253,19 @@
                     lableNode.setTextContent(name);
                     Element choiceNode = this.createXFormElement(document, "choices");
                     
-                    Collection<Result> values = (Collection)o;
-                    Iterator<Result> resultIt = values.iterator();
+                    Collection<KeyValueDescibeData> values = (Collection)o;
+                    Iterator<KeyValueDescibeData> resultIt = values.iterator();
                     while (resultIt.hasNext()){
-                        Result result = resultIt.next();
+                        KeyValueDescibeData result = resultIt.next();
                         Element itemNode = this.createXFormElement(document, "item");
                         
                         
                         Element choiceLableNode = this.createXFormElement(document, "label");
-                        choiceLableNode.setTextContent(result.getString("VALUE"));
+                        choiceLableNode.setTextContent(result.getValue());
                         itemNode.appendChild(choiceLableNode);
                         
                         Element choicValueNode = this.createXFormElement(document, "value");
-                        choicValueNode.setTextContent(result.getString("KEY"));
+                        choicValueNode.setTextContent(""+result.getKey());
                         itemNode.appendChild(choicValueNode);
                         
                         choiceNode.appendChild(itemNode);