a6.8.2

Mararsh · Aug 15, 2024 · 7ba13f1 · 7ba13f1
1 parent a7a47f4
commit 7ba13f1
Show file tree

Hide file tree

Showing 22 changed files with 683 additions and 108 deletions.
diff --git a/alpha/MyBox/src/main/java/mara/mybox/controller/BaseDataTreeManageController.java b/alpha/MyBox/src/main/java/mara/mybox/controller/BaseDataTreeManageController.java
@@ -2,20 +2,16 @@
 
 import java.io.File;
 import java.sql.Connection;
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
 import javafx.fxml.FXML;
 import javafx.scene.control.Alert;
 import javafx.scene.control.ButtonType;
 import javafx.scene.layout.Region;
 import javafx.stage.Stage;
-import javafx.stage.Window;
 import mara.mybox.db.DerbyBase;
 import mara.mybox.db.data.DataNode;
 import mara.mybox.fxml.FxSingletonTask;
-import mara.mybox.fxml.WindowTools;
-import mara.mybox.value.Fxmls;
 import static mara.mybox.value.Languages.message;
 
 /**
@@ -282,28 +278,4 @@ public boolean checkBeforeNextAction() {
         }
     }
 
-    /*
-        static methods
-     */
-    public static BaseDataTreeManageController oneOpen() {
-        BaseDataTreeManageController controller = null;
-        List<Window> windows = new ArrayList<>();
-        windows.addAll(Window.getWindows());
-        for (Window window : windows) {
-            Object object = window.getUserData();
-            if (object != null && object instanceof BaseDataTreeManageController) {
-                try {
-                    controller = (BaseDataTreeManageController) object;
-                    break;
-                } catch (Exception e) {
-                }
-            }
-        }
-        if (controller == null) {
-            controller = (BaseDataTreeManageController) WindowTools.openStage(Fxmls.InfoTreeManageFxml);
-        }
-        controller.requestMouse();
-        return controller;
-    }
-
 }
diff --git a/alpha/MyBox/src/main/java/mara/mybox/controller/BaseDataTreeNodeController.java b/alpha/MyBox/src/main/java/mara/mybox/controller/BaseDataTreeNodeController.java
@@ -371,10 +371,7 @@ public void pasteNode(DataNode node) {
 
     @Override
     public boolean keyEventsFilter(KeyEvent event) {
-        if (valuesEditor == null) {
-            return super.keyEventsFilter(event);
-        }
-        if (valuesEditor.thisPane.isFocused() || valuesEditor.thisPane.isFocusWithin()) {
+        if (valuesEditor != null && valuesEditor.thisPane.isFocused() || valuesEditor.thisPane.isFocusWithin()) {
             if (valuesEditor.keyEventsFilter(event)) {
                 return true;
             }
@@ -387,7 +384,10 @@ public boolean keyEventsFilter(KeyEvent event) {
         if (super.keyEventsFilter(event)) {
             return true;
         }
-        return valuesEditor.keyEventsFilter(event);
+        if (valuesEditor != null) {
+            return valuesEditor.keyEventsFilter(event);
+        }
+        return false;
     }
 
 }
diff --git a/alpha/MyBox/src/main/java/mara/mybox/controller/InfoNodeController.java b/alpha/MyBox/src/main/java/mara/mybox/controller/InfoNodeController.java
@@ -0,0 +1,64 @@
+package mara.mybox.controller;
+
+import javafx.beans.value.ChangeListener;
+import javafx.beans.value.ObservableValue;
+import javafx.event.Event;
+import javafx.fxml.FXML;
+import javafx.scene.control.CheckBox;
+import javafx.scene.control.TextArea;
+import mara.mybox.dev.MyBoxLog;
+import mara.mybox.fxml.PopTools;
+import mara.mybox.value.UserConfig;
+
+/**
+ * @Author Mara
+ * @CreateDate 2024-8-8
+ * @License Apache License Version 2.0
+ */
+public class InfoNodeController extends BaseDataTreeNodeController {
+
+    @FXML
+    protected TextArea infoInput;
+    @FXML
+    protected CheckBox wrapCheck;
+
+    @Override
+    public void initControls() {
+        try {
+            super.initControls();
+
+            infoInput.textProperty().addListener(new ChangeListener<String>() {
+                @Override
+                public void changed(ObservableValue v, String ov, String nv) {
+                    valueChanged(true);
+                }
+            });
+
+            wrapCheck.setSelected(UserConfig.getBoolean(baseName + "Wrap", false));
+            wrapCheck.selectedProperty().addListener(new ChangeListener<Boolean>() {
+                @Override
+                public void changed(ObservableValue<? extends Boolean> ov, Boolean oldValue, Boolean newValue) {
+                    UserConfig.setBoolean(baseName + "Wrap", newValue);
+                    infoInput.setWrapText(newValue);
+                }
+            });
+            infoInput.setWrapText(wrapCheck.isSelected());
+
+        } catch (Exception e) {
+            MyBoxLog.error(e);
+        }
+    }
+
+    @FXML
+    protected void popHistories(Event event) {
+        if (UserConfig.getBoolean(baseName + "HistoriesPopWhenMouseHovering", false)) {
+            showHistories(event);
+        }
+    }
+
+    @FXML
+    protected void showHistories(Event event) {
+        PopTools.popStringValues(this, infoInput, event, baseName + "Histories", false);
+    }
+
+}
diff --git a/alpha/MyBox/src/main/java/mara/mybox/controller/InfoTreeController.java b/alpha/MyBox/src/main/java/mara/mybox/controller/InfoTreeController.java
@@ -0,0 +1,66 @@
+package mara.mybox.controller;
+
+import java.util.ArrayList;
+import java.util.List;
+import javafx.fxml.FXML;
+import javafx.stage.Window;
+import mara.mybox.db.table.TableInfo;
+import mara.mybox.dev.MyBoxLog;
+import mara.mybox.fxml.WindowTools;
+import mara.mybox.value.Fxmls;
+import mara.mybox.value.Languages;
+
+/**
+ * @Author Mara
+ * @CreateDate 2024-8-8
+ * @License Apache License Version 2.0
+ */
+public class InfoTreeController extends BaseDataTreeManageController {
+
+    @FXML
+    protected InfoNodeController infoController;
+
+    public InfoTreeController() {
+        baseTitle = Languages.message("Notes");
+        TipsLabelKey = "NotesTips";
+    }
+
+    @Override
+    public void initValues() {
+        try {
+            super.initValues();
+
+            dataTable = new TableInfo();
+            nodeController = infoController;
+            treeController = treeManageController;
+
+        } catch (Exception e) {
+            MyBoxLog.error(e);
+        }
+    }
+
+    /*
+        static methods
+     */
+    public static InfoTreeController oneOpen() {
+        InfoTreeController controller = null;
+        List<Window> windows = new ArrayList<>();
+        windows.addAll(Window.getWindows());
+        for (Window window : windows) {
+            Object object = window.getUserData();
+            if (object != null && object instanceof InfoTreeController) {
+                try {
+                    controller = (InfoTreeController) object;
+                    break;
+                } catch (Exception e) {
+                }
+            }
+        }
+        if (controller == null) {
+            controller = (InfoTreeController) WindowTools.openStage(Fxmls.InfoTreeFxml);
+        }
+        controller.requestMouse();
+        return controller;
+    }
+
+}
diff --git a/alpha/MyBox/src/main/java/mara/mybox/controller/InfoTreeManageController.java b/alpha/MyBox/src/main/java/mara/mybox/controller/InfoTreeManageController.java
@@ -2,7 +2,6 @@
 
 import java.io.File;
 import java.sql.Connection;
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
 import javafx.fxml.FXML;
@@ -11,13 +10,10 @@
 import javafx.scene.input.KeyEvent;
 import javafx.scene.layout.Region;
 import javafx.stage.Stage;
-import javafx.stage.Window;
 import mara.mybox.db.DerbyBase;
 import mara.mybox.db.data.InfoNode;
 import mara.mybox.dev.MyBoxLog;
 import mara.mybox.fxml.FxSingletonTask;
-import mara.mybox.fxml.WindowTools;
-import mara.mybox.value.Fxmls;
 import static mara.mybox.value.Languages.message;
 
 /**
@@ -371,28 +367,4 @@ public void tagsChanged() {
         editor.attributesController.synchronizeTags();
     }
 
-    /*
-        static methods
-     */
-    public static InfoTreeManageController oneOpen() {
-        InfoTreeManageController controller = null;
-        List<Window> windows = new ArrayList<>();
-        windows.addAll(Window.getWindows());
-        for (Window window : windows) {
-            Object object = window.getUserData();
-            if (object != null && object instanceof InfoTreeManageController) {
-                try {
-                    controller = (WebFavoritesController) object;
-                    break;
-                } catch (Exception e) {
-                }
-            }
-        }
-        if (controller == null) {
-            controller = (InfoTreeManageController) WindowTools.openStage(Fxmls.InfoTreeManageFxml);
-        }
-        controller.requestMouse();
-        return controller;
-    }
-
 }
diff --git a/alpha/MyBox/src/main/java/mara/mybox/controller/MainMenuController_Document.java b/alpha/MyBox/src/main/java/mara/mybox/controller/MainMenuController_Document.java
@@ -13,12 +13,12 @@ public abstract class MainMenuController_Document extends MainMenuController_Win
 
     @FXML
     protected void openNotes(ActionEvent event) {
-        loadScene(Fxmls.NotesTreeFxml);
+        loadScene(Fxmls.NoteTreeFxml);
     }
 
     @FXML
     protected void InformationInTree(ActionEvent event) {
-        loadScene(Fxmls.InfoTreeManageFxml);
+        loadScene(Fxmls.InfoTreeFxml);
     }
 
     @FXML

diff --git a/alpha/MyBox/src/main/java/mara/mybox/controller/MyBoxController_Document.java b/alpha/MyBox/src/main/java/mara/mybox/controller/MyBoxController_Document.java
@@ -35,12 +35,12 @@ protected void showDocumentMenu(Event event) {
 
         MenuItem Notes = new MenuItem(message("Notes"));
         Notes.setOnAction((ActionEvent event1) -> {
-            loadScene(Fxmls.NotesTreeFxml);
+            loadScene(Fxmls.NoteTreeFxml);
         });
 
         MenuItem InformationInTree = new MenuItem(message("InformationInTree"));
         InformationInTree.setOnAction((ActionEvent event1) -> {
-            loadScene(Fxmls.InfoTreeManageFxml);
+            loadScene(Fxmls.InfoTreeFxml);
         });
 
         Menu pdfMenu = new Menu("PDF");

diff --git a/...mybox/controller/NotesTreeController.java → .../mybox/controller/NoteTreeController.java b/...mybox/controller/NotesTreeController.java → .../mybox/controller/NoteTreeController.java
@@ -15,12 +15,12 @@
  * @CreateDate 2024-8-8
  * @License Apache License Version 2.0
  */
-public class NotesTreeController extends BaseDataTreeManageController {
+public class NoteTreeController extends BaseDataTreeManageController {
 
     @FXML
     protected NoteNodeController noteController;
 
-    public NotesTreeController() {
+    public NoteTreeController() {
         baseTitle = Languages.message("Notes");
         TipsLabelKey = "NotesTips";
     }
@@ -42,22 +42,22 @@ public void initValues() {
     /*
         static methods
      */
-    public static NotesTreeController oneOpen() {
-        NotesTreeController controller = null;
+    public static NoteTreeController oneOpen() {
+        NoteTreeController controller = null;
         List<Window> windows = new ArrayList<>();
         windows.addAll(Window.getWindows());
         for (Window window : windows) {
             Object object = window.getUserData();
-            if (object != null && object instanceof NotesTreeController) {
+            if (object != null && object instanceof NoteTreeController) {
                 try {
-                    controller = (NotesTreeController) object;
+                    controller = (NoteTreeController) object;
                     break;
                 } catch (Exception e) {
                 }
             }
         }
         if (controller == null) {
-            controller = (NotesTreeController) WindowTools.openStage(Fxmls.NotesTreeFxml);
+            controller = (NoteTreeController) WindowTools.openStage(Fxmls.NoteTreeFxml);
         }
         controller.requestMouse();
         return controller;

diff --git a/alpha/MyBox/src/main/java/mara/mybox/db/DataMigration.java b/alpha/MyBox/src/main/java/mara/mybox/db/DataMigration.java
@@ -28,15 +28,15 @@
 import mara.mybox.db.data.Data2DDefinition;
 import mara.mybox.db.data.Data2DRow;
 import mara.mybox.db.data.Data2DStyle;
+import mara.mybox.db.data.DataNode;
+import mara.mybox.db.data.DataNodeTag;
+import mara.mybox.db.data.DataTag;
 import mara.mybox.db.data.GeographyCode;
 import mara.mybox.db.data.GeographyCodeLevel;
 import mara.mybox.db.data.GeographyCodeTools;
 import mara.mybox.db.data.ImageClipboard;
 import mara.mybox.db.data.ImageEditHistory;
 import mara.mybox.db.data.InfoNode;
-import mara.mybox.db.data.DataNode;
-import mara.mybox.db.data.DataNodeTag;
-import mara.mybox.db.data.DataTag;
 import mara.mybox.db.data.WebHistory;
 import static mara.mybox.db.table.BaseTable.StringMaxLength;
 import mara.mybox.db.table.BaseTreeData;
@@ -49,13 +49,15 @@
 import mara.mybox.db.table.TableData2DColumn;
 import mara.mybox.db.table.TableData2DDefinition;
 import mara.mybox.db.table.TableData2DStyle;
+import mara.mybox.db.table.TableDataNode;
+import mara.mybox.db.table.TableDataNodeTag;
 import mara.mybox.db.table.TableDataTag;
 import mara.mybox.db.table.TableGeographyCode;
 import mara.mybox.db.table.TableImageClipboard;
 import mara.mybox.db.table.TableImageEditHistory;
+import mara.mybox.db.table.TableInfo;
 import mara.mybox.db.table.TableInfoNode;
-import mara.mybox.db.table.TableDataNode;
-import mara.mybox.db.table.TableDataNodeTag;
+import mara.mybox.db.table.TableMathFunction;
 import mara.mybox.db.table.TableNote;
 import mara.mybox.db.table.TableStringValues;
 import mara.mybox.db.table.TableWebHistory;
@@ -207,6 +209,8 @@ private static void updateIn682(Connection conn) {
             MyBoxLog.info("Updating tables in 6.8.2...");
 
             updateIn682_move(conn, new TableNote(), "Notebook");
+            updateIn682_move(conn, new TableInfo(), "InformationInTree");
+            updateIn682_move(conn, new TableMathFunction(), "MathFunction");
 
             try (Statement statement = conn.createStatement()) {
                 conn.setAutoCommit(true);
@@ -236,6 +240,12 @@ private static void updateIn682_move(Connection conn, BaseTreeData dataTable, St
             statement.executeUpdate("DROP TABLE " + tname);
             dataTable.createTable(conn);
             dataTable.initTreeTables(conn);
+        } catch (Exception e) {
+            MyBoxLog.console(e);
+        }
+
+        try (Statement statement = conn.createStatement()) {
+            conn.setAutoCommit(true);
             statement.executeUpdate("DROP TABLE MYBOX_TMP_TREE_Migration682");
             statement.executeUpdate("DROP TABLE MYBOX_TMP_TAG_Migration682");
         } catch (Exception e) {