diff flys-backend/src/main/java/de/intevation/flys/importer/ImportRiver.java @ 765:763c4137d6e1

Added classification of annotation types. Needs testing! flys-backend/trunk@2162 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author Sascha L. Teichmann <sascha.teichmann@intevation.de>
date Sun, 19 Jun 2011 12:26:12 +0000
parents bcc18293a547
children aa9e3da95c31
line wrap: on
line diff
--- a/flys-backend/src/main/java/de/intevation/flys/importer/ImportRiver.java	Sat Jun 18 20:13:31 2011 +0000
+++ b/flys-backend/src/main/java/de/intevation/flys/importer/ImportRiver.java	Sun Jun 19 12:26:12 2011 +0000
@@ -60,14 +60,21 @@
 
     protected ImportWst wst;
 
+    protected AnnotationClassifier annotationClassifier;
+
     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) {
@@ -330,7 +337,8 @@
 
     public void parseAnnotations() throws IOException {
         File riverDir = wstFile.getParentFile().getParentFile();
-        AnnotationsParser aparser = new AnnotationsParser();
+        AnnotationsParser aparser =
+            new AnnotationsParser(annotationClassifier);
         aparser.parse(riverDir);
 
         annotations = aparser.getAnnotations();

http://dive4elements.wald.intevation.org