a6.8.2

Mararsh · Aug 11, 2024 · a9610a5 · a9610a5
1 parent 89231f8
commit a9610a5
Show file tree

Hide file tree

Showing 24 changed files with 1,027 additions and 799 deletions.
diff --git a/alpha/MyBox/src/main/java/mara/mybox/controller/BaseDataTreeController.java b/alpha/MyBox/src/main/java/mara/mybox/controller/BaseDataTreeController.java
@@ -5,7 +5,7 @@
 import mara.mybox.db.data.VisitHistory;
 import mara.mybox.db.table.BaseTable;
 import mara.mybox.db.table.TableTag;
-import mara.mybox.db.table.TableTree;
+import mara.mybox.db.table.TableTreeNode;
 import mara.mybox.db.table.TableTreeTag;
 import mara.mybox.dev.MyBoxLog;
 import mara.mybox.fxml.FxSingletonTask;
@@ -21,7 +21,7 @@ public abstract class BaseDataTreeController extends BaseController {
     protected BaseDataTreeNodeController nodeController;
 
     protected BaseTable dataTable;
-    protected TableTree treeTable;
+    protected TableTreeNode treeTable;
     protected TableTag tagTable;
     protected TableTreeTag treeTagTable;
 
@@ -38,7 +38,7 @@ public void initControls() {
             if (dataTable == null) {
                 return;
             }
-            treeTable = new TableTree(dataTable);
+            treeTable = new TableTreeNode(dataTable);
             tagTable = new TableTag();
             treeTagTable = new TableTreeTag(treeTable);
 

diff --git a/alpha/MyBox/src/main/java/mara/mybox/controller/BaseInfoTreeController.java b/alpha/MyBox/src/main/java/mara/mybox/controller/BaseInfoTreeController.java
@@ -13,8 +13,8 @@
 import mara.mybox.db.data.InfoNode;
 import mara.mybox.db.data.VisitHistory;
 import mara.mybox.db.table.TableTag;
-import mara.mybox.db.table.TableTreeNode;
-import mara.mybox.db.table.TableTreeNodeTag;
+import mara.mybox.db.table.TableInfoNode;
+import mara.mybox.db.table.TableInfoNodeTag;
 import mara.mybox.dev.MyBoxLog;
 import mara.mybox.fxml.FxSingletonTask;
 import mara.mybox.fxml.PopTools;
@@ -30,9 +30,9 @@ public abstract class BaseInfoTreeController extends BaseController {
 
     protected ControlInfoTreeList infoTree;
     protected String category;
-    protected TableTreeNode tableTreeNode;
+    protected TableInfoNode tableTreeNode;
     protected TableTag tableTag;
-    protected TableTreeNodeTag tableTreeNodeTag;
+    protected TableInfoNodeTag tableTreeNodeTag;
     protected String nameMsg, valueMsg, timeMsg;
 
     @FXML
@@ -76,9 +76,9 @@ public void initValues() {
         try {
             super.initValues();
 
-            tableTreeNode = new TableTreeNode();
+            tableTreeNode = new TableInfoNode();
             tableTag = new TableTag();
-            tableTreeNodeTag = new TableTreeNodeTag();
+            tableTreeNodeTag = new TableInfoNodeTag();
 
             infoTree = listController;
         } catch (Exception e) {

diff --git a/alpha/MyBox/src/main/java/mara/mybox/controller/ControlDataTreeManage.java b/alpha/MyBox/src/main/java/mara/mybox/controller/ControlDataTreeManage.java
@@ -19,13 +19,10 @@
 import javafx.scene.control.ToggleGroup;
 import javafx.scene.control.TreeItem;
 import javafx.scene.input.MouseEvent;
-import javafx.scene.paint.Color;
 import mara.mybox.db.DerbyBase;
 import mara.mybox.db.data.TreeNode;
 import static mara.mybox.db.data.TreeNode.TitleSeparater;
-import mara.mybox.db.data.TreeNodeTag;
 import mara.mybox.dev.MyBoxLog;
-import mara.mybox.fximage.FxColorTools;
 import mara.mybox.fxml.FxSingletonTask;
 import mara.mybox.fxml.FxTask;
 import mara.mybox.fxml.PopTools;
@@ -712,27 +709,27 @@ protected void treeView(FxTask infoTask, BufferedWriter writer, Connection conn,
             }
             writer.write(indentNode + "<DIV style=\"padding: 2px;\">" + spaceNode
                     + displayName + "\n");
-            List<TreeNodeTag> tags = treeTagTable.nodeTags(conn, node.getNodeid());
-            if (tags != null && !tags.isEmpty()) {
-                String indentTag = " ".repeat(indent + 8);
-                String spaceTag = "&nbsp;".repeat(2);
-                writer.write(indentTag + "<SPAN class=\"NodeTag\">\n");
-                for (TreeNodeTag nodeTag : tags) {
-                    if (infoTask != null && !infoTask.isWorking()) {
-                        return;
-                    }
-                    Color color = nodeTag.getTag().getColor();
-                    if (color == null) {
-                        color = FxColorTools.randomColor();
-                    }
-                    writer.write(indentTag + spaceTag
-                            + "<SPAN style=\"border-radius:4px; padding: 2px; font-size:0.8em;  background-color: "
-                            + FxColorTools.color2rgb(color)
-                            + "; color: " + FxColorTools.color2rgb(FxColorTools.foreColor(color))
-                            + ";\">" + nodeTag.getTag().getTag() + "</SPAN>\n");
-                }
-                writer.write(indentTag + "</SPAN>\n");
-            }
+//            List<TreeNodeTag> tags = treeTagTable.nodeTags(conn, node.getNodeid());
+//            if (tags != null && !tags.isEmpty()) {
+//                String indentTag = " ".repeat(indent + 8);
+//                String spaceTag = "&nbsp;".repeat(2);
+//                writer.write(indentTag + "<SPAN class=\"NodeTag\">\n");
+//                for (TreeNodeTag nodeTag : tags) {
+//                    if (infoTask != null && !infoTask.isWorking()) {
+//                        return;
+//                    }
+//                    Color color = nodeTag.getTag().getColor();
+//                    if (color == null) {
+//                        color = FxColorTools.randomColor();
+//                    }
+//                    writer.write(indentTag + spaceTag
+//                            + "<SPAN style=\"border-radius:4px; padding: 2px; font-size:0.8em;  background-color: "
+//                            + FxColorTools.color2rgb(color)
+//                            + "; color: " + FxColorTools.color2rgb(FxColorTools.foreColor(color))
+//                            + ";\">" + nodeTag.getTag().getTag() + "</SPAN>\n");
+//                }
+//                writer.write(indentTag + "</SPAN>\n");
+//            }
             writer.write(indentNode + "</DIV>\n");
 //            String infoDisplay = TreeNode.infoHtml(infoTask, myController, category, node.getInfo(), true, true);
 //            if (infoDisplay != null && !infoDisplay.isBlank()) {

diff --git a/alpha/MyBox/src/main/java/mara/mybox/controller/ControlDataTreeNodeAttributes.java b/alpha/MyBox/src/main/java/mara/mybox/controller/ControlDataTreeNodeAttributes.java
@@ -9,7 +9,7 @@
 import mara.mybox.db.DerbyBase;
 import mara.mybox.db.data.TreeNode;
 import mara.mybox.db.table.BaseTable;
-import mara.mybox.db.table.TableTree;
+import mara.mybox.db.table.TableTreeNode;
 import mara.mybox.dev.MyBoxLog;
 import mara.mybox.fxml.FxTask;
 import mara.mybox.tools.DateTools;
@@ -24,7 +24,7 @@ public class ControlDataTreeNodeAttributes extends BaseController {
 
     protected BaseDataTreeController dataController;
     protected BaseDataTreeNodeController nodeController;
-    protected TableTree tableTree;
+    protected TableTreeNode tableTree;
     protected FxTask tagsTask;
     protected BaseTable dataTable;
     protected TreeNode parentNode, currentNode;

diff --git a/alpha/MyBox/src/main/java/mara/mybox/controller/ControlDataTreeNodeTags.java b/alpha/MyBox/src/main/java/mara/mybox/controller/ControlDataTreeNodeTags.java
@@ -18,7 +18,7 @@
 import mara.mybox.db.table.BaseTable;
 import mara.mybox.db.table.TableColor;
 import mara.mybox.db.table.TableTag;
-import mara.mybox.db.table.TableTree;
+import mara.mybox.db.table.TableTreeNode;
 import mara.mybox.db.table.TableTreeTag;
 import mara.mybox.dev.MyBoxLog;
 import mara.mybox.fximage.FxColorTools;
@@ -36,7 +36,7 @@
 public class ControlDataTreeNodeTags extends BaseSysTableController<Tag> {
 
     protected BaseDataTreeController dataController;
-    protected TableTree tableTree;
+    protected TableTreeNode tableTree;
     protected TableTag tableTag;
     protected TableTreeTag tableTreeTag;
     protected BaseTable dataTable;

diff --git a/alpha/MyBox/src/main/java/mara/mybox/controller/ControlDataTreeTable.java b/alpha/MyBox/src/main/java/mara/mybox/controller/ControlDataTreeTable.java
@@ -30,7 +30,7 @@
 import mara.mybox.db.data.Tag;
 import mara.mybox.db.data.TreeNode;
 import mara.mybox.db.table.TableStringValues;
-import mara.mybox.db.table.TableTree;
+import mara.mybox.db.table.TableTreeNode;
 import mara.mybox.dev.MyBoxLog;
 import mara.mybox.fxml.FxTask;
 import mara.mybox.fxml.cell.TableTextTrimCell;
@@ -48,7 +48,7 @@ public class ControlDataTreeTable extends BaseSysTableController<TreeNode> {
 
     protected BaseDataTreeController dataController;
     protected BaseDataTreeManageController manager;
-    protected TableTree tableTree;
+    protected TableTreeNode tableTree;
     protected String queryLabel;
     protected TreeNode loadedParent;
 

diff --git a/alpha/MyBox/src/main/java/mara/mybox/controller/ControlDataTreeView.java b/alpha/MyBox/src/main/java/mara/mybox/controller/ControlDataTreeView.java
@@ -20,7 +20,7 @@
 import mara.mybox.db.data.TreeNode;
 import static mara.mybox.db.data.TreeNode.TitleSeparater;
 import mara.mybox.db.table.BaseTable;
-import mara.mybox.db.table.TableTree;
+import mara.mybox.db.table.TableTreeNode;
 import mara.mybox.db.table.TableTreeTag;
 import mara.mybox.dev.MyBoxLog;
 import mara.mybox.fxml.FxSingletonTask;
@@ -43,7 +43,7 @@ public class ControlDataTreeView extends BaseTreeTableViewController<TreeNode> {
     protected BaseDataTreeController dataController;
     protected static final int AutoExpandThreshold = 500;
     protected boolean expandAll;
-    protected TableTree treeTable;
+    protected TableTreeNode treeTable;
     protected TableTreeTag treeTagTable;
     protected BaseTable dataTable;
 

diff --git a/alpha/MyBox/src/main/java/mara/mybox/controller/ControlInfoTreeList.java b/alpha/MyBox/src/main/java/mara/mybox/controller/ControlInfoTreeList.java
@@ -22,8 +22,8 @@
 import mara.mybox.db.DerbyBase;
 import mara.mybox.db.data.InfoNode;
 import static mara.mybox.db.data.InfoNode.TitleSeparater;
-import mara.mybox.db.table.TableTreeNode;
-import mara.mybox.db.table.TableTreeNodeTag;
+import mara.mybox.db.table.TableInfoNode;
+import mara.mybox.db.table.TableInfoNodeTag;
 import mara.mybox.dev.MyBoxLog;
 import mara.mybox.fxml.FxSingletonTask;
 import mara.mybox.fxml.HelpTools;
@@ -44,8 +44,8 @@ public class ControlInfoTreeList extends BaseTreeTableViewController<InfoNode> {
     protected BaseInfoTreeController infoController;
     protected static final int AutoExpandThreshold = 500;
     protected boolean expandAll;
-    protected TableTreeNode tableTreeNode;
-    protected TableTreeNodeTag tableTreeNodeTag;
+    protected TableInfoNode tableTreeNode;
+    protected TableInfoNodeTag tableTreeNodeTag;
     protected String category;
 
     @FXML

diff --git a/alpha/MyBox/src/main/java/mara/mybox/controller/ControlInfoTreeTable.java b/alpha/MyBox/src/main/java/mara/mybox/controller/ControlInfoTreeTable.java
@@ -30,7 +30,7 @@
 import mara.mybox.db.data.InfoNode;
 import mara.mybox.db.data.Tag;
 import mara.mybox.db.table.TableStringValues;
-import mara.mybox.db.table.TableTreeNode;
+import mara.mybox.db.table.TableInfoNode;
 import mara.mybox.dev.MyBoxLog;
 import mara.mybox.fxml.FxTask;
 import mara.mybox.fxml.cell.TableTextTrimCell;
@@ -48,7 +48,7 @@ public class ControlInfoTreeTable extends BaseSysTableController<InfoNode> {
 
     protected BaseInfoTreeController infoController;
     protected InfoTreeManageController manager;
-    protected TableTreeNode tableTreeNode;
+    protected TableInfoNode tableTreeNode;
     protected String queryLabel;
     protected InfoNode loadedParent;
 

diff --git a/alpha/MyBox/src/main/java/mara/mybox/controller/ControlJavaScriptRefer.java b/alpha/MyBox/src/main/java/mara/mybox/controller/ControlJavaScriptRefer.java
@@ -9,8 +9,8 @@
 import javafx.scene.control.TreeItem;
 import javafx.scene.input.MouseEvent;
 import mara.mybox.db.data.InfoNode;
-import mara.mybox.db.table.TableTreeNode;
-import mara.mybox.db.table.TableTreeNodeTag;
+import mara.mybox.db.table.TableInfoNode;
+import mara.mybox.db.table.TableInfoNodeTag;
 import mara.mybox.dev.MyBoxLog;
 import mara.mybox.fxml.PopTools;
 import mara.mybox.value.UserConfig;
@@ -37,8 +37,8 @@ public void initControls() {
         try {
             super.initControls();
 
-            tableTreeNode = new TableTreeNode();
-            tableTreeNodeTag = new TableTreeNodeTag();
+            tableTreeNode = new TableInfoNode();
+            tableTreeNodeTag = new TableInfoNodeTag();
             loadTree();
 
             placeholdersList.getSelectionModel().setSelectionMode(SelectionMode.SINGLE);

diff --git a/alpha/MyBox/src/main/java/mara/mybox/controller/InfoTreeNodeExportController.java b/alpha/MyBox/src/main/java/mara/mybox/controller/InfoTreeNodeExportController.java
@@ -24,8 +24,8 @@
 import mara.mybox.db.data.InfoNode;
 import mara.mybox.db.data.InfoNodeTag;
 import mara.mybox.db.data.VisitHistory;
-import mara.mybox.db.table.TableTreeNode;
-import mara.mybox.db.table.TableTreeNodeTag;
+import mara.mybox.db.table.TableInfoNode;
+import mara.mybox.db.table.TableInfoNodeTag;
 import mara.mybox.dev.MyBoxLog;
 import mara.mybox.fximage.FxColorTools;
 import mara.mybox.fxml.FxTask;
@@ -48,8 +48,8 @@
 public class InfoTreeNodeExportController extends BaseTaskController {
 
     protected BaseInfoTreeController manager;
-    protected TableTreeNode tableTreeNode;
-    protected TableTreeNodeTag tableTreeNodeTag;
+    protected TableInfoNode tableTreeNode;
+    protected TableInfoNodeTag tableTreeNodeTag;
     protected TreeTableView<InfoNode> infoTree;
     protected TreeItem<InfoNode> selectedNode;
     protected File textsFile, xmlFile, jsonFile, htmlFile, framesetFile, framesetNavFile;

diff --git a/alpha/MyBox/src/main/java/mara/mybox/controller/InfoTreeNodeImportController.java b/alpha/MyBox/src/main/java/mara/mybox/controller/InfoTreeNodeImportController.java
@@ -20,8 +20,8 @@
 import mara.mybox.db.data.Tag;
 import mara.mybox.db.data.VisitHistory;
 import mara.mybox.db.table.TableTag;
-import mara.mybox.db.table.TableTreeNode;
-import mara.mybox.db.table.TableTreeNodeTag;
+import mara.mybox.db.table.TableInfoNode;
+import mara.mybox.db.table.TableInfoNodeTag;
 import mara.mybox.dev.MyBoxLog;
 import mara.mybox.fxml.FxTask;
 import mara.mybox.fxml.HelpTools;
@@ -43,8 +43,8 @@
 public class InfoTreeNodeImportController extends BaseBatchFileController {
 
     protected BaseInfoTreeController infoController;
-    protected TableTreeNode tableTreeNode;
-    protected TableTreeNodeTag tableTreeNodeTag;
+    protected TableInfoNode tableTreeNode;
+    protected TableInfoNodeTag tableTreeNodeTag;
     protected TableTag tableTag;
     protected InfoNode rootNode;
     protected String category;
@@ -130,7 +130,7 @@ public boolean makeMoreParameters() {
             return false;
         }
         if (tableTreeNode == null) {
-            tableTreeNode = new TableTreeNode();
+            tableTreeNode = new TableInfoNode();
         }
         rootNode = tableTreeNode.findAndCreateRoot(category);
         if (rootNode == null) {

diff --git a/alpha/MyBox/src/main/java/mara/mybox/controller/InfoTreeTagsController.java b/alpha/MyBox/src/main/java/mara/mybox/controller/InfoTreeTagsController.java
@@ -17,8 +17,8 @@
 import mara.mybox.db.data.Tag;
 import mara.mybox.db.table.TableColor;
 import mara.mybox.db.table.TableTag;
-import mara.mybox.db.table.TableTreeNode;
-import mara.mybox.db.table.TableTreeNodeTag;
+import mara.mybox.db.table.TableInfoNode;
+import mara.mybox.db.table.TableInfoNodeTag;
 import mara.mybox.dev.MyBoxLog;
 import mara.mybox.fximage.FxColorTools;
 import mara.mybox.fxml.FxTask;
@@ -35,9 +35,9 @@
 public class InfoTreeTagsController extends BaseSysTableController<Tag> {
 
     protected BaseInfoTreeController infoController;
-    protected TableTreeNode tableTreeNode;
+    protected TableInfoNode tableTreeNode;
     protected TableTag tableTag;
-    protected TableTreeNodeTag tableTreeNodeTag;
+    protected TableInfoNodeTag tableTreeNodeTag;
     protected String category;
     protected InfoNode currentNode;
 

diff --git a/alpha/MyBox/src/main/java/mara/mybox/controller/WebFavoriteAddController.java b/alpha/MyBox/src/main/java/mara/mybox/controller/WebFavoriteAddController.java
@@ -5,8 +5,8 @@
 import javafx.scene.control.TextField;
 import javafx.scene.control.TreeItem;
 import mara.mybox.db.data.InfoNode;
-import mara.mybox.db.table.TableTreeNode;
-import mara.mybox.db.table.TableTreeNodeTag;
+import mara.mybox.db.table.TableInfoNode;
+import mara.mybox.db.table.TableInfoNodeTag;
 import mara.mybox.dev.MyBoxLog;
 import mara.mybox.fxml.FxSingletonTask;
 import mara.mybox.fxml.WindowTools;
@@ -35,8 +35,8 @@ public void initControls() {
         try {
             super.initControls();
 
-            tableTreeNode = new TableTreeNode();
-            tableTreeNodeTag = new TableTreeNodeTag();
+            tableTreeNode = new TableInfoNode();
+            tableTreeNodeTag = new TableInfoNodeTag();
             category = InfoNode.WebFavorite;
 
             loadTree();