From 509f5224b58bf52e0adb3a1889a6c6d883bd2774 Mon Sep 17 00:00:00 2001 From: Oystein Date: Wed, 7 Apr 2021 07:11:27 +0200 Subject: [PATCH] if one tries to SaveAs now and projectpatch i selected, it will op there instead of deafult --- src/main/java/app/controllers/EditorController.java | 4 ++-- src/main/java/app/controllers/FiletreeController.java | 3 ++- src/main/java/app/controllers/MenubarController.java | 5 ++++- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/main/java/app/controllers/EditorController.java b/src/main/java/app/controllers/EditorController.java index 4e958a1..76d67c2 100644 --- a/src/main/java/app/controllers/EditorController.java +++ b/src/main/java/app/controllers/EditorController.java @@ -161,7 +161,7 @@ public class EditorController implements Initializable, Controller { } catch (FileNotFoundException ex) { Alert error = new Alert(AlertType.ERROR); - error.setContentText("Could not be opened!\nMust be a java or md file. Try again."); + error.setContentText("Could not be opened!\nMust be a java or md file or not null. Try again."); error.showAndWait(); System.err.println(filePath); @@ -183,7 +183,7 @@ public class EditorController implements Initializable, Controller { } catch (FileNotFoundException ex) { Alert error = new Alert(AlertType.ERROR); - error.setContentText("Could not save file!\nMust be a java or md file or not null. Try again."); + error.setContentText("Could not save file!\nMust be a java or md file. Try again."); error.showAndWait(); System.err.println(filePath); diff --git a/src/main/java/app/controllers/FiletreeController.java b/src/main/java/app/controllers/FiletreeController.java index 0c8ace5..0452544 100644 --- a/src/main/java/app/controllers/FiletreeController.java +++ b/src/main/java/app/controllers/FiletreeController.java @@ -142,7 +142,8 @@ public class FiletreeController implements Initializable, Controller { /* ------------------------------------------------------------------------ */ /** - * Handles whenever a filetree item is clicked twice. + * Handles whenever a filetree item is clicked twice. A while loop to create the + * correct filepath. */ @FXML private void handleMouseClick(MouseEvent event) { diff --git a/src/main/java/app/controllers/MenubarController.java b/src/main/java/app/controllers/MenubarController.java index bb0561c..43c5472 100644 --- a/src/main/java/app/controllers/MenubarController.java +++ b/src/main/java/app/controllers/MenubarController.java @@ -83,7 +83,7 @@ public class MenubarController implements Initializable, Controller { } /* ------------------------------------------------------------------------ */ - /* OPEN FILE */ + /* OPEN FILE/PROJECT */ /* ------------------------------------------------------------------------ */ /** @@ -148,6 +148,9 @@ public class MenubarController implements Initializable, Controller { private void handleSaveAsFile() { FileChooser fc = new FileChooser(); fc.setTitle("Save as"); + if (Model.getProjectPath() != null) { + fc.setInitialDirectory(Model.getProjectPath().toFile()); + } Stage stage = (Stage) menubar.getScene().getWindow(); FileChooser.ExtensionFilter extJava = new FileChooser.ExtensionFilter("Java", "*.java");