--- a/gnv-artifacts/src/main/java/de/intevation/gnv/exports/DefaultExport.java	Mon Nov 09 08:55:01 2009 +0000
+++ b/gnv-artifacts/src/main/java/de/intevation/gnv/exports/DefaultExport.java	Mon Nov 09 09:43:52 2009 +0000
@@ -29,35 +29,25 @@
 {
     private static Logger log = Logger.getLogger(DefaultExport.class);
 
+    private Export.DataCollector collector;
+
+    public DefaultExport(Export.DataCollector collector) {
+        this.collector = collector;
+    }
+
     protected void writeData(
         Profile    profile, 
         Collection result,
         CSVWriter  writer
-    ) {
+    )
+    throws TransitionException {
         log.debug("create content for export.");
         Iterator<Result> it = result.iterator();
 
-        ResultDescriptor rd      = null;
-        int []           indices = null;
-
-        String[] entries = new String[profile.numberColumns()];
-
         while (it.hasNext()) {
             Result res = it.next();
 
-            if (rd == null) {
-                rd = res.getResultDescriptor();
-                String [] names = new String[entries.length];
-                for (int i = 0; i < names.length; ++i) {
-                    names[i] = profile.getHeader(i);
-                }
-                indices = rd.getColumnIndices(names);
-            }
-            for (int i = 0; i < entries.length; ++i) {
-                entries[i] = profile.toString(
-                    i, res.getString(indices[i]));
-            }
-            writer.writeNext(entries);
+            writer.writeNext(collector.getData(res));
         }
     }