From 7085d8abfb510865c770300fe1043b79e3f50385 Mon Sep 17 00:00:00 2001
From: "bene.rr41" <bene.rr41@gmx.de>
Date: Tue, 4 Jun 2024 14:54:32 +0200
Subject: [PATCH] bugfixes

---
 .../de/emmerts/fotoverwaltung/FileTreeComponent.java   |  5 ++++-
 .../de/emmerts/fotoverwaltung/FileTreeController.java  | 10 +++++++---
 .../de/emmerts/fotoverwaltung/MainApplication.java     |  8 ++++++--
 .../java/de/emmerts/fotoverwaltung/MainController.java |  4 ++--
 4 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/src/main/java/de/emmerts/fotoverwaltung/FileTreeComponent.java b/src/main/java/de/emmerts/fotoverwaltung/FileTreeComponent.java
index 01ef73c..ba58b1d 100644
--- a/src/main/java/de/emmerts/fotoverwaltung/FileTreeComponent.java
+++ b/src/main/java/de/emmerts/fotoverwaltung/FileTreeComponent.java
@@ -31,7 +31,10 @@ public class FileTreeComponent extends VBox {
         controller.id = getId();
         String defaultDirectory = MainApplication.config.getString("directories."+id);
         if(defaultDirectory != null) {
-            openDirectory(new File(defaultDirectory));
+            File directory = new File(defaultDirectory);
+            if(!directory.exists())
+                directory = new File(System.getProperty("user.dir"));
+            openDirectory(directory);
         }
         if(id.equals("fileTreeCR2"))
             controller.treeView.setDisable(true);
diff --git a/src/main/java/de/emmerts/fotoverwaltung/FileTreeController.java b/src/main/java/de/emmerts/fotoverwaltung/FileTreeController.java
index d92df10..e16323b 100644
--- a/src/main/java/de/emmerts/fotoverwaltung/FileTreeController.java
+++ b/src/main/java/de/emmerts/fotoverwaltung/FileTreeController.java
@@ -104,7 +104,7 @@ public class FileTreeController{
         if(allowAllFileExtensions.isSelected())
             allFiles = root.listFiles();
         else
-            allFiles = root.listFiles(ff);
+            allFiles = root.listFiles(fileFilterImages);
         for (File file : allFiles) {
             if(file.isDirectory())
                 directories.add(getFileList(file, false));
@@ -118,11 +118,14 @@ public class FileTreeController{
         return  temp;
     }
 
-    FileFilter ff = fileForFilter -> {
+    FileFilter fileFilterImages = fileForFilter -> {
         if(fileForFilter.isDirectory())
             return true;
         ArrayList<String> allowedExtensions = new ArrayList<>();
-        allowedExtensions.add(".cr2");
+
+        if(!id.equals("fileTreeJPG")) {
+            allowedExtensions.add(".cr2");
+        }
         allowedExtensions.add(".jpg");
         allowedExtensions.add(".jpeg");
         allowedExtensions.add(".gif");
@@ -134,6 +137,7 @@ public class FileTreeController{
         return false;
     };
 
+
     public void displayTreeMap(TreeMap<String, File> files) {
         FileTreeItemComponent temp = new FileTreeItemComponent(files.firstEntry().getValue().getParentFile().getParentFile());
         treeView.setRoot(temp);
diff --git a/src/main/java/de/emmerts/fotoverwaltung/MainApplication.java b/src/main/java/de/emmerts/fotoverwaltung/MainApplication.java
index 83114b3..4215c0e 100644
--- a/src/main/java/de/emmerts/fotoverwaltung/MainApplication.java
+++ b/src/main/java/de/emmerts/fotoverwaltung/MainApplication.java
@@ -7,6 +7,7 @@ import javafx.beans.value.ChangeListener;
 import javafx.beans.value.ObservableValue;
 import javafx.event.EventHandler;
 import javafx.fxml.FXMLLoader;
+import javafx.scene.Parent;
 import javafx.scene.Scene;
 import javafx.scene.control.Alert;
 import javafx.scene.control.ButtonType;
@@ -39,13 +40,16 @@ public class MainApplication extends Application {
         FXMLLoader fxmlLoader = new FXMLLoader(MainApplication.class.getResource("MainApplication.fxml"));
 
         try {
-            config.read(new FileReader(iniFilename));
+            File ini = new File(iniFilename);
+            if(ini.exists())
+                config.read(new FileReader(iniFilename));
         } catch (ConfigurationException e) {
             throw new RuntimeException(e);
         }
         int lastWidth = Integer.parseInt(config.getString("window.lastWidth"));
         int lastHeight = Integer.parseInt(config.getString("window.lastHeight"));
-        Scene scene = new Scene(fxmlLoader.load(), lastWidth, lastHeight);
+        Parent parent = fxmlLoader.load();
+        Scene scene = new Scene(parent, lastWidth, lastHeight);
         scene.widthProperty().addListener(new ChangeListener<Number>() {
             @Override
             public void changed(ObservableValue<? extends Number> observable, Number oldValue, Number newValue) {
diff --git a/src/main/java/de/emmerts/fotoverwaltung/MainController.java b/src/main/java/de/emmerts/fotoverwaltung/MainController.java
index 25bc5c7..c1bbd75 100644
--- a/src/main/java/de/emmerts/fotoverwaltung/MainController.java
+++ b/src/main/java/de/emmerts/fotoverwaltung/MainController.java
@@ -39,8 +39,8 @@ public class MainController {
     {
         fileTreeCR2.initialize("fileTreeCR2");
         fileTreeJPG.initialize("fileTreeJPG");
-        File f = new File("C:\\Users\\Bene\\IdeaProjects\\Fotoverwaltung\\src\\main\\resources\\de\\emmerts\\fotoverwaltung\\image.png");
-        displayImageFile(f);
+        //File f = new File("C:\\Users\\Bene\\IdeaProjects\\Fotoverwaltung\\src\\main\\resources\\de\\emmerts\\fotoverwaltung\\image.png");
+        //displayImageFile(f);
         //todo Image aus Ressource auslesen:
         //Image img= new Image(getClass().getResource("/path/in/your/package/structure/icon.png").toString());
     }