diff flys-backend/src/main/java/de/intevation/flys/importer/ImportWst.java @ 474:5d920695a7f0

Import of q ranges of wst files was totally broken. flys-backend/trunk@1715 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author Sascha L. Teichmann <sascha.teichmann@intevation.de>
date Mon, 18 Apr 2011 11:06:08 +0000
parents 3570e4af8cb2
children db430bd9e0e0
line wrap: on
line diff
--- a/flys-backend/src/main/java/de/intevation/flys/importer/ImportWst.java	Mon Apr 18 08:15:32 2011 +0000
+++ b/flys-backend/src/main/java/de/intevation/flys/importer/ImportWst.java	Mon Apr 18 11:06:08 2011 +0000
@@ -8,7 +8,7 @@
 
 import java.util.List;
 import java.util.Map;
-import java.util.HashMap;
+import java.util.ArrayList;
 
 public class ImportWst
 {
@@ -16,13 +16,14 @@
 
     protected Integer kind;
 
-    protected Map<String, ImportWstColumn> columns;
+    //protected Map<String, ImportWstColumn> columns;
+    protected List<ImportWstColumn> columns;
 
     protected Wst peer;
 
     public ImportWst() {
         kind = 0;
-        columns = new HashMap<String, ImportWstColumn>();
+        columns = new ArrayList<ImportWstColumn>();
     }
 
     public ImportWst(String description) {
@@ -38,19 +39,24 @@
         this.description = description;
     }
 
-    public ImportWstColumn getColumn(String name) {
-        ImportWstColumn column = columns.get(name);
-        if (column == null) {
-            column = new ImportWstColumn(this, name, null, columns.size());
-            columns.put(name, column);
+    public void setNumberColumns(int numColumns) {
+        for (int i = 0; i < numColumns; ++i) {
+            columns.add(new ImportWstColumn(this, null, null, i));
         }
-        return column;
+    }
+
+    public int getNumberColumns() {
+        return columns.size();
+    }
+
+    public ImportWstColumn getColumn(int index) {
+        return columns.get(index);
     }
 
     public void storeDependencies(River river) {
         Wst wst = getPeer(river);
 
-        for (ImportWstColumn column: columns.values()) {
+        for (ImportWstColumn column: columns) {
             column.storeDependencies(river);
         }
     }

http://dive4elements.wald.intevation.org