Commit a512cfac authored by Riegel's avatar Riegel
Browse files

Refactor: Added localized error message Strings

2 merge requests!28Version 3.17.0 Release,!26Add ZIP-archive support
Showing with 16 additions and 4 deletions
+16 -4
...@@ -2,6 +2,7 @@ package de.hft.stuttgart.citydoctor2.zip; ...@@ -2,6 +2,7 @@ package de.hft.stuttgart.citydoctor2.zip;
import de.hft.stuttgart.citydoctor2.parser.ParserConfiguration; import de.hft.stuttgart.citydoctor2.parser.ParserConfiguration;
import de.hft.stuttgart.citydoctor2.utils.ArchivePacker; import de.hft.stuttgart.citydoctor2.utils.ArchivePacker;
import de.hft.stuttgart.citydoctor2.utils.Localization;
import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.Logger;
...@@ -10,12 +11,10 @@ import java.io.FileInputStream; ...@@ -10,12 +11,10 @@ import java.io.FileInputStream;
import java.io.IOException; import java.io.IOException;
import java.io.Serial; import java.io.Serial;
import java.io.Serializable; import java.io.Serializable;
import java.nio.charset.MalformedInputException;
import java.nio.file.Path; import java.nio.file.Path;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.zip.ZipEntry; import java.util.zip.ZipEntry;
import java.util.zip.ZipException;
import java.util.zip.ZipFile; import java.util.zip.ZipFile;
import java.util.zip.ZipInputStream; import java.util.zip.ZipInputStream;
...@@ -47,10 +46,17 @@ public class CityGmlZipArchive implements Serializable { ...@@ -47,10 +46,17 @@ public class CityGmlZipArchive implements Serializable {
cgmlArchive.setEntries(archiveEntries); cgmlArchive.setEntries(archiveEntries);
return cgmlArchive; return cgmlArchive;
} catch (IOException e) { } catch (IOException e) {
logger.error("Encountered an IOError while registering CityGmlArchive", e); logger.error(Localization.getText("CityGmlZipArchive.ioError"));
logger.error(e.getMessage());
logger.debug(e);
return null;
} catch (IllegalArgumentException e) {
logger.error(Localization.getText("CityGmlZipArchive.malformedZipFile"));
return null; return null;
} catch (Exception e) { } catch (Exception e) {
logger.error("Encountered an unexpected error while registering CityGmlArchive", e); logger.error(Localization.getText("CityGmlZipArchive.generalException"));
logger.error(e.getMessage());
logger.debug(e);
return null; return null;
} }
} }
......
...@@ -121,6 +121,9 @@ ZipEntryManager.cancelBtn=Cancel ...@@ -121,6 +121,9 @@ ZipEntryManager.cancelBtn=Cancel
ZipEntryManager.unknownValue=N/A ZipEntryManager.unknownValue=N/A
ZipEntryManager.yes=Yes ZipEntryManager.yes=Yes
ZipEntryManager.no=No ZipEntryManager.no=No
CityGmlZipArchive.ioError=Accessing the ZIP archive failed
CityGmlZipArchive.malformedZipFile=Parsing of ZIP archive aborted, ZIP file is malformed!
CityGmlZipArchive.generalException=Encountered an unexpected error while reading the ZIP archive
WriteReportDialog.writeBtn=Save WriteReportDialog.writeBtn=Save
WriteReportDialog.cancelBtn=Cancel WriteReportDialog.cancelBtn=Cancel
WriteReportDialog.errorStatisticsLabel=Error Statistics WriteReportDialog.errorStatisticsLabel=Error Statistics
......
...@@ -119,6 +119,9 @@ ZipEntryManager.cancelBtn=Abbruch ...@@ -119,6 +119,9 @@ ZipEntryManager.cancelBtn=Abbruch
ZipEntryManager.unknownValue=Unbekannt ZipEntryManager.unknownValue=Unbekannt
ZipEntryManager.yes=Ja ZipEntryManager.yes=Ja
ZipEntryManager.no=Nein ZipEntryManager.no=Nein
CityGmlZipArchive.ioError=Zugriff auf ZIP-Datei fehlgeschlagen
CityGmlZipArchive.malformedZipFile=Einlesen des ZIP-Archivs abgebrochen, ZIP-Datei ist fehlerhaft!
CityGmlZipArchive.generalException=Unerwarteter Fehler beim Einlesen des ZIP-Archivs
WriteReportDialog.writeBtn=Speichern WriteReportDialog.writeBtn=Speichern
WriteReportDialog.cancelBtn=Abbrechen WriteReportDialog.cancelBtn=Abbrechen
WriteReportDialog.errorStatisticsLabel=Fehler Statistik WriteReportDialog.errorStatisticsLabel=Fehler Statistik
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment