From 146b1b093c42ec4117ac868fb03e3351d9173cf4 Mon Sep 17 00:00:00 2001
From: zhangmeng <1334717033@qq.com>
Date: Fri, 1 Dec 2023 15:36:46 +0800
Subject: [PATCH] =?UTF-8?q?2023=E5=B9=B412=E6=9C=881=E6=97=A515:27:57?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/zhangmeng/tools/components/RxEditer.java  | 6 ++++++
 .../tools/controller/EditorListImplController.java          | 4 ++--
 src/main/java/com/zhangmeng/tools/editors/ace/AceMode.java  | 1 +
 src/main/resources/fxml/editor-list-impl.fxml               | 3 ---
 src/main/resources/fxml/home.fxml                           | 3 ---
 5 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/zhangmeng/tools/components/RxEditer.java b/src/main/java/com/zhangmeng/tools/components/RxEditer.java
index cedf441..3b63588 100644
--- a/src/main/java/com/zhangmeng/tools/components/RxEditer.java
+++ b/src/main/java/com/zhangmeng/tools/components/RxEditer.java
@@ -1,7 +1,10 @@
 package com.zhangmeng.tools.components;
 
 import javafx.beans.property.SimpleIntegerProperty;
+import javafx.beans.value.ChangeListener;
+import javafx.beans.value.ObservableValue;
 import javafx.embed.swing.SwingNode;
+import javafx.geometry.Bounds;
 import javafx.scene.layout.AnchorPane;
 import org.fife.ui.rsyntaxtextarea.RSyntaxTextArea;
 import org.fife.ui.rsyntaxtextarea.SyntaxConstants;
@@ -12,10 +15,13 @@ import javax.swing.*;
 import javax.swing.event.CaretEvent;
 import javax.swing.event.CaretListener;
 import java.awt.*;
+import java.awt.event.ContainerEvent;
+import java.awt.event.ContainerListener;
 import java.io.IOException;
 import java.lang.reflect.InvocationTargetException;
 
 public class RxEditer extends AnchorPane{
+
     private final SimpleIntegerProperty line = new SimpleIntegerProperty();
     private final SimpleIntegerProperty column = new SimpleIntegerProperty();
 
diff --git a/src/main/java/com/zhangmeng/tools/controller/EditorListImplController.java b/src/main/java/com/zhangmeng/tools/controller/EditorListImplController.java
index c2c8e38..0f839fc 100644
--- a/src/main/java/com/zhangmeng/tools/controller/EditorListImplController.java
+++ b/src/main/java/com/zhangmeng/tools/controller/EditorListImplController.java
@@ -88,8 +88,9 @@ public class EditorListImplController {
 
     @FXML
     public MenuItem new_file;
-    public Menu font_item;
 
+    @FXML
+    public Menu font_item;
 
     public void swing_menu_item(ActionEvent actionEvent) {
         editer_index.setValue(1);
@@ -115,7 +116,6 @@ public class EditorListImplController {
     private MonacoWebView monacoEdit;
     private CodeMirrWebView codemirror;
     private AnchorPane timiFx;
-
     private RxEditer swingEditor;
 
     private SimpleObjectProperty<File> choose_file = new SimpleObjectProperty<>(null);
diff --git a/src/main/java/com/zhangmeng/tools/editors/ace/AceMode.java b/src/main/java/com/zhangmeng/tools/editors/ace/AceMode.java
index 4520530..c1114f2 100644
--- a/src/main/java/com/zhangmeng/tools/editors/ace/AceMode.java
+++ b/src/main/java/com/zhangmeng/tools/editors/ace/AceMode.java
@@ -13,6 +13,7 @@ public enum AceMode {
     TEXT("mode-text.js", "ace/mode/text"),
     XML("mode-xml.js", "ace/mode/xml"),
     YAML("mode-yaml.js", "ace/mode/yaml"),
+    GO("mode-golang.js", "ace/mode/golang"),
     MARKDOWN("mode-markdown.js", "ace/mode/markdown");
 
     AceMode(String name, String value) {
diff --git a/src/main/resources/fxml/editor-list-impl.fxml b/src/main/resources/fxml/editor-list-impl.fxml
index 1d0835b..334597d 100644
--- a/src/main/resources/fxml/editor-list-impl.fxml
+++ b/src/main/resources/fxml/editor-list-impl.fxml
@@ -132,9 +132,6 @@
                 <Menu mnemonicParsing="false" text="编辑器">
                     <items>
                         <MenuItem mnemonicParsing="false" onAction="#ace_menu_item" text="ace.js 编辑器"/>
-                        <MenuItem mnemonicParsing="false" text="swing编辑器" onAction="#swing_menu_item"/>
-                        <!--                        <MenuItem mnemonicParsing="false" onAction="#codemirror_menu_item" text="codemirror.js 编辑器" />-->
-                        <!--                        <MenuItem mnemonicParsing="false" onAction="#timeFx_menu_item" text="timefx 编辑器" />-->
                     </items>
                 </Menu>
 
diff --git a/src/main/resources/fxml/home.fxml b/src/main/resources/fxml/home.fxml
index e18b7fb..6c8de33 100644
--- a/src/main/resources/fxml/home.fxml
+++ b/src/main/resources/fxml/home.fxml
@@ -117,9 +117,6 @@
                 <Menu mnemonicParsing="false" text="编辑器">
                     <items>
                         <MenuItem mnemonicParsing="false" text="ace.js 编辑器" onAction="#ace_menu_item"/>
-                        <MenuItem mnemonicParsing="false" text="swing编辑器" onAction="#swing_menu_item"/>
-<!--                        <MenuItem mnemonicParsing="false" text="codemirror.js 编辑器" onAction="#codemirror_menu_item"/>-->
-<!--                        <MenuItem mnemonicParsing="false" text="timefx 编辑器" onAction="#timeFx_menu_item"/>-->
                     </items>
                 </Menu>