From 87cf6a6cf8aed702bff5fea6b3680b32d490c2a3 Mon Sep 17 00:00:00 2001
From: Riegel <alexander.riegel@hft-stuttgart.de>
Date: Wed, 4 Dec 2024 11:35:42 +0100
Subject: [PATCH] Refactor: Extract EPSG-parsing error logger to method
---
.../citydoctor2/parser/CityGmlParser.java | 27 +++++++------------
1 file changed, 10 insertions(+), 17 deletions(-)
diff --git a/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/parser/CityGmlParser.java b/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/parser/CityGmlParser.java
index 2bfd26b..e5a1b3b 100644
--- a/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/parser/CityGmlParser.java
+++ b/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/parser/CityGmlParser.java
@@ -18,11 +18,7 @@
*/
package de.hft.stuttgart.citydoctor2.parser;
-import java.io.BufferedInputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
+import java.io.*;
import java.nio.charset.StandardCharsets;
import java.nio.file.Path;
import java.nio.file.Paths;
@@ -71,10 +67,7 @@ import org.locationtech.proj4j.CoordinateReferenceSystem;
import org.locationtech.proj4j.ProjCoordinate;
import org.locationtech.proj4j.proj.Projection;
import org.locationtech.proj4j.units.Units;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-import org.xml.sax.SAXNotRecognizedException;
-import org.xml.sax.SAXNotSupportedException;
+import org.xml.sax.*;
import org.xmlobjects.schema.SchemaHandler;
import org.xmlobjects.schema.SchemaHandlerException;
import org.xmlobjects.stream.XMLReader;
@@ -439,16 +432,16 @@ public class CityGmlParser {
try {
parseCoordinateSystem(config, handler);
} catch (Exception e2) {
- logger.debug("Exception while parsing for EPSG code", e2);
- if (logger.isWarnEnabled()) {
- logger.warn(Localization.getText("CityGmlParser.noEPSG"));
- }
+ logEpsgParseError(e2);
}
} catch (Exception e) {
- logger.debug("Exception while parsing for EPSG code", e);
- if (logger.isWarnEnabled()) {
- logger.warn(Localization.getText("CityGmlParser.noEPSG"));
- }
+ logEpsgParseError(e);
+ }
+ }
+ private static void logEpsgParseError(Exception e){
+ logger.debug("Exception while parsing for EPSG code", e);
+ if (logger.isWarnEnabled()) {
+ logger.warn(Localization.getText("CityGmlParser.noEPSG"));
}
}
--
GitLab