Mercurial > dive4elements > river
changeset 6339:aef238fdd9b6
Backend: Added special ImportWstColumns for official lines. They have to be glued with the main values.
| author | Sascha L. Teichmann <teichmann@intevation.de> |
|---|---|
| date | Fri, 14 Jun 2013 16:56:30 +0200 |
| parents | 224d7c4b5291 |
| children | fbe2d4c2b2dd |
| files | backend/src/main/java/org/dive4elements/river/importer/ImportOfficialWstColumn.java backend/src/main/java/org/dive4elements/river/importer/ImportRiver.java |
| diffstat | 2 files changed, 36 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- /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 :
--- 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);