[Dive4elements-commits] [PATCH] Backend: Added special ImportWstColumns for official lines. They have to be glued with the main values

[Wald Commits]

# HG changeset patch
# User Sascha L. Teichmann <teichmann at intevation.de>
# Date 1371221790 -7200
# Node ID aef238fdd9b6194d73ee9a1085d18b4d521af333
# Parent  224d7c4b5291f6961eaf4376ce6a10c262b83ab9
Backend: Added special ImportWstColumns for official lines. They have to be glued with the main values.

diff -r 224d7c4b5291 -r aef238fdd9b6 backend/src/main/java/org/dive4elements/river/importer/ImportOfficialWstColumn.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/backend/src/main/java/org/dive4elements/river/importer/ImportOfficialWstColumn.java	Fri Jun 14 16:56:30 2013 +0200
@@ -0,0 +1,35 @@
+/* Copyright (C) 2011, 2012, 2013 by Bundesanstalt für Gewässerkunde
+ * Software engineering by Intevation GmbH
+ *
+ * This file is Free Software under the GNU AGPL (>=v3)
+ * and comes with ABSOLUTELY NO WARRANTY! Check out the
+ * documentation coming with Dive4Elements River for details.
+ */
+
+package org.dive4elements.river.importer;
+
+public class ImportOfficialWstColumn
+extends      ImportWstColumn
+{
+    public static final ImportWst.ImportWstColumnFactory COLUMN_FACTORY =
+        new ImportWst.ImportWstColumnFactory() {
+            @Override
+            public ImportWstColumn create(ImportWst importWst, int position) {
+                return new ImportOfficialWstColumn(importWst, null, null, position);
+            }
+        };
+
+    public ImportOfficialWstColumn() {
+        super();
+    }
+
+    public ImportOfficialWstColumn(
+        ImportWst wst,
+        String    name,
+        String    description,
+        Integer   position
+    ) {
+        super(wst, name, description, position);
+    }
+}
+// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 :
diff -r 224d7c4b5291 -r aef238fdd9b6 backend/src/main/java/org/dive4elements/river/importer/ImportRiver.java
--- a/backend/src/main/java/org/dive4elements/river/importer/ImportRiver.java	Fri Jun 14 16:11:49 2013 +0200
+++ b/backend/src/main/java/org/dive4elements/river/importer/ImportRiver.java	Fri Jun 14 16:56:30 2013 +0200
@@ -792,7 +792,7 @@
             }
             log.debug("Found WST file: " + file);
 
-            ImportWst iw = new ImportWst();
+            ImportWst iw = new ImportWst(ImportOfficialWstColumn.COLUMN_FACTORY);
 
             WstParser wstParser = new WstParser(iw);
             wstParser.parse(file);