From 47ace1db7cd5db524227697e654fabdec1ae00ab Mon Sep 17 00:00:00 2001 From: Kalven Date: Mon, 2 Sep 2019 14:55:39 +0800 Subject: [PATCH] =?UTF-8?q?KERNEL-1117=20=E5=8E=BB=E6=8E=89=E6=B3=A8?= =?UTF-8?q?=E9=87=8A=EF=BC=8C=E5=90=8C=E6=97=B6=E6=A0=B9=E6=8D=AEfineKit?= =?UTF-8?q?=E8=BF=9B=E4=B8=80=E6=AD=A5=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../formula/compat/FunctionConstants.java | 2 - .../formula/compat/NameAndFunctionList.java | 1 - .../design/formula/ui/GroupFormulaPane.java | 1 - .../formula/ui/type/BaseFormulaPane.java | 1 - .../ui/type/impl/BasicFormulaPane.java | 79 +------------------ .../ui/type/impl/ScriptFormulaPane.java | 3 +- 6 files changed, 3 insertions(+), 84 deletions(-) diff --git a/src/main/java/com/fr/solution/plugin/design/formula/compat/FunctionConstants.java b/src/main/java/com/fr/solution/plugin/design/formula/compat/FunctionConstants.java index 901d2ec..32aa766 100644 --- a/src/main/java/com/fr/solution/plugin/design/formula/compat/FunctionConstants.java +++ b/src/main/java/com/fr/solution/plugin/design/formula/compat/FunctionConstants.java @@ -1,7 +1,6 @@ package com.fr.solution.plugin.design.formula.compat; import com.fanruan.api.function.FunctionKit; -import com.fanruan.api.function.shell.FineFunc; import com.fanruan.api.macro.EncodeConstants; import com.fanruan.api.macro.OperatingSystem; import com.fanruan.api.util.GeneralKit; @@ -10,7 +9,6 @@ import com.fanruan.api.util.TypeKit; import com.fr.plugin.ExtraClassManager; import com.fr.stable.script.Function; -import com.fr.file.FunctionManagerProvider; import com.fr.stable.fun.FunctionDefContainer; import com.fr.design.formula.FunctionGroup; import com.fr.stable.fun.mark.Mutable; diff --git a/src/main/java/com/fr/solution/plugin/design/formula/compat/NameAndFunctionList.java b/src/main/java/com/fr/solution/plugin/design/formula/compat/NameAndFunctionList.java index e7e46be..12c6a18 100644 --- a/src/main/java/com/fr/solution/plugin/design/formula/compat/NameAndFunctionList.java +++ b/src/main/java/com/fr/solution/plugin/design/formula/compat/NameAndFunctionList.java @@ -2,7 +2,6 @@ package com.fr.solution.plugin.design.formula.compat; import com.fr.stable.script.Function; -import java.util.Arrays; /** * 名称对应的函数列表 diff --git a/src/main/java/com/fr/solution/plugin/design/formula/ui/GroupFormulaPane.java b/src/main/java/com/fr/solution/plugin/design/formula/ui/GroupFormulaPane.java index ca5f8e6..52d854a 100644 --- a/src/main/java/com/fr/solution/plugin/design/formula/ui/GroupFormulaPane.java +++ b/src/main/java/com/fr/solution/plugin/design/formula/ui/GroupFormulaPane.java @@ -3,7 +3,6 @@ package com.fr.solution.plugin.design.formula.ui; import com.fanruan.api.cal.CalculatorKit; import com.fanruan.api.cal.ParameterKit; import com.fanruan.api.design.DesignKit; -//import com.fanruan.api.design.ui.container.DialogActionAdapter; import com.fanruan.api.design.ui.component.*; import com.fanruan.api.design.ui.container.BasicPane; import com.fanruan.api.design.ui.action.UpdateAction; diff --git a/src/main/java/com/fr/solution/plugin/design/formula/ui/type/BaseFormulaPane.java b/src/main/java/com/fr/solution/plugin/design/formula/ui/type/BaseFormulaPane.java index 10557d3..ab274be 100644 --- a/src/main/java/com/fr/solution/plugin/design/formula/ui/type/BaseFormulaPane.java +++ b/src/main/java/com/fr/solution/plugin/design/formula/ui/type/BaseFormulaPane.java @@ -3,7 +3,6 @@ package com.fr.solution.plugin.design.formula.ui.type; import com.fanruan.api.design.ui.component.code.UISyntaxTextArea; import com.fanruan.api.i18n.I18nKit; import com.fr.base.BaseFormula; -//import com.fanruan.api.design.ui.container.FurtherBasicBeanPane; import com.fanruan.api.macro.ProductConstants; import com.fanruan.api.util.StringKit; import com.fanruan.api.design.ui.container.UIScrollPane; diff --git a/src/main/java/com/fr/solution/plugin/design/formula/ui/type/impl/BasicFormulaPane.java b/src/main/java/com/fr/solution/plugin/design/formula/ui/type/impl/BasicFormulaPane.java index 97f519f..1f962af 100644 --- a/src/main/java/com/fr/solution/plugin/design/formula/ui/type/impl/BasicFormulaPane.java +++ b/src/main/java/com/fr/solution/plugin/design/formula/ui/type/impl/BasicFormulaPane.java @@ -1,10 +1,9 @@ package com.fr.solution.plugin.design.formula.ui.type.impl; -import com.fanruan.api.cal.CalculatorKit; import com.fanruan.api.cal.FormulaKit; +import com.fanruan.api.cal.ParameterKit; import com.fanruan.api.design.ui.component.code.UISyntaxTextArea; import com.fanruan.api.util.StringKit; -//import com.fanruan.api.structure.Formula; import com.fr.base.Formula; @@ -16,8 +15,6 @@ import com.fr.stable.script.CalculatorProvider; //有问题 import com.fr.stable.xml.XMLPrintWriter; import com.fr.stable.xml.XMLableReader; -import com.fr.third.antlr.ANTLRException; -import com.fr.general.FRLogger; public class BasicFormulaPane extends BaseFormulaPane { @@ -86,79 +83,7 @@ public class BasicFormulaPane extends BaseFormulaPane { String[] arr = formula.dependence(calculator); ParameterProvider[] parameters = new ParameterProvider[arr.length]; for (int i = 0, len = arr.length; i < len; i ++) { - parameters[i] = new ParameterProvider() { - @Override - public Object getValue() { - return null; - } - - @Override - public void setValue(Object o) { - - } - - @Override - public String valueToString() { - return null; - } - - @Override - public String xmlTag() { - return null; - } - - @Override - public String arrayXMLTag() { - return null; - } - - @Override - public T newInstance() { - return null; - } - - @Override - public String[] dependence(CalculatorProvider calculatorProvider) { - return new String[0]; - } - - @Override - public String getName() { - return null; - } - - @Override - public void setName(String s) { - - } - - @Override - public int currentAPILevel() { - return 0; - } - - @Override - public String mark4Provider() { - return null; - } - - @Override - public void readXML(XMLableReader xmLableReader) { - - } - - @Override - public void writeXML(XMLPrintWriter xmlPrintWriter) { - - } - - @Override - public Object clone() throws CloneNotSupportedException { - return null; - } - }; - parameters[i].setName(arr[i]); - parameters[i].setValue(""); + parameters[i] = ParameterKit.createNewParameter(arr[i]); } return parameters; } diff --git a/src/main/java/com/fr/solution/plugin/design/formula/ui/type/impl/ScriptFormulaPane.java b/src/main/java/com/fr/solution/plugin/design/formula/ui/type/impl/ScriptFormulaPane.java index a32cff7..26eba05 100644 --- a/src/main/java/com/fr/solution/plugin/design/formula/ui/type/impl/ScriptFormulaPane.java +++ b/src/main/java/com/fr/solution/plugin/design/formula/ui/type/impl/ScriptFormulaPane.java @@ -1,6 +1,5 @@ package com.fr.solution.plugin.design.formula.ui.type.impl; -; -//import com.fanruan.api.base.ScriptFormula; + import com.fanruan.api.cal.CalculatorKit; import com.fanruan.api.cal.ParameterKit; import com.fanruan.api.design.ui.component.code.UISyntaxTextArea;