From df4c9cdfde426b287342b82d4080f328b15ae195 Mon Sep 17 00:00:00 2001 From: Kalven Date: Fri, 6 Sep 2019 16:50:17 +0800 Subject: [PATCH] =?UTF-8?q?KERNEL-1161=20=E5=88=A0=E9=99=A4=E6=B3=A8?= =?UTF-8?q?=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fr/plugin/widget/ztree/core/ZTree.java | 23 ++++++------------- .../plugin/widget/ztree/core/ZTreeAttr.java | 6 ++--- .../widget/ztree/core/ZTreeMarkInCell.java | 4 ++-- .../widget/ztree/core/ZTreeMarkInForm.java | 1 - .../plugin/widget/ztree/core/ZTreeNode.java | 6 ++--- .../com/fr/plugin/widget/ztree/ui/XZTree.java | 3 --- .../ztree/ui/control/ZTreeControlPane.java | 3 +-- .../ztree/ui/control/ZTreeNodePane.java | 1 - .../ui/editor/AccessibleZTreeModelEditor.java | 3 +-- .../ztree/ui/editor/ZTreeCascadeWrapper.java | 4 ++-- .../ztree/ui/editor/ZTreeModelWrapper.java | 1 - .../ztree/ui/editor/ZTreeStyleWrapper.java | 2 +- 12 files changed, 18 insertions(+), 39 deletions(-) diff --git a/src/main/java/com/fr/plugin/widget/ztree/core/ZTree.java b/src/main/java/com/fr/plugin/widget/ztree/core/ZTree.java index 6d17cc2..ef0b992 100644 --- a/src/main/java/com/fr/plugin/widget/ztree/core/ZTree.java +++ b/src/main/java/com/fr/plugin/widget/ztree/core/ZTree.java @@ -7,28 +7,23 @@ import com.fanruan.api.runtime.PluginKit; import com.fanruan.api.xml.XmlKit; -import com.fr.intelli.record.Focus; import com.fr.record.analyzer.EnableMetrics; -import com.fr.stable.fun.FunctionProcessor;//过时 -import com.fr.general.ModuleContext;//过时方法 +import com.fr.general.ModuleContext; -import com.fr.form.ui.WidgetValue;//DataControl中定义了抽象方法，参数为WidgetValue，无法重写 -import com.fr.json.JSONArray;//抽象方法 -import com.fr.json.JSONException;//抽象方法 -import com.fr.json.JSONObject;//抽象方法 -import com.fr.stable.core.NodeVisitor;//抽象方法 -import com.fr.web.core.TemplateSessionIDInfo;//抽象方法 +import com.fr.form.ui.WidgetValue; +import com.fr.json.JSONArray; +import com.fr.json.JSONException; +import com.fr.json.JSONObject; +import com.fr.stable.core.NodeVisitor; +import com.fr.web.core.TemplateSessionIDInfo; -//open import com.fr.stable.xml.XMLPrintWriter; import com.fr.stable.xml.XMLableReader; import com.fr.script.Calculator; import com.fr.stable.web.Repository; -//接口 import com.fr.form.ui.DataControl; import javax.servlet.http.HttpServletRequest; -import com.fr.plugin.ExtraClassManager; /** * Created by richie on 15/11/17. @@ -127,10 +122,6 @@ public class ZTree extends CustomWriteAbleRepeatEditor implements DataControl { if (treeAttr != null) { treeAttr.mixConfig(conf); } -// FunctionProcessor processor = ExtraClassManager.getInstance().getFunctionProcessor(); -// if (processor != null) { -// processor.recordFunction(ZTreeFunctionProcessor.getInstance()); -// } return conf; } diff --git a/src/main/java/com/fr/plugin/widget/ztree/core/ZTreeAttr.java b/src/main/java/com/fr/plugin/widget/ztree/core/ZTreeAttr.java index 488894f..aa82563 100644 --- a/src/main/java/com/fr/plugin/widget/ztree/core/ZTreeAttr.java +++ b/src/main/java/com/fr/plugin/widget/ztree/core/ZTreeAttr.java @@ -1,13 +1,11 @@ package com.fr.plugin.widget.ztree.core; -import com.fr.json.JSONException;//抽象 -import com.fr.json.JSONObject;//这个换ZTree也要换，所以不能动 +import com.fr.json.JSONException; +import com.fr.json.JSONObject; -//open import com.fr.stable.xml.XMLPrintWriter; import com.fr.stable.xml.XMLableReader; -//接口 import com.fr.stable.xml.XMLable; /** diff --git a/src/main/java/com/fr/plugin/widget/ztree/core/ZTreeMarkInCell.java b/src/main/java/com/fr/plugin/widget/ztree/core/ZTreeMarkInCell.java index 22c013e..cea26da 100644 --- a/src/main/java/com/fr/plugin/widget/ztree/core/ZTreeMarkInCell.java +++ b/src/main/java/com/fr/plugin/widget/ztree/core/ZTreeMarkInCell.java @@ -4,10 +4,10 @@ package com.fr.plugin.widget.ztree.core; import com.fanruan.api.i18n.I18nKit; import com.fr.design.fun.impl.AbstractCellWidgetOptionProvider; import com.fr.plugin.widget.ztree.ui.ZTreeDefinePane; -//open + import com.fr.design.beans.BasicBeanPane; -import com.fr.form.ui.Widget;//抽象 +import com.fr.form.ui.Widget; /** * Created by richie on 15/11/17. diff --git a/src/main/java/com/fr/plugin/widget/ztree/core/ZTreeMarkInForm.java b/src/main/java/com/fr/plugin/widget/ztree/core/ZTreeMarkInForm.java index ef44da1..d783c4f 100644 --- a/src/main/java/com/fr/plugin/widget/ztree/core/ZTreeMarkInForm.java +++ b/src/main/java/com/fr/plugin/widget/ztree/core/ZTreeMarkInForm.java @@ -5,7 +5,6 @@ import com.fr.design.fun.ParameterWidgetOptionProvider; import com.fr.design.fun.impl.AbstractFormWidgetOptionProvider; import com.fr.plugin.widget.ztree.ui.XZTree; -//抽象 import com.fr.form.ui.Widget; /** diff --git a/src/main/java/com/fr/plugin/widget/ztree/core/ZTreeNode.java b/src/main/java/com/fr/plugin/widget/ztree/core/ZTreeNode.java index aab08ed..9f3b60a 100644 --- a/src/main/java/com/fr/plugin/widget/ztree/core/ZTreeNode.java +++ b/src/main/java/com/fr/plugin/widget/ztree/core/ZTreeNode.java @@ -6,17 +6,15 @@ import com.fanruan.api.util.GeneralKit; import com.fanruan.api.xml.XmlKit; import com.fr.plugin.widget.ztree.tools.ZTreeHelper; -//需要用子类传入时用CalculatorProvider出错 import com.fr.script.Calculator; -//open import com.fr.stable.xml.XMLPrintWriter; import com.fr.stable.xml.XMLableReader; -//放下 + import com.fr.json.JSONArray; import com.fr.json.JSONException; import com.fr.json.JSONObject; -//接口 + import com.fr.data.Dictionary; import com.fr.stable.script.NameSpace; import com.fr.stable.xml.XMLable; diff --git a/src/main/java/com/fr/plugin/widget/ztree/ui/XZTree.java b/src/main/java/com/fr/plugin/widget/ztree/ui/XZTree.java index ed6c2aa..52683da 100644 --- a/src/main/java/com/fr/plugin/widget/ztree/ui/XZTree.java +++ b/src/main/java/com/fr/plugin/widget/ztree/ui/XZTree.java @@ -2,7 +2,6 @@ package com.fr.plugin.widget.ztree.ui; import com.fanruan.api.design.ui.component.UITextField; -//import com.fr.design.designer.creator.*; import com.fanruan.api.design.util.GUICoreKit; import com.fanruan.api.design.work.form.creator.XFieldEditor; import com.fanruan.api.design.work.form.editor.WidgetValueEditor; @@ -19,9 +18,7 @@ import com.fr.plugin.widget.ztree.ui.editor.ZTreeStyleEditor; import com.fr.plugin.widget.ztree.ui.renderer.ZTreeCascadeRenderer; import com.fr.plugin.widget.ztree.ui.renderer.ZTreeModelRenderer; import com.fr.plugin.widget.ztree.ui.renderer.ZTreeStyleRenderer; -//import com.fr.stable.ArrayUtils; -//有问题 import com.fr.design.designer.creator.CRPropertyDescriptor; import javax.swing.*; diff --git a/src/main/java/com/fr/plugin/widget/ztree/ui/control/ZTreeControlPane.java b/src/main/java/com/fr/plugin/widget/ztree/ui/control/ZTreeControlPane.java index 121b555..be8c264 100644 --- a/src/main/java/com/fr/plugin/widget/ztree/ui/control/ZTreeControlPane.java +++ b/src/main/java/com/fr/plugin/widget/ztree/ui/control/ZTreeControlPane.java @@ -9,10 +9,9 @@ import com.fanruan.api.util.IOKit; import com.fr.plugin.widget.ztree.core.ZTreeNode; -//open + import com.fr.design.dialog.BasicPane; -//com.fr包中方法返回该类，无法封装，父类对象无法赋值给子类 import com.fr.design.gui.itoolbar.UIToolbar; import javax.swing.*; diff --git a/src/main/java/com/fr/plugin/widget/ztree/ui/control/ZTreeNodePane.java b/src/main/java/com/fr/plugin/widget/ztree/ui/control/ZTreeNodePane.java index 1be9b23..aaf0372 100644 --- a/src/main/java/com/fr/plugin/widget/ztree/ui/control/ZTreeNodePane.java +++ b/src/main/java/com/fr/plugin/widget/ztree/ui/control/ZTreeNodePane.java @@ -5,7 +5,6 @@ import com.fanruan.api.design.ui.component.present.DictionaryPane; import com.fr.design.beans.BasicBeanPane; import com.fr.plugin.widget.ztree.core.ZTreeNode; -//接口 import com.fr.data.Dictionary; import java.awt.*; diff --git a/src/main/java/com/fr/plugin/widget/ztree/ui/editor/AccessibleZTreeModelEditor.java b/src/main/java/com/fr/plugin/widget/ztree/ui/editor/AccessibleZTreeModelEditor.java index b089cd1..f37ad82 100644 --- a/src/main/java/com/fr/plugin/widget/ztree/ui/editor/AccessibleZTreeModelEditor.java +++ b/src/main/java/com/fr/plugin/widget/ztree/ui/editor/AccessibleZTreeModelEditor.java @@ -5,9 +5,8 @@ import com.fanruan.api.design.work.form.basic.UneditableAccessibleEditor; import com.fr.plugin.widget.ztree.core.ZTreeNode; import com.fr.plugin.widget.ztree.ui.control.ZTreeControlPane; -//接口 import com.fr.design.dialog.DialogActionAdapter; -//open + import com.fr.design.dialog.BasicDialog; import javax.swing.*; diff --git a/src/main/java/com/fr/plugin/widget/ztree/ui/editor/ZTreeCascadeWrapper.java b/src/main/java/com/fr/plugin/widget/ztree/ui/editor/ZTreeCascadeWrapper.java index 6ed6657..c3605b3 100644 --- a/src/main/java/com/fr/plugin/widget/ztree/ui/editor/ZTreeCascadeWrapper.java +++ b/src/main/java/com/fr/plugin/widget/ztree/ui/editor/ZTreeCascadeWrapper.java @@ -1,8 +1,8 @@ package com.fr.plugin.widget.ztree.ui.editor; -//抽象方法 + import com.fr.design.Exception.ValidationException; -//接口 + import com.fr.design.designer.properties.Decoder; import com.fr.design.designer.properties.Encoder; import com.fr.plugin.widget.ztree.core.ZTreeCascade; diff --git a/src/main/java/com/fr/plugin/widget/ztree/ui/editor/ZTreeModelWrapper.java b/src/main/java/com/fr/plugin/widget/ztree/ui/editor/ZTreeModelWrapper.java index 583398c..1361977 100644 --- a/src/main/java/com/fr/plugin/widget/ztree/ui/editor/ZTreeModelWrapper.java +++ b/src/main/java/com/fr/plugin/widget/ztree/ui/editor/ZTreeModelWrapper.java @@ -5,7 +5,6 @@ import com.fr.design.designer.properties.Decoder; import com.fr.design.designer.properties.Encoder; import com.fr.plugin.widget.ztree.core.ZTreeNode; -//抽象 import com.fr.design.Exception.ValidationException; /** * Created by richie on 15/11/18. diff --git a/src/main/java/com/fr/plugin/widget/ztree/ui/editor/ZTreeStyleWrapper.java b/src/main/java/com/fr/plugin/widget/ztree/ui/editor/ZTreeStyleWrapper.java index c0a62af..7476525 100644 --- a/src/main/java/com/fr/plugin/widget/ztree/ui/editor/ZTreeStyleWrapper.java +++ b/src/main/java/com/fr/plugin/widget/ztree/ui/editor/ZTreeStyleWrapper.java @@ -5,7 +5,7 @@ import com.fr.design.designer.properties.Decoder; import com.fr.design.designer.properties.Encoder; import com.fr.plugin.widget.ztree.core.ZTreeStyle; -//抽象 + import com.fr.design.Exception.ValidationException; /**