--- a/backend/src/main/java/org/dive4elements/river/importer/parsers/InfoGewParser.java	Wed Dec 04 16:59:25 2019 +0100
+++ b/backend/src/main/java/org/dive4elements/river/importer/parsers/InfoGewParser.java	Mon Mar 23 14:57:03 2020 +0100
@@ -9,22 +9,16 @@
 package org.dive4elements.river.importer.parsers;
 
 import java.io.File;
-
-import java.util.List;
-import java.util.ArrayList;
-
-import java.util.regex.Pattern;
-import java.util.regex.Matcher;
-
-import java.io.IOException;
-import java.io.LineNumberReader;
 import java.io.FileInputStream;
 import java.io.InputStreamReader;
+import java.io.LineNumberReader;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 import org.apache.log4j.Logger;
-
 import org.dive4elements.artifacts.common.utils.FileTools;
-
 import org.dive4elements.river.importer.ImportRiver;
 
 
@@ -36,16 +30,16 @@
     public static final String ENCODING = "ISO-8859-1";
 
     public static final Pattern GEWAESSER =
-        Pattern.compile("^\\s*Gew\u00e4sser\\s*:\\s*(.+)");
+            Pattern.compile("^\\s*Gew\u00e4sser\\s*:\\s*(.+)");
 
     public static final Pattern WST_DATEI =
-        Pattern.compile("^\\s*WSTDatei\\s*:\\s*(.+)");
+            Pattern.compile("^\\s*WSTDatei\\s*:\\s*(.+)");
 
     public static final Pattern BB_INFO =
-        Pattern.compile("^\\s*B\\+B-Info\\s*:\\s*(.+)");
+            Pattern.compile("^\\s*B\\+B-Info\\s*:\\s*(.+)");
 
     public static final Pattern GEW_UUID =
-        Pattern.compile("^\\s*uuid\\s*:\\s*(.+)");
+            Pattern.compile("^\\s*uuid\\s*:\\s*(.+)");
 
     protected ArrayList<ImportRiver> rivers;
 
@@ -55,31 +49,31 @@
         this(null);
     }
 
-    public InfoGewParser(AnnotationClassifier annotationClassifier) {
-        rivers = new ArrayList<ImportRiver>();
+    public InfoGewParser(final AnnotationClassifier annotationClassifier) {
+        this.rivers = new ArrayList<>();
         this.annotationClassifier = annotationClassifier;
     }
 
     public List<ImportRiver> getRivers() {
-        return rivers;
+        return this.rivers;
     }
 
-    public static final String normalize(String f) {
+    public static final String normalize(final String f) {
         return f.replace("\\", "/").replace("/", File.separator);
     }
 
     /** Handle a gew, wst, or bb_info file. */
-    public void parse(File file) throws IOException {
+    public void parse(final File file) throws Exception {
 
         LineNumberReader in = null;
 
-        File root = file.getParentFile();
+        final File root = file.getParentFile();
 
         try {
             in =
-                new LineNumberReader(
-                new InputStreamReader(
-                new FileInputStream(file), ENCODING));
+                    new LineNumberReader(
+                            new InputStreamReader(
+                                    new FileInputStream(file), ENCODING));
 
             String line = null;
 
@@ -95,15 +89,15 @@
                 Matcher m = GEWAESSER.matcher(line);
 
                 if (m.matches()) {
-                    String river = m.group(1);
+                    final String river = m.group(1);
                     log.info("Found river '" + river + "'");
                     if (riverName != null) {
-                        rivers.add(new ImportRiver(
-                            riverName,
-                            modelUuid,
-                            wstFile,
-                            bbInfoFile,
-                            annotationClassifier));
+                        this.rivers.add(new ImportRiver(
+                                riverName,
+                                modelUuid,
+                                wstFile,
+                                bbInfoFile,
+                                this.annotationClassifier));
                     }
                     riverName  = river;
                     modelUuid  = null;
@@ -119,7 +113,7 @@
                     wst = FileTools.repair(wst);
                     if (!wst.isFile() || !wst.canRead()) {
                         log.error(
-                            "cannot access WST file '" + wstFilename + "'");
+                                "cannot access WST file '" + wstFilename + "'");
                         continue;
                     }
                     log.info("Found wst file '" + wst + "'");
@@ -128,21 +122,21 @@
                 else if ((m = GEW_UUID.matcher(line)).matches()) {
                     modelUuid = m.group(1);
                     log.debug("Found model uuid " + modelUuid +
-                        " for river " + riverName);
+                            " for river " + riverName);
                 }
                 else if ((m = BB_INFO.matcher(line)).matches()) {
                     //TODO: Make it relative to the wst file.
-                    String bbInfo = m.group(1);
+                    final String bbInfo = m.group(1);
                     bbInfoFile = new File(normalize(bbInfo));
                 }
             }
             if (riverName != null && wstFile != null) {
-                rivers.add(new ImportRiver(
-                    riverName,
-                    modelUuid,
-                    wstFile,
-                    bbInfoFile,
-                    annotationClassifier));
+                this.rivers.add(new ImportRiver(
+                        riverName,
+                        modelUuid,
+                        wstFile,
+                        bbInfoFile,
+                        this.annotationClassifier));
             }
         }
         finally {
@@ -151,7 +145,7 @@
             }
         }
 
-        for (ImportRiver river: rivers) {
+        for (final ImportRiver river: this.rivers) {
             river.parseDependencies();
         }
     }