From 382ae5cbbc53bf54ca5b017338ca8c76194f836c Mon Sep 17 00:00:00 2001 From: Oystein Date: Wed, 7 Apr 2021 04:53:36 +0200 Subject: [PATCH] can now double click on directory without error --- src/main/java/app/controllers/EditorController.java | 3 +++ src/main/java/app/controllers/FiletreeController.java | 9 ++++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/main/java/app/controllers/EditorController.java b/src/main/java/app/controllers/EditorController.java index 58133ef..17dbdc1 100644 --- a/src/main/java/app/controllers/EditorController.java +++ b/src/main/java/app/controllers/EditorController.java @@ -4,6 +4,8 @@ import java.io.File; import java.io.FileNotFoundException; import java.io.PrintWriter; import java.net.URL; +import java.nio.file.Files; +import java.nio.file.Paths; import java.util.Collection; import java.util.ResourceBundle; import java.util.Scanner; @@ -144,6 +146,7 @@ public class EditorController implements Initializable, Controller { private void setEditorContent(String filePath) { if (filePath == null) { editor.clear(); + editor.appendText("// New File"); return; } try (Scanner sc = new Scanner(new File(filePath))) { diff --git a/src/main/java/app/controllers/FiletreeController.java b/src/main/java/app/controllers/FiletreeController.java index cb84074..6c67de8 100644 --- a/src/main/java/app/controllers/FiletreeController.java +++ b/src/main/java/app/controllers/FiletreeController.java @@ -10,6 +10,7 @@ import javafx.scene.input.MouseEvent; import java.io.File; import java.net.URL; +import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; import java.util.ArrayList; @@ -136,7 +137,6 @@ public class FiletreeController implements Initializable, Controller { private void handleMouseClick(MouseEvent event) { if (event.getClickCount() == 2) { TreeItem item = filetree.getSelectionModel().getSelectedItem(); - String root = Model.getProjectPath().getFileName().toString(); String path = ""; while (!root.equals(item.getValue())) { @@ -146,8 +146,11 @@ public class FiletreeController implements Initializable, Controller { path = Model.getProjectPath() + path; Path pathToString = Paths.get(path); - Model.setActiveFilePath(pathToString); - this.eventBus.post(new FileSelectedEvent(path)); + if (!Files.isDirectory(pathToString)) { + Model.setActiveFilePath(pathToString); + this.eventBus.post(new FileSelectedEvent(path)); + } + } }