From 2d6fdd018f08626eb165d177ecad6e1be7f098b8 Mon Sep 17 00:00:00 2001
From: h7x4 <h7x4abk3g@protonmail.com>
Date: Wed, 17 Feb 2021 21:06:09 +0100
Subject: [PATCH] Extract editor from main fxml and add linenumbers

---
 .../editor => controllers}/EditorController.java    |  4 ++--
 .../fileTree/fileTree.fxml                          |  0
 .../fileTree/fileTreeController.java                |  2 +-
 src/main/java/module-info.java                      |  2 ++
 src/main/resources/fxml/Main.fxml                   |  6 +-----
 src/main/resources/fxml/components/Editor.fxml      | 13 +++++++++++++
 6 files changed, 19 insertions(+), 8 deletions(-)
 rename src/main/java/app/{components/editor => controllers}/EditorController.java (92%)
 rename src/main/java/app/{components => controllers}/fileTree/fileTree.fxml (100%)
 rename src/main/java/app/{components => controllers}/fileTree/fileTreeController.java (75%)
 create mode 100644 src/main/resources/fxml/components/Editor.fxml

diff --git a/src/main/java/app/components/editor/EditorController.java b/src/main/java/app/controllers/EditorController.java
similarity index 92%
rename from src/main/java/app/components/editor/EditorController.java
rename to src/main/java/app/controllers/EditorController.java
index 44474e1..3b80dcb 100644
--- a/src/main/java/app/components/editor/EditorController.java
+++ b/src/main/java/app/controllers/EditorController.java
@@ -1,4 +1,4 @@
-package app.components.editor;
+package app.controllers;
 
 import java.net.URL;
 import java.util.ResourceBundle;
@@ -22,7 +22,7 @@ public class EditorController implements Initializable {
    * Links the controller to the global model
    * @param model The model to be linked
    */
-  public EditorController(Model model) {
+  public void setModel(Model model) {
     this.model = model;
   }
 
diff --git a/src/main/java/app/components/fileTree/fileTree.fxml b/src/main/java/app/controllers/fileTree/fileTree.fxml
similarity index 100%
rename from src/main/java/app/components/fileTree/fileTree.fxml
rename to src/main/java/app/controllers/fileTree/fileTree.fxml
diff --git a/src/main/java/app/components/fileTree/fileTreeController.java b/src/main/java/app/controllers/fileTree/fileTreeController.java
similarity index 75%
rename from src/main/java/app/components/fileTree/fileTreeController.java
rename to src/main/java/app/controllers/fileTree/fileTreeController.java
index 21c580d..fe17992 100644
--- a/src/main/java/app/components/fileTree/fileTreeController.java
+++ b/src/main/java/app/controllers/fileTree/fileTreeController.java
@@ -1,4 +1,4 @@
-package app.components.fileTree;
+package app.controllers.fileTree;
 
 import javafx.fxml.FXML;
 import javafx.scene.control.TreeView;
diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java
index 8a0c554..76f1380 100644
--- a/src/main/java/module-info.java
+++ b/src/main/java/module-info.java
@@ -5,5 +5,7 @@ module app {
 	requires javafx.graphics;
   requires org.fxmisc.richtext;
 
+  opens app.controllers to javafx.fxml;
+
   exports app;
 }
diff --git a/src/main/resources/fxml/Main.fxml b/src/main/resources/fxml/Main.fxml
index 7ef2edb..0045221 100644
--- a/src/main/resources/fxml/Main.fxml
+++ b/src/main/resources/fxml/Main.fxml
@@ -61,11 +61,7 @@
       </ScrollPane>
 
       <!-- Editor -->
-      <VirtualizedScrollPane>
-        <content>
-          <CodeArea fx:id="editor"/>
-        </content>
-      </VirtualizedScrollPane>
+      <fx:include source="components/Editor.fxml" fx:id="editorRoot"/>
   
     </items>
     </SplitPane>
diff --git a/src/main/resources/fxml/components/Editor.fxml b/src/main/resources/fxml/components/Editor.fxml
new file mode 100644
index 0000000..93b7811
--- /dev/null
+++ b/src/main/resources/fxml/components/Editor.fxml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import org.fxmisc.flowless.VirtualizedScrollPane?>
+<?import org.fxmisc.richtext.CodeArea?>
+
+<VirtualizedScrollPane
+  xmlns="http://javafx.com/javafx/8.0.65"
+  xmlns:fx="http://javafx.com/fxml/1"
+  fx:controller="app.controllers.EditorController">
+  <content>
+    <CodeArea fx:id="editor"/>
+  </content>
+</VirtualizedScrollPane>
\ No newline at end of file