Skip to content
GitLab
Explore
Projects
Groups
Snippets
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
CityDoctor
CityDoctor2
Commits
a512cfac
Commit
a512cfac
authored
2 months ago
by
Riegel
Browse files
Options
Download
Email Patches
Plain Diff
Refactor: Added localized error message Strings
parent
b7304ed1
master
dev
dev_gui_features_zip_loading
3.17.0
archive/dev_gui_features_zip_loading
2 merge requests
!28
Version 3.17.0 Release
,
!26
Add ZIP-archive support
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/zip/CityGmlZipArchive.java
+10
-4
...a/de/hft/stuttgart/citydoctor2/zip/CityGmlZipArchive.java
CityDoctorParent/CityDoctorModel/src/main/resources/CityDoctorLocalization.properties
+3
-0
...odel/src/main/resources/CityDoctorLocalization.properties
CityDoctorParent/CityDoctorModel/src/main/resources/CityDoctorLocalization_de.properties
+3
-0
...l/src/main/resources/CityDoctorLocalization_de.properties
with
16 additions
and
4 deletions
+16
-4
CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/zip/CityGmlZipArchive.java
+
10
-
4
View file @
a512cfac
...
...
@@ -2,6 +2,7 @@ package de.hft.stuttgart.citydoctor2.zip;
import
de.hft.stuttgart.citydoctor2.parser.ParserConfiguration
;
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.Logger
;
...
...
@@ -10,12 +11,10 @@ import java.io.FileInputStream;
import
java.io.IOException
;
import
java.io.Serial
;
import
java.io.Serializable
;
import
java.nio.charset.MalformedInputException
;
import
java.nio.file.Path
;
import
java.util.ArrayList
;
import
java.util.List
;
import
java.util.zip.ZipEntry
;
import
java.util.zip.ZipException
;
import
java.util.zip.ZipFile
;
import
java.util.zip.ZipInputStream
;
...
...
@@ -47,10 +46,17 @@ public class CityGmlZipArchive implements Serializable {
cgmlArchive
.
setEntries
(
archiveEntries
);
return
cgmlArchive
;
}
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
;
}
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
;
}
}
...
...
This diff is collapsed.
Click to expand it.
CityDoctorParent/CityDoctorModel/src/main/resources/CityDoctorLocalization.properties
+
3
-
0
View file @
a512cfac
...
...
@@ -121,6 +121,9 @@ ZipEntryManager.cancelBtn=Cancel
ZipEntryManager.unknownValue
=
N/A
ZipEntryManager.yes
=
Yes
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.cancelBtn
=
Cancel
WriteReportDialog.errorStatisticsLabel
=
Error Statistics
...
...
This diff is collapsed.
Click to expand it.
CityDoctorParent/CityDoctorModel/src/main/resources/CityDoctorLocalization_de.properties
+
3
-
0
View file @
a512cfac
...
...
@@ -119,6 +119,9 @@ ZipEntryManager.cancelBtn=Abbruch
ZipEntryManager.unknownValue
=
Unbekannt
ZipEntryManager.yes
=
Ja
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.cancelBtn
=
Abbrechen
WriteReportDialog.errorStatisticsLabel
=
Fehler Statistik
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment
Menu
Explore
Projects
Groups
Snippets