a6.8.2

Mararsh · Aug 13, 2024 · a7a47f4 · a7a47f4
1 parent 27e8cac
commit a7a47f4
Show file tree

Hide file tree

Showing 93 changed files with 2,288 additions and 1,492 deletions.
diff --git a/alpha/MyBox/src/main/java/mara/mybox/bufferedimage/ImageScope.java b/alpha/MyBox/src/main/java/mara/mybox/bufferedimage/ImageScope.java
@@ -74,6 +74,21 @@ private void init() {
         clearValues();
     }
 
+    @Override
+    public boolean valid() {
+        return valid(this);
+    }
+
+    @Override
+    public boolean setValue(String column, Object value) {
+        return setValue(this, column, value);
+    }
+
+    @Override
+    public Object getValue(String column) {
+        return getValue(this, column);
+    }
+
     public final void clearValues() {
         colors = new ArrayList<>();
         points = new ArrayList<>();

diff --git a/alpha/MyBox/src/main/java/mara/mybox/controller/BaseDataTreeController.java b/alpha/MyBox/src/main/java/mara/mybox/controller/BaseDataTreeController.java
@@ -1,11 +1,11 @@
 package mara.mybox.controller;
 
 import javafx.scene.input.KeyEvent;
-import mara.mybox.db.data.TreeNode;
+import mara.mybox.db.data.DataNode;
 import mara.mybox.db.data.VisitHistory;
 import mara.mybox.db.table.BaseTreeData;
 import mara.mybox.db.table.TableTag;
-import mara.mybox.db.table.TableNode;
+import mara.mybox.db.table.TableDataNode;
 import mara.mybox.db.table.TableDataTag;
 import mara.mybox.dev.MyBoxLog;
 import mara.mybox.fxml.FxSingletonTask;
@@ -21,7 +21,7 @@ public abstract class BaseDataTreeController extends BaseController {
     protected BaseDataTreeNodeController nodeController;
 
     protected BaseTreeData dataTable;
-    protected TableNode treeTable;
+    protected TableDataNode treeTable;
     protected TableTag tagTable;
     protected TableDataTag treeTagTable;
 
@@ -38,7 +38,7 @@ public void initControls() {
             if (dataTable == null) {
                 return;
             }
-            treeTable = new TableNode(dataTable);
+            treeTable = new TableDataNode(dataTable);
             tagTable = new TableTag();
             treeTagTable = new TableDataTag(dataTable);
 
@@ -51,7 +51,7 @@ public void initControls() {
         }
     }
 
-    public void popNode(TreeNode item) {
+    public void popNode(DataNode item) {
         if (item == null) {
             return;
         }

diff --git a/alpha/MyBox/src/main/java/mara/mybox/controller/BaseDataTreeManageController.java b/alpha/MyBox/src/main/java/mara/mybox/controller/BaseDataTreeManageController.java
@@ -12,7 +12,7 @@
 import javafx.stage.Stage;
 import javafx.stage.Window;
 import mara.mybox.db.DerbyBase;
-import mara.mybox.db.data.TreeNode;
+import mara.mybox.db.data.DataNode;
 import mara.mybox.fxml.FxSingletonTask;
 import mara.mybox.fxml.WindowTools;
 import mara.mybox.value.Fxmls;
@@ -32,14 +32,14 @@ public abstract class BaseDataTreeManageController extends BaseDataTreeControlle
     /*
         synchronize
      */
-    public void nodeAdded(TreeNode parent, TreeNode newNode) {
+    public void nodeAdded(DataNode parent, DataNode newNode) {
         if (parent == null || newNode == null) {
             return;
         }
 
     }
 
-    public void nodeRenamed(TreeNode node) {
+    public void nodeRenamed(DataNode node) {
         if (node == null) {
             return;
         }
@@ -55,7 +55,7 @@ public void nodeRenamed(TreeNode node) {
         }
     }
 
-    public void nodeDeleted(TreeNode node) {
+    public void nodeDeleted(DataNode node) {
         if (node == null) {
             return;
         }
@@ -64,7 +64,7 @@ public void nodeDeleted(TreeNode node) {
         nodeController.editNode(null);
     }
 
-    public void nodeMoved(TreeNode parent, TreeNode node) {
+    public void nodeMoved(DataNode parent, DataNode node) {
         if (parent == null || node == null) {
             return;
         }
@@ -80,14 +80,14 @@ public void nodeMoved(TreeNode parent, TreeNode node) {
         }
     }
 
-    public void nodesMoved(TreeNode parent, List<TreeNode> nodes) {
+    public void nodesMoved(DataNode parent, List<DataNode> nodes) {
         if (parent == null || nodes == null || nodes.isEmpty()) {
             return;
         }
         treeController.loadTree(parent);
     }
 
-    public void nodesCopied(TreeNode parent) {
+    public void nodesCopied(DataNode parent) {
         treeController.loadTree(parent);
     }
 
@@ -171,7 +171,7 @@ public void nodeChanged() {
     /*
         tree
      */
-    public boolean editNode(TreeNode node) {
+    public boolean editNode(DataNode node) {
         if (!checkBeforeNextAction()) {
             return false;
         }
@@ -189,11 +189,11 @@ protected void moveAction() {
 //        InfoTreeNodesMoveController.oneOpen(this);
     }
 
-    public void pasteNode(TreeNode node) {
+    public void pasteNode(DataNode node) {
         nodeController.pasteNode(node);
     }
 
-    public void executeNode(TreeNode node) {
+    public void executeNode(DataNode node) {
         if (node == null) {
             return;
         }

diff --git a/alpha/MyBox/src/main/java/mara/mybox/controller/BaseDataTreeNodeController.java b/alpha/MyBox/src/main/java/mara/mybox/controller/BaseDataTreeNodeController.java
@@ -5,8 +5,8 @@
 import javafx.fxml.FXML;
 import javafx.scene.control.Tab;
 import javafx.scene.input.KeyEvent;
-import mara.mybox.db.data.TreeNode;
-import static mara.mybox.db.data.TreeNode.TitleSeparater;
+import mara.mybox.db.data.DataNode;
+import static mara.mybox.db.data.DataNode.TitleSeparater;
 import mara.mybox.db.data.VisitHistory;
 import mara.mybox.dev.MyBoxLog;
 import static mara.mybox.value.Languages.message;
@@ -52,7 +52,7 @@ public void setParameters(BaseDataTreeController controller) {
         }
     }
 
-    protected boolean editNode(TreeNode node) {
+    protected boolean editNode(DataNode node) {
         updateEditorTitle(node);
         attributesController.editNode(node);
         editValue(node);
@@ -61,7 +61,7 @@ protected boolean editNode(TreeNode node) {
         return true;
     }
 
-    protected void updateEditorTitle(TreeNode node) {
+    protected void updateEditorTitle(DataNode node) {
         if (node != null) {
             dataController.setTitle(dataController.baseTitle + ": "
                     + node.getNodeid() + " - " + node.getTitle());
@@ -70,15 +70,15 @@ protected void updateEditorTitle(TreeNode node) {
         }
     }
 
-    protected void editValue(TreeNode node) {
+    protected void editValue(DataNode node) {
     }
 
-    public TreeNode pickNodeData() {
+    public DataNode pickNodeData() {
         String title = nodeTitle();
         if (title == null || title.isBlank()) {
             return null;
         }
-        TreeNode node = TreeNode.create()
+        DataNode node = DataNode.create()
                 .setDataTable(dataController.dataTable)
                 .setTitle(title);
         return pickValue(node);
@@ -190,7 +190,7 @@ public void saveNode() {
 //        start(task);
     }
 
-    protected TreeNode pickValue(TreeNode node) {
+    protected DataNode pickValue(DataNode node) {
         if (node == null) {
             return null;
         }
@@ -356,7 +356,7 @@ public void sourceFileChanged(File file) {
 //        start(task, thisPane);
     }
 
-    public void pasteNode(TreeNode node) {
+    public void pasteNode(DataNode node) {
 //        if (valueInput == null || node == null) {
 //            return;
 //        }