From 3fd5502f03765413f2fdf046f4d4c3f4c47a5e06 Mon Sep 17 00:00:00 2001 From: Riegel Date: Fri, 14 Feb 2025 11:03:48 +0100 Subject: [PATCH] Style: Rename function --- .../stuttgart/citydoctor2/datastructure/LibraryObject.java | 4 ++-- .../citydoctor2/mapper/citygml3/Citygml3FeatureMapper.java | 2 +- .../de/hft/stuttgart/citydoctor2/utils/ArchivePacker.java | 2 +- .../hft/stuttgart/citydoctor2/zip/CityGmlZipArchive.java | 2 +- .../de/hft/stuttgart/citydoctor2/zip/CityGmlZipEntry.java | 7 ++++++- .../hft/stuttgart/citydoctor2/zip/CityGmlZipEntryFile.java | 2 +- .../java/de/hft/stuttgart/citydoctor2/zip/ZipTest.java | 2 +- .../java/de/hft/stuttgart/citydoctor2/check/Checker.java | 2 +- .../stuttgart/citydoctor2/gui/CityDoctorController.java | 2 +- .../de/hft/stuttgart/citydoctor2/gui/ZipEntryManager.java | 3 +-- 10 files changed, 16 insertions(+), 12 deletions(-) diff --git a/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/LibraryObject.java b/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/LibraryObject.java index 76040ea3..478747fe 100644 --- a/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/LibraryObject.java +++ b/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/LibraryObject.java @@ -43,7 +43,7 @@ public class LibraryObject extends Geometry { } public static LibraryObject of(CityGmlZipEntry entry, ParserConfiguration config) { - String fileName = entry.getFullFileName(); + String fileName = entry.getEntrySubPath(); if (libraryObjects.containsKey(fileName)){ return libraryObjects.get(fileName); } @@ -90,7 +90,7 @@ public class LibraryObject extends Geometry { logger.error(e.getStackTrace()); } catch (CityGmlParseException e) { logger.error(String.format( - "Encountered an error while parsing library object %s", entry.getFullFileName())); + "Encountered an error while parsing library object %s", entry.getEntrySubPath())); logger.error(e.getStackTrace()); } return geo; diff --git a/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/mapper/citygml3/Citygml3FeatureMapper.java b/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/mapper/citygml3/Citygml3FeatureMapper.java index a31ca18c..81ea998a 100644 --- a/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/mapper/citygml3/Citygml3FeatureMapper.java +++ b/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/mapper/citygml3/Citygml3FeatureMapper.java @@ -96,7 +96,7 @@ public class Citygml3FeatureMapper extends ObjectWalker { this.config = config; this.directory = null; this.zipEntry = entry; - model = new CityDoctorModel(config, Path.of(entry.getFullFileName()).toFile()); + model = new CityDoctorModel(config, Path.of(entry.getEntrySubPath()).toFile()); neighborDistance = 1.8d / Math.pow(10, config.getNumberOfRoundingPlaces()); } diff --git a/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/utils/ArchivePacker.java b/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/utils/ArchivePacker.java index 024a2d7d..7286723b 100644 --- a/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/utils/ArchivePacker.java +++ b/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/utils/ArchivePacker.java @@ -34,7 +34,7 @@ public class ArchivePacker { continue; } CityDoctorModel model = entry.getModel(); - Path filePath = tmpDir.resolve(entry.getFullFileName()); + Path filePath = tmpDir.resolve(entry.getEntrySubPath()); Files.createDirectories(filePath.getParent()); model.saveAs(filePath.toString(), model.isValidated()); } diff --git a/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/zip/CityGmlZipArchive.java b/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/zip/CityGmlZipArchive.java index 03b6b1c2..0fdf8aa5 100644 --- a/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/zip/CityGmlZipArchive.java +++ b/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/zip/CityGmlZipArchive.java @@ -90,7 +90,7 @@ public class CityGmlZipArchive implements Serializable { public CityGmlZipEntry getEntry(String fileName) { fileName = stripArchivePath(fileName); for (CityGmlZipEntry entry : entries) { - String entryName = stripArchivePath(entry.getFullFileName()); + String entryName = stripArchivePath(entry.getEntrySubPath()); if (entryName.equals(fileName)) { return entry; } diff --git a/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/zip/CityGmlZipEntry.java b/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/zip/CityGmlZipEntry.java index 2af0e376..c27b47d3 100644 --- a/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/zip/CityGmlZipEntry.java +++ b/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/zip/CityGmlZipEntry.java @@ -111,7 +111,12 @@ public class CityGmlZipEntry implements Serializable { return parentArchive; } - public String getFullFileName() { + /** + * Gets this entry's sub-path in the archive. + * + * @return Relative sub-path from the archive root directory. + */ + public String getEntrySubPath() { return fileName; } diff --git a/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/zip/CityGmlZipEntryFile.java b/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/zip/CityGmlZipEntryFile.java index 4797a206..2d4e77b9 100644 --- a/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/zip/CityGmlZipEntryFile.java +++ b/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/zip/CityGmlZipEntryFile.java @@ -16,7 +16,7 @@ public class CityGmlZipEntryFile implements AutoCloseable { public CityGmlZipEntryFile(CityGmlZipEntry entry) throws IOException { CityGmlZipArchive archive = entry.getArchive(); zip = new ZipFile(archive.getArchivePath().toFile()); - zipEntry = zip.getEntry(entry.getFullFileName()); + zipEntry = zip.getEntry(entry.getEntrySubPath()); this.cgmlZipEntry = entry; } diff --git a/CityDoctorParent/CityDoctorModel/src/test/java/de/hft/stuttgart/citydoctor2/zip/ZipTest.java b/CityDoctorParent/CityDoctorModel/src/test/java/de/hft/stuttgart/citydoctor2/zip/ZipTest.java index b9dbda6b..cb9b8e2b 100644 --- a/CityDoctorParent/CityDoctorModel/src/test/java/de/hft/stuttgart/citydoctor2/zip/ZipTest.java +++ b/CityDoctorParent/CityDoctorModel/src/test/java/de/hft/stuttgart/citydoctor2/zip/ZipTest.java @@ -32,7 +32,7 @@ public class ZipTest { assertEquals(5, cgmlArch.getEntries().size()); for (CityGmlZipEntry entry : cgmlArch.getEntries()) { assertNotNull(entry); - assertTrue(entry.getFullFileName().matches("^mock[1-5].gml$")); + assertTrue(entry.getEntrySubPath().matches("^mock[1-5].gml$")); assertNull(entry.getErrorType()); assertNotNull(entry.getModel()); assertEquals(1, entry.getModel().getNumberOfFeatures()); diff --git a/CityDoctorParent/CityDoctorValidation/src/main/java/de/hft/stuttgart/citydoctor2/check/Checker.java b/CityDoctorParent/CityDoctorValidation/src/main/java/de/hft/stuttgart/citydoctor2/check/Checker.java index 200ac1c7..5a909eba 100644 --- a/CityDoctorParent/CityDoctorValidation/src/main/java/de/hft/stuttgart/citydoctor2/check/Checker.java +++ b/CityDoctorParent/CityDoctorValidation/src/main/java/de/hft/stuttgart/citydoctor2/check/Checker.java @@ -787,7 +787,7 @@ public class Checker { try (BufferedOutputStream xmlBos = getXmlOutputMaybe(xmlOutput); BufferedOutputStream pdfBos = getPdfOutputMaybe(pdfOutput)) { Checker c = new Checker(config, null); - String fileName = entry.getFullFileName(); + String fileName = entry.getEntrySubPath(); // create reporter if available XmlStreamReporter xmlReporter = getXmlReporter(config, xmlBos, fileName); diff --git a/CityDoctorParent/Extensions/CityDoctorGUI/src/main/java/de/hft/stuttgart/citydoctor2/gui/CityDoctorController.java b/CityDoctorParent/Extensions/CityDoctorGUI/src/main/java/de/hft/stuttgart/citydoctor2/gui/CityDoctorController.java index f8c1be3f..49ece295 100644 --- a/CityDoctorParent/Extensions/CityDoctorGUI/src/main/java/de/hft/stuttgart/citydoctor2/gui/CityDoctorController.java +++ b/CityDoctorParent/Extensions/CityDoctorGUI/src/main/java/de/hft/stuttgart/citydoctor2/gui/CityDoctorController.java @@ -1029,7 +1029,7 @@ public class CityDoctorController { model = entry.getModel(); if (model.isValidated()) { Checker checker = previousCheckers.get(model); - Files.createDirectories(tempOutput.resolve(entry.getFullFileName()).getParent()); + Files.createDirectories(tempOutput.resolve(entry.getEntrySubPath()).getParent()); checker.writeXmlReport(tempOutput.resolve(entry.getDisplayName() + "_report.xml").toString()); checker.writePdfReport(tempOutput.resolve(entry.getDisplayName() + "_report.pdf").toString()); } diff --git a/CityDoctorParent/Extensions/CityDoctorGUI/src/main/java/de/hft/stuttgart/citydoctor2/gui/ZipEntryManager.java b/CityDoctorParent/Extensions/CityDoctorGUI/src/main/java/de/hft/stuttgart/citydoctor2/gui/ZipEntryManager.java index d0a2a44b..f0ecce03 100644 --- a/CityDoctorParent/Extensions/CityDoctorGUI/src/main/java/de/hft/stuttgart/citydoctor2/gui/ZipEntryManager.java +++ b/CityDoctorParent/Extensions/CityDoctorGUI/src/main/java/de/hft/stuttgart/citydoctor2/gui/ZipEntryManager.java @@ -2,7 +2,6 @@ package de.hft.stuttgart.citydoctor2.gui; import de.hft.stuttgart.citydoctor2.gui.tree.ZipEntryListCell; import de.hft.stuttgart.citydoctor2.gui.tree.ZipEntryNode; -import de.hft.stuttgart.citydoctor2.utils.ArchivePacker; import de.hft.stuttgart.citydoctor2.utils.Localization; import de.hft.stuttgart.citydoctor2.zip.CityGmlZipArchive; import de.hft.stuttgart.citydoctor2.zip.CityGmlZipEntry; @@ -354,7 +353,7 @@ public class ZipEntryManager { } private void showMetadata(CityGmlZipEntry entry) { - subpathValueTxt.setText(entry.getFullFileName()); + subpathValueTxt.setText(entry.getEntrySubPath()); if (entry.getFileSize() != -1L) { long fileSize = entry.getFileSize(); long kb = 1024L; -- GitLab