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
93a7af32
Commit
93a7af32
authored
3 months ago
by
Riegel
Browse files
Options
Download
Email Patches
Plain Diff
Fix: Correct ZipEntry name parsing
parent
313d0081
master
dev
dev_cpp_code_conversion
dev_gui_features_zip_loading
3.17.0
archive/dev_gui_features_zip_loading
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
CityDoctorParent/Extensions/CityDoctorZipLoader/src/main/java/de/hft/stuttgart/citydoctor2/ziploader/CityGmlZipEntry.java
+4
-4
.../hft/stuttgart/citydoctor2/ziploader/CityGmlZipEntry.java
with
4 additions
and
4 deletions
+4
-4
CityDoctorParent/Extensions/CityDoctorZipLoader/src/main/java/de/hft/stuttgart/citydoctor2/ziploader/CityGmlZipEntry.java
+
4
-
4
View file @
93a7af32
...
...
@@ -32,7 +32,7 @@ public class CityGmlZipEntry {
try
{
CityGmlParser
.
gagLogger
(
true
);
CityDoctorModel
model
=
CityGmlParser
.
parseCityGmlZipEntry
(
entry
,
archive
,
config
);
return
new
CityGmlZipEntry
(
entry
.
getName
()
,
model
);
return
new
CityGmlZipEntry
(
entry
,
model
);
}
catch
(
CityGmlParseException
|
InvalidGmlFileException
e
)
{
logger
.
error
(
e
);
return
new
ErroneousEntry
(
entry
,
ZipEntryErrorType
.
INVALID_CITY_GML_FILE
);
...
...
@@ -43,13 +43,13 @@ public class CityGmlZipEntry {
}
}
private
CityGmlZipEntry
(
String
filename
,
CityDoctorModel
model
){
this
.
fileName
=
filename
;
private
CityGmlZipEntry
(
ZipEntry
entry
,
CityDoctorModel
model
){
this
.
fileName
=
entry
.
getName
().
substring
(
entry
.
getName
().
lastIndexOf
(
'/'
)
+
1
)
;
this
.
model
=
model
;
}
protected
CityGmlZipEntry
(
ZipEntry
entry
)
{
this
.
fileName
=
entry
.
getName
();
this
.
fileName
=
entry
.
getName
()
.
substring
(
entry
.
getName
().
lastIndexOf
(
'/'
)
+
1
)
;
this
.
model
=
null
;
}
...
...
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