[PATCH 3 of 3] Changed a few import paths

[Wald Commits]

# HG changeset patch
# User mschaefer
# Date 1523371462 -7200
# Node ID d046997281bc8c13d7a770fea3f442b425a46bff
# Parent  c43d8c1a44559efd72ac0d30558ead3b9086a1f8
Changed a few import paths

diff -r c43d8c1a4455 -r d046997281bc backend/src/main/java/org/dive4elements/river/importer/sinfo/SInfoImporter.java
--- 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");
         }
diff -r c43d8c1a4455 -r d046997281bc backend/src/main/java/org/dive4elements/river/importer/uinfo/UInfoImporter.java
--- 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;