--- a/gnv-artifacts/src/main/java/de/intevation/gnv/transition/TransitionBase.java	Tue Sep 15 10:11:08 2009 +0000
+++ b/gnv-artifacts/src/main/java/de/intevation/gnv/transition/TransitionBase.java	Wed Sep 16 07:49:46 2009 +0000
@@ -35,6 +35,12 @@
  *
  */
 public abstract class TransitionBase implements Transition {
+    
+    /**
+     * The UID of this Class
+     */
+    private static final long serialVersionUID = 2411169179001645426L;
+
     /**
      * the logger, used to log exceptions and additonaly information
      */
@@ -238,79 +244,82 @@
             ArtifactXMLUtilities xmlutilities = new ArtifactXMLUtilities();
             Iterator<Object> it = this.descibeData.iterator();
             while (it.hasNext()){
+                
                 Object o = it.next();
-                if (o instanceof Collection<?>){
-                    Element selectNode = xmlutilities.createXFormElement(document,"select");
-                    // TODO: HACK:
-                    // BESSERE LÖSUNG FINDEN
-                    Object[] names = this.inputValueNames.toArray();
-                    String name = names[names.length-1].toString();
-                    
-                    selectNode.setAttribute("ref", name);
-                    
-                    Element lableNode = xmlutilities.createXFormElement(document, "label");
-                    lableNode.setTextContent(name);
-                    Element choiceNode = xmlutilities.createXFormElement(document, "choices");
-                    
-                    Collection<KeyValueDescibeData> values = (Collection)o;
-                    Iterator<KeyValueDescibeData> resultIt = values.iterator();
-                    while (resultIt.hasNext()){
-                        KeyValueDescibeData result = resultIt.next();
-                        Element itemNode = xmlutilities.createXFormElement(document, "item");
+                if (!it.hasNext()){
+                    if (o instanceof Collection<?>){
+                        Element selectNode = xmlutilities.createXFormElement(document,"select");
+                        // TODO: HACK:
+                        // BESSERE LÖSUNG FINDEN
+                        Object[] names = this.inputValueNames.toArray();
+                        String name = names[names.length-1].toString();
                         
-                        
-                        Element choiceLableNode = xmlutilities.createXFormElement(document, "label");
-                        choiceLableNode.setTextContent(result.getValue());
-                        itemNode.appendChild(choiceLableNode);
+                        selectNode.setAttribute("ref", name);
                         
-                        Element choicValueNode = xmlutilities.createXFormElement(document, "value");
-                        choicValueNode.setTextContent(""+result.getKey());
-                        itemNode.appendChild(choicValueNode);
+                        Element lableNode = xmlutilities.createXFormElement(document, "label");
+                        lableNode.setTextContent(name);
+                        Element choiceNode = xmlutilities.createXFormElement(document, "choices");
                         
-                        choiceNode.appendChild(itemNode);
+                        Collection<KeyValueDescibeData> values = (Collection)o;
+                        Iterator<KeyValueDescibeData> resultIt = values.iterator();
+                        while (resultIt.hasNext()){
+                            KeyValueDescibeData result = resultIt.next();
+                            Element itemNode = xmlutilities.createXFormElement(document, "item");
+                            
+                            
+                            Element choiceLableNode = xmlutilities.createXFormElement(document, "label");
+                            choiceLableNode.setTextContent(result.getValue());
+                            itemNode.appendChild(choiceLableNode);
+                            
+                            Element choicValueNode = xmlutilities.createXFormElement(document, "value");
+                            choicValueNode.setTextContent(""+result.getKey());
+                            itemNode.appendChild(choicValueNode);
+                            
+                            choiceNode.appendChild(itemNode);
+                        }
+                        selectNode.appendChild(lableNode);
+                        selectNode.appendChild(choiceNode);
+                        rootNode.appendChild(selectNode);
+                    }else if (o instanceof MinMaxDescribeData){
+                        MinMaxDescribeData descibeData = (MinMaxDescribeData)o;
+                        Object min = descibeData.getMinValue();
+                        Object max = descibeData.getMaxValue();
+                        if (min instanceof GregorianCalendar){
+                            Date d = ((GregorianCalendar)min).getTime();
+                            min = DateUtils.getPatternedDateAmer(d);
+                        }
+                        
+                        if (max instanceof GregorianCalendar){
+                            Date d = ((GregorianCalendar)max).getTime();
+                            max = DateUtils.getPatternedDateAmer(d);
+                        }
+                        
+                        Element inputMinNode = xmlutilities.createXFormElement(document, "input");
+                        inputMinNode.setAttribute("ref", "minvalue");
+                        Element inputMinLableNode = xmlutilities.createXFormElement(document, "label");
+                        inputMinLableNode.setTextContent("minvalue");
+                        inputMinNode.appendChild(inputMinLableNode);
+                        
+                        Element inputMinValueNode = xmlutilities.createXFormElement(document, "value");
+                        inputMinValueNode.setTextContent(min.toString());
+                        inputMinNode.appendChild(inputMinValueNode);
+                        
+                        Element inputMaxNode = xmlutilities.createXFormElement(document, "input");
+                        inputMaxNode.setAttribute("ref", "maxvalue");
+                        Element inputMaxLableNode = xmlutilities.createXFormElement(document, "label");
+                        inputMaxLableNode.setTextContent("maxvalue");
+                        inputMaxNode.appendChild(inputMaxLableNode);
+                        
+                        Element inputMaxValueNode = xmlutilities.createXFormElement(document, "value");
+                        inputMaxValueNode.setTextContent(max.toString());
+                        inputMaxNode.appendChild(inputMaxValueNode);
+                        
+                        rootNode.appendChild(inputMinNode);
+                        rootNode.appendChild(inputMaxNode);
+                        
                     }
-                    selectNode.appendChild(lableNode);
-                    selectNode.appendChild(choiceNode);
-                    rootNode.appendChild(selectNode);
-                }else if (o instanceof MinMaxDescribeData){
-                    MinMaxDescribeData descibeData = (MinMaxDescribeData)o;
-                    Object min = descibeData.getMinValue();
-                    Object max = descibeData.getMaxValue();
-                    if (min instanceof GregorianCalendar){
-                        Date d = ((GregorianCalendar)min).getTime();
-                        min = DateUtils.getPatternedDateAmer(d);
-                    }
-                    
-                    if (max instanceof GregorianCalendar){
-                        Date d = ((GregorianCalendar)max).getTime();
-                        max = DateUtils.getPatternedDateAmer(d);
-                    }
-                    
-                    Element inputMinNode = xmlutilities.createXFormElement(document, "input");
-                    inputMinNode.setAttribute("ref", "minvalue");
-                    Element inputMinLableNode = xmlutilities.createXFormElement(document, "label");
-                    inputMinLableNode.setTextContent("minvalue");
-                    inputMinNode.appendChild(inputMinLableNode);
-                    
-                    Element inputMinValueNode = xmlutilities.createXFormElement(document, "value");
-                    inputMinValueNode.setTextContent(min.toString());
-                    inputMinNode.appendChild(inputMinValueNode);
-                    
-                    Element inputMaxNode = xmlutilities.createXFormElement(document, "input");
-                    inputMaxNode.setAttribute("ref", "maxvalue");
-                    Element inputMaxLableNode = xmlutilities.createXFormElement(document, "label");
-                    inputMaxLableNode.setTextContent("maxvalue");
-                    inputMaxNode.appendChild(inputMaxLableNode);
-                    
-                    Element inputMaxValueNode = xmlutilities.createXFormElement(document, "value");
-                    inputMaxValueNode.setTextContent(max.toString());
-                    inputMaxNode.appendChild(inputMaxValueNode);
-                    
-                    rootNode.appendChild(inputMinNode);
-                    rootNode.appendChild(inputMaxNode);
-                    
+    
                 }
-
             }
         }