Mercurial > dive4elements > river
changeset 8992:d046997281bc
Changed a few import paths
| author | mschaefer |
|---|---|
| date | Tue, 10 Apr 2018 16:44:22 +0200 |
| parents | c43d8c1a4455 |
| children | 2bb38e25091b |
| files | backend/src/main/java/org/dive4elements/river/importer/sinfo/SInfoImporter.java backend/src/main/java/org/dive4elements/river/importer/uinfo/UInfoImporter.java |
| diffstat | 2 files changed, 2 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/backend/src/main/java/org/dive4elements/river/importer/sinfo/SInfoImporter.java Tue Apr 10 16:43:32 2018 +0200 +++ b/backend/src/main/java/org/dive4elements/river/importer/sinfo/SInfoImporter.java Tue Apr 10 16:44:22 2018 +0200 @@ -48,9 +48,8 @@ BASICS("Basisdaten"), // SELECTED_ADDITIONAL("Selektierte_Zusaetzliche_Laengsschnitte"), // INFRASTRUCTURE("Infrastrukturen_BWaStr"), // - CHANNEL("Fahrrinnenverhaeltnisse"), // + CHANNEL("Zu_gewaehrleistende_Fahrrinnenverhaeltnisse"), // COLLISION_EINZEL("Grundberuehrungen" + File.separator + "Einzeljahre"), // - COLLISION_EPOCHE("Grundberuehrungen" + File.separator + "Epoche"), // TKH_EINZEL("Transportkoerperhoehen" + File.separator + "Einzeljahre"), // TKH_EPOCHE("Transportkoerperhoehen" + File.separator + "Epochen"), // TKH_MODELL("Transportkoerperhoehen" + File.separator + "Modellergebnisse"), // @@ -136,8 +135,6 @@ boolean added = false; added = this.parsers.addAll(CollisionParser.createParsers(SInfoDirName.COLLISION_EINZEL.buildPath(this.rootDir), SInfoDirName.COLLISION_EINZEL.getFile(), river)); - added |= this.parsers.addAll(CollisionParser.createParsers(SInfoDirName.COLLISION_EPOCHE.buildPath(this.rootDir), - SInfoDirName.COLLISION_EPOCHE.getFile(), river)); if (!added) log.info("Collision: no files found"); }
--- a/backend/src/main/java/org/dive4elements/river/importer/uinfo/UInfoImporter.java Tue Apr 10 16:43:32 2018 +0200 +++ b/backend/src/main/java/org/dive4elements/river/importer/uinfo/UInfoImporter.java Tue Apr 10 16:44:22 2018 +0200 @@ -38,7 +38,7 @@ private enum UInfoDirName { BASICS("Basisdaten"), // - SALIX("Salix-Linie_Fluss-Aue-Konnektivitaet" + File.separator + "Salix-Linie"); + SALIX("Salix-Linie" + File.separator + "Salix-Linie"); private final String dirname;