Refactor: Localize log messages

CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/database/DatabaseSettings.java

 package de.hft.stuttgart.citydoctor2.database;
 
+import de.hft.stuttgart.citydoctor2.utils.Localization;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
@@ -30,18 +31,12 @@ public final class DatabaseSettings {
                 logger.error("Failed to load database settings", e);
             }
         }
-//        props.setProperty("name","cd_db");
-//        props.setProperty("directory","/database/");
-//        props.setProperty("poolSize","10");
-//        props.setProperty("inMemoryMode","false");
-//        props.setProperty("attemptFallback","true");
-//        props.setProperty("debugMode","false");
     }
 
     public static EmbeddedDatabaseConfiguration getConfig() {
         EmbeddedDatabaseConfiguration defaultConfig = new EmbeddedDatabaseConfiguration();
         if (props.isEmpty()) {
-            logger.debug("No database settings found, using default configuration");
+            logger.debug("No database settings found or specified, using default config");
             return defaultConfig;
         }
         String name = props.getProperty("database.name");
@@ -81,8 +76,7 @@ public final class DatabaseSettings {
         } catch (InvalidPathException e) {
             if (!inMemoryMode) {
                 // Only warn if in-memory mode is not being used
-                //TODO: Localize String
-                logger.warn("Properties for directory and name do not form a valid path, using default values");
+                logger.warn(Localization.getText("DatabaseSettings.invalidPath"));
                 name = defaultConfig.databaseName();
                 directory = defaultConfig.databaseDirectory();
             }

CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/mapper/citygml3/Citygml3FeatureMapper.java

@@ -207,6 +207,7 @@ public class Citygml3FeatureMapper extends ObjectWalker {
 			return;
 		}
 		boolean xLinkGlobalError = false;
+		String emptyXLinkLog = Localization.getText("CityGmlFeatureMapper.emptyCrossFeatureReference");
 		List<String> crossRefs = new ArrayList<>();
 		for (Map.Entry<String, List<GmlId>> entry : unresolvedPolyRefIDMap.entrySet()) {
 			String id = entry.getKey();
@@ -217,18 +218,16 @@ public class Citygml3FeatureMapper extends ObjectWalker {
 				StringJoiner joiner = new StringJoiner(", ");
 				gmlIds.forEach(gmlId -> joiner.add(gmlId.toString()));
 				GmlId crossFeatureId = parsedPolygonsIdMap.get(id);
-				//TODO: Localize String
-				logger.warn("Polygon {} of Feature {} is being referenced in other Features: {}", id, crossFeatureId, joiner);
+				logger.warn(emptyXLinkLog, id, crossFeatureId, joiner);
 				crossRefs.add(id);
 			}
 		}
 		if (xLinkGlobalError) {
-			//TODO: Localize String
-			logger.warn("Model has Features containing cross-feature references without their own copies of the referenced polygons");
+			logger.warn(Localization.getText("CityGmlFeatureMapper.crossFeatureReferencesDetected"));
 		}
 		crossRefs.forEach(unresolvedPolyRefIDMap::remove);
 		if(!unresolvedPolyRefIDMap.isEmpty()) {
-			logger.warn("Model contains polygon references that could not be found");
+			logger.warn(Localization.getText("CityGmlFeatureMapper.unresolvedReferencesDetected"));
 		}
 	}
 

CityDoctorParent/CityDoctorModel/src/main/resources/CityDoctorLocalization.properties

@@ -70,6 +70,9 @@ CityDoctorValidation.notExactlyOneOutputFile=Specify exactly one file as output.
 CityDoctorValidation.notExactlyOnePDFOutput=Specify exactly one file as pdfReport
 CityDoctorValidation.notExactlyOneXMLOutput=Specify exactly one file as xmlReport
 CityDoctorValidation.wrongInputFileFormat=Input file '{}' does not end with .gml or .xml
+CityGmlFeatureMapper.crossFeatureReferencesDetected=Model has Features containing cross-feature references without their own copies of the referenced polygons
+CityGmlFeatureMapper.emptyCrossFeatureReference=Polygon {} of Feature {} is being referenced in other Features: {}
+CityGmlFeatureMapper.unresolvedReferencesDetected=Model contains polygon references that could not be found
 CityGmlParser.chunkReadFailed=Failed to read GML file in chunks, falling back to reading the complete file
 CityGmlParser.convertCrsToUtmZoneN=Converting coordinate system to UTM zone {}N
 CityGmlParser.convertCrsToUtmZoneS=Converting coordinate system to UTM zone {}S
@@ -99,6 +102,9 @@ DatabaseHandler.serializationFailure=Serialization of CityObject {} failed!
 DatabaseHandler.setupFailure=FATAL ERROR: Creation of embedded database failed!
 DatabaseHandler.tableFailure=FATAL ERROR: Creation of features table failed!
 DatabaseHandler.unmarshallingFailure=Loading of CityObject {} from embedded database failed!
+DatabaseSettings.invalidPath=Properties for database directory and name do not combine to a valid path. Using default value instead
+DatabaseSettings.poolSizeLessThanOne=ConnectionPoolSize property was set to be less than 1. Using default value instead
+DatabaseSettings.poolSizeNaN=ConnectionPoolSize property is not an integer. Using default value instead
 DistanceError.distanceFromPlane=distance from plane
 ErrorItemVisitor.childId=Child id
 ErrorItemVisitor.component=Component

CityDoctorParent/CityDoctorModel/src/main/resources/CityDoctorLocalization_de.properties

@@ -70,6 +70,9 @@ CityDoctorValidation.notExactlyOneOutputFile=Es muss exakt ein Ausgabedateipfad
 CityDoctorValidation.notExactlyOnePDFOutput=Es muss exakt ein Ausgabedateipfad f\u00fcr den PDF-Bericht angegeben werden.
 CityDoctorValidation.notExactlyOneXMLOutput=Es muss exakt ein Ausgabedateipfad f\u00fcr den XML-Bericht angegeben werden.
 CityDoctorValidation.wrongInputFileFormat=Eingabedatei '{}' ist keine .gml oder .xml Datei.
+CityGmlFeatureMapper.crossFeatureReferencesDetected=Modell enth\u00e4lt Features mit Feature\u00fcbergreifenden Polygonreferenzen ohne eigene Duplikate
+CityGmlFeatureMapper.emptyCrossFeatureReference=Polygon {} in Feature {} wird Feature\u00fcbergreifend referenziert durch Features: {}
+CityGmlFeatureMapper.unresolvedReferencesDetected=Modell enth\u00e4lt Features mit Polygonreferenzen welche nicht aufgel\u00f6st werden konnten
 CityGmlParser.chunkReadFailed=Konnte Datei nicht in St\u00fccken lesen, versuche komplett zu lesen
 CityGmlParser.convertCrsToUtmZoneN=Konvertiere Koordinatensystem zu UTM Zone {}N
 CityGmlParser.convertCrsToUtmZoneS=Konvertiere Koordinatensystem zu UTM Zone {}S
@@ -99,6 +102,9 @@ DatabaseHandler.serializationFailure=Serialisierung des CityObject {} fehlgeschl
 DatabaseHandler.setupFailure=KRITISCHER FEHLER: Erstellen der eingebetteten Datenbank fehlgeschlagen!
 DatabaseHandler.tableFailure=KRITISCHER FEHLER: Erstellen der "features" Tabelle fehlgeschlagen!
 DatabaseHandler.unmarshallingFailure=Laden des CityObject {} aus der Datenbank fehlgeschlagen!
+DatabaseSettings.invalidPath=Einstellungen f\u00fcr Directory und Name der Datenbank bilden keinen validen Pfad. Standardwerte werden stattdessen genutzt
+DatabaseSettings.poolSizeLessThanOne=ConnectionPoolSize Einstellung wurde auf unter 1 gesetzt. Standardwert wird stattdessen genutzt
+DatabaseSettings.poolSizeNaN=ConnectionPoolSize Einstellung ist kein Integer. Standardwert wird stattdessen genutzt
 DistanceError.distanceFromPlane=Abstand von der Ebene
 ErrorItemVisitor.childId=Kind ID
 ErrorItemVisitor.component=Komponente