Refactor: Rename ZipEntryPicker to ZipEntryManager

CityDoctorParent/CityDoctorModel/src/main/resources/CityDoctorLocalization.properties

@@ -104,22 +104,23 @@ CheckDialog.schematronFileLabel=Schematron File:
 CheckDialog.selectBtn=Select
 CheckDialog.checkBtn=Check
 CheckDialog.cancelBtn=Cancel
-ZipEntryPicker.entryListTitle=Zip-entries
-ZipEntryPicker.metadata=Metadata
-ZipEntryPicker.subpathLbl=Subpath:
-ZipEntryPicker.erroneousLbl=Erroneous:
-ZipEntryPicker.excessiveFileSize=Filesize exceeds memory
-ZipEntryPicker.invalidCityGml=Invalid CityGML file
-ZipEntryPicker.ioError=Unable to access file
-ZipEntryPicker.filesizeLbl=Filesize:
-ZipEntryPicker.validatedLbl=Validated:
-ZipEntryPicker.objectCountLbl=Object count:
-ZipEntryPicker.loadBtn=Load CityGML model
-ZipEntryPicker.decompressBtn=Unpack file
-ZipEntryPicker.cancelBtn=Cancel
-ZipEntryPicker.unknownValue=N/A
-ZipEntryPicker.yes=Yes
-ZipEntryPicker.no=No
+ZipEntryManager.title=Zip-entry manager
+ZipEntryManager.entryListTitle=Zip-entries
+ZipEntryManager.metadata=Metadata
+ZipEntryManager.subpathLbl=Subpath:
+ZipEntryManager.erroneousLbl=Erroneous:
+ZipEntryManager.excessiveFileSize=Filesize exceeds memory
+ZipEntryManager.invalidCityGml=Invalid CityGML file
+ZipEntryManager.ioError=Unable to access file
+ZipEntryManager.filesizeLbl=Filesize:
+ZipEntryManager.validatedLbl=Validated:
+ZipEntryManager.objectCountLbl=Object count:
+ZipEntryManager.loadBtn=Load CityGML model
+ZipEntryManager.decompressBtn=Unpack file
+ZipEntryManager.cancelBtn=Cancel
+ZipEntryManager.unknownValue=N/A
+ZipEntryManager.yes=Yes
+ZipEntryManager.no=No
 WriteReportDialog.writeBtn=Save
 WriteReportDialog.cancelBtn=Cancel
 WriteReportDialog.errorStatisticsLabel=Error Statistics

CityDoctorParent/CityDoctorModel/src/main/resources/CityDoctorLocalization_de.properties

@@ -102,22 +102,23 @@ CheckDialog.schematronFileLabel=Schematron Datei
 CheckDialog.selectBtn=Ausw\u00e4hlen
 CheckDialog.checkBtn=Pr\u00fcfen
 CheckDialog.cancelBtn=Abbrechen
-ZipEntryPicker.entryListTitle=Zipeintr\u00e4ge
-ZipEntryPicker.metadata=Metadaten
-ZipEntryPicker.subpathLbl=Unterpfad:
-ZipEntryPicker.erroneousLbl=Fehlerhaft:
-ZipEntryPicker.excessiveFileSize=Datei zu gro\u00DF
-ZipEntryPicker.invalidCityGml=Ung\u00fcltige CityGML Datei
-ZipEntryPicker.ioError=Dateizugriff fehlgeschlagen
-ZipEntryPicker.filesizeLbl=Dateigr\u00f6\u00DFe:
-ZipEntryPicker.validatedLbl=Validiert:
-ZipEntryPicker.objectCountLbl=Objektanzahl:
-ZipEntryPicker.loadBtn=CityGML Modell laden
-ZipEntryPicker.decompressBtn=Datei entpacken
-ZipEntryPicker.cancelBtn=Abbruch
-ZipEntryPicker.unknownValue=Unbekannt
-ZipEntryPicker.yes=Ja
-ZipEntryPicker.no=Nein
+ZipEntryManager.title=Zipeintrag Manager
+ZipEntryManager.entryListTitle=Zipeintr\u00e4ge
+ZipEntryManager.metadata=Metadaten
+ZipEntryManager.subpathLbl=Unterpfad:
+ZipEntryManager.erroneousLbl=Fehlerhaft:
+ZipEntryManager.excessiveFileSize=Datei zu gro\u00DF
+ZipEntryManager.invalidCityGml=Ung\u00fcltige CityGML Datei
+ZipEntryManager.ioError=Dateizugriff fehlgeschlagen
+ZipEntryManager.filesizeLbl=Dateigr\u00f6\u00DFe:
+ZipEntryManager.validatedLbl=Validiert:
+ZipEntryManager.objectCountLbl=Objektanzahl:
+ZipEntryManager.loadBtn=CityGML Modell laden
+ZipEntryManager.decompressBtn=Datei entpacken
+ZipEntryManager.cancelBtn=Abbruch
+ZipEntryManager.unknownValue=Unbekannt
+ZipEntryManager.yes=Ja
+ZipEntryManager.no=Nein
 WriteReportDialog.writeBtn=Speichern
 WriteReportDialog.cancelBtn=Abbrechen
 WriteReportDialog.errorStatisticsLabel=Fehler Statistik

CityDoctorParent/Extensions/CityDoctorGUI/src/main/java/de/hft/stuttgart/citydoctor2/gui/CityDoctorController.java

@@ -30,7 +30,6 @@ import org.xml.sax.SAXParseException;
 
 import java.io.File;
 import java.io.IOException;
-import java.nio.file.Path;
 import java.util.*;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.Function;
@@ -47,7 +46,7 @@ public class CityDoctorController {
     private ParserConfiguration currentConfig;
     private String sourceFile;
     private CityGmlZipArchive zipArchive;
-    private ZipEntryPicker currentZipEntryPicker;
+    private ZipEntryManager currentZipEntryManager;
     private Checker currentChecker;
 
     private HighlightController highlightController;
@@ -156,8 +155,8 @@ public class CityDoctorController {
 
         Platform.runLater(() -> {
             try {
-                currentZipEntryPicker = new ZipEntryPicker(mainWindow.getMainStage(), this);
-                currentZipEntryPicker.show();
+                currentZipEntryManager = new ZipEntryManager(mainWindow.getMainStage(), this);
+                currentZipEntryManager.show();
             } catch (IOException e) {
                 throw new RuntimeException(e);
             }
@@ -217,7 +216,7 @@ public class CityDoctorController {
     }
 
     public void showZipManager() {
-        Platform.runLater(() -> currentZipEntryPicker.show());
+        Platform.runLater(() -> currentZipEntryManager.show());
     }
 
     private void setupFeatureTabs() {

CityDoctorParent/Extensions/CityDoctorGUI/src/main/java/de/hft/stuttgart/citydoctor2/gui/ZipEntryPicker.java → CityDoctorParent/Extensions/CityDoctorGUI/src/main/java/de/hft/stuttgart/citydoctor2/gui/ZipEntryManager.java

@@ -31,9 +31,9 @@ import org.apache.logging.log4j.Logger;
 import java.io.IOException;
 import java.io.InputStream;
 
-public class ZipEntryPicker {
+public class ZipEntryManager {
 
-    private static final Logger logger = LogManager.getLogger(ZipEntryPicker.class);
+    private static final Logger logger = LogManager.getLogger(ZipEntryManager.class);
 
     private Stage stage;
     private CityGmlZipArchive archive;
@@ -96,10 +96,10 @@ public class ZipEntryPicker {
     private CityDoctorController controller;
     private int currentlyLoadedEntry = -1;
 
-    private String unknownValueText = Localization.getText("ZipEntryPicker.unknownValue");
+    private String unknownValueText = Localization.getText("ZipEntryManager.unknownValue");
 
-    public ZipEntryPicker(Window parent, CityDoctorController controller) throws IOException {
-        FXMLLoader loader = new FXMLLoader(ZipEntryPicker.class.getResource("ZipEntryPicker.fxml"));
+    public ZipEntryManager(Window parent, CityDoctorController controller) throws IOException {
+        FXMLLoader loader = new FXMLLoader(ZipEntryManager.class.getResource("ZipEntryManager.fxml"));
         loader.setController(this);
         this.controller = controller;
         archive = controller.getZipArchive();
@@ -109,7 +109,7 @@ public class ZipEntryPicker {
         stage.setScene(new Scene(box));
         stage.initOwner(parent);
         stage.initModality(Modality.APPLICATION_MODAL);
-        stage.setTitle("Zip-Entry Picker");
+        stage.setTitle(Localization.getText("ZipEntryManager.title"));
         stage.getScene().addEventFilter(KeyEvent.KEY_PRESSED, (KeyEvent event) -> {
             if (event.getCode() == KeyCode.ESCAPE) {
                 stage.close();
@@ -221,13 +221,13 @@ public class ZipEntryPicker {
     }
 
     private void applyLocalization() {
-        entriesPane.setText(Localization.getText("ZipEntryPicker.entryListTitle"));
-        metadataPane.setText(Localization.getText("ZipEntryPicker.metadata"));
-        subpathLbl.setText(Localization.getText("ZipEntryPicker.subpathLbl"));
-        erroneousLbl.setText(Localization.getText("ZipEntryPicker.erroneousLbl"));
-        filesizeLbl.setText(Localization.getText("ZipEntryPicker.filesizeLbl"));
-        validatedLbl.setText(Localization.getText("ZipEntryPicker.validatedLbl"));
-        objectCountLbl.setText(Localization.getText("ZipEntryPicker.objectCountLbl"));
+        entriesPane.setText(Localization.getText("ZipEntryManager.entryListTitle"));
+        metadataPane.setText(Localization.getText("ZipEntryManager.metadata"));
+        subpathLbl.setText(Localization.getText("ZipEntryManager.subpathLbl"));
+        erroneousLbl.setText(Localization.getText("ZipEntryManager.erroneousLbl"));
+        filesizeLbl.setText(Localization.getText("ZipEntryManager.filesizeLbl"));
+        validatedLbl.setText(Localization.getText("ZipEntryManager.validatedLbl"));
+        objectCountLbl.setText(Localization.getText("ZipEntryManager.objectCountLbl"));
 
         subpathValueTxt.setText(unknownValueText);
         erroneousValue.setText(unknownValueText);
@@ -235,9 +235,9 @@ public class ZipEntryPicker {
         validatedValue.setText(unknownValueText);
         objectCountValue.setText(unknownValueText);
 
-        loadBtn.setTooltip(new Tooltip(Localization.getText("ZipEntryPicker.loadBtn")));
-        decompressBtn.setTooltip(new Tooltip(Localization.getText("ZipEntryPicker.decompressBtn")));
-        cancelBtn.setText(Localization.getText("ZipEntryPicker.cancelBtn"));
+        loadBtn.setTooltip(new Tooltip(Localization.getText("ZipEntryManager.loadBtn")));
+        decompressBtn.setTooltip(new Tooltip(Localization.getText("ZipEntryManager.decompressBtn")));
+        cancelBtn.setText(Localization.getText("ZipEntryManager.cancelBtn"));
     }
 
     private void populateZipEntryList() {
@@ -284,7 +284,7 @@ public class ZipEntryPicker {
             loadBtn.setDisable(true);
             decompressBtn.setDisable(true);
         } else {
-            erroneousValue.setText(Localization.getText("ZipEntryPicker.no"));
+            erroneousValue.setText(Localization.getText("ZipEntryManager.no"));
 
             loadBtn.setDisable(!entry.isDecompressed());
             decompressBtn.setDisable(entry.isDecompressed());
@@ -294,9 +294,9 @@ public class ZipEntryPicker {
                 return;
             }
             if (entry.getModel().isValidated()) {
-                validatedValue.setText(Localization.getText("ZipEntryPicker.yes"));
+                validatedValue.setText(Localization.getText("ZipEntryManager.yes"));
             } else {
-                validatedValue.setText(Localization.getText("ZipEntryPicker.no"));
+                validatedValue.setText(Localization.getText("ZipEntryManager.no"));
             }
             objectCountValue.setText(String.valueOf(entry.getModel().getNumberOfFeatures()));
         }
@@ -312,13 +312,13 @@ public class ZipEntryPicker {
     private String getErrorText(ZipEntryErrorType error) {
         switch (error) {
             case EXCESSIVE_FILESIZE -> {
-                return Localization.getText("ZipEntryPicker.excessiveFileSize");
+                return Localization.getText("ZipEntryManager.excessiveFileSize");
             }
             case INVALID_CITY_GML_FILE -> {
-                return Localization.getText("ZipEntryPicker.invalidCityGml");
+                return Localization.getText("ZipEntryManager.invalidCityGml");
             }
             default -> {
-                return Localization.getText("ZipEntryPicker.ioError");
+                return Localization.getText("ZipEntryManager.ioError");
             }
         }
     }