diff flys-backend/src/main/java/de/intevation/flys/importer/ImportRiver.java @ 766:aa9e3da95c31

Importer: Fix import of annotation type classification. flys-backend/trunk@2163 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author Sascha L. Teichmann <sascha.teichmann@intevation.de>
date Sun, 19 Jun 2011 17:43:38 +0000
parents 763c4137d6e1
children 22858e7cca79
line wrap: on
line diff
--- a/flys-backend/src/main/java/de/intevation/flys/importer/ImportRiver.java	Sun Jun 19 12:26:12 2011 +0000
+++ b/flys-backend/src/main/java/de/intevation/flys/importer/ImportRiver.java	Sun Jun 19 17:43:38 2011 +0000
@@ -65,23 +65,24 @@
     protected River peer;
 
     public ImportRiver() {
-        this(null);
-    }
-
-    public ImportRiver(AnnotationClassifier annotationClassifier) {
         extraWsts       = new ArrayList<ImportWst>();
         fixations       = new ArrayList<ImportWst>();
         officialLines   = new ArrayList<ImportWst>();
         floodWater      = new ArrayList<ImportWst>();
         floodProtection = new ArrayList<ImportWst>();
-        this.annotationClassifier = annotationClassifier;
     }
 
-    public ImportRiver(String name, File wstFile, File bbInfoFile) {
+    public ImportRiver(
+        String               name,
+        File                 wstFile,
+        File                 bbInfoFile,
+        AnnotationClassifier annotationClassifier
+    ) {
         this();
-        this.name       = name;
-        this.wstFile    = wstFile;
-        this.bbInfoFile = bbInfoFile;
+        this.name                 = name;
+        this.wstFile              = wstFile;
+        this.bbInfoFile           = bbInfoFile;
+        this.annotationClassifier = annotationClassifier;
     }
 
     public String getName() {

http://dive4elements.wald.intevation.org