--- a/gnv-artifacts/src/main/java/de/intevation/gnv/transition/timeseries/TimeSeriesOutputTransition.java	Thu Sep 17 14:25:24 2009 +0000
+++ b/gnv-artifacts/src/main/java/de/intevation/gnv/transition/timeseries/TimeSeriesOutputTransition.java	Mon Sep 21 11:50:47 2009 +0000
@@ -20,6 +20,7 @@
 import de.intevation.gnv.geobackend.base.Result;
 import de.intevation.gnv.transition.OutputTransitionBase;
 import de.intevation.gnv.transition.describedata.KeyValueDescibeData;
+import de.intevation.gnv.transition.describedata.NamedCollection;
 import de.intevation.gnv.transition.exception.TransitionException;
 
 /**
@@ -53,7 +54,7 @@
     public void out(String outputMode, OutputStream outputStream) throws TransitionException {
         log.debug("TimeSeriesOutputTransition");
         try {
-            this.advance(); // TODO nur neu holen wenn hash auf chartResult sich geändert hat
+            this.advance(); // TODO nur neu holen wenn hash auf chartResult sich ge�ndert hat
             ChartFactory chartFactory = new ChartFactory();
             
             Collection<KeyValueDescibeData> parameters = this.getParameters();
@@ -93,28 +94,31 @@
     
     protected Collection<KeyValueDescibeData> getParameters(){
         Iterator<Object> it = this.descibeData.iterator();
-        int i = 0;
+        
         while (it.hasNext()){
            
            Object o = it.next();
-           if (i == 1){ // TODO über Identifier arbeiten This is just a hack
-               return (Collection)o;
+           if (o instanceof NamedCollection<?>){
+               NamedCollection<KeyValueDescibeData> nc = (NamedCollection<KeyValueDescibeData>)o;
+               if (nc.getName().equals("parameterid")){ // TODO: konfigurierbar machen.
+                   return nc;
+               }
            }
-           i++;
         }
         return null;
     }
     
     protected Collection<KeyValueDescibeData> getMeasurements(){
         Iterator<Object> it = this.descibeData.iterator();
-        int i = 0;
         while (it.hasNext()){
            
            Object o = it.next();
-           if (i == 2){ // TODO über Identifier arbeiten This is just a hack
-               return (Collection)o;
+           if (o instanceof NamedCollection<?>){
+               NamedCollection<KeyValueDescibeData> nc = (NamedCollection<KeyValueDescibeData>)o;
+               if (nc.getName().equals("measurementid")){ // TODO: konfigurierbar machen.
+                   return nc;
+               }
            }
-           i++;
         }
         return null;
     }