Style: Rename function

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;

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());
     }
 

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());
             }

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;
             }

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;
     }
 

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;
     }
 

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());

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);

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());
                 }

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;