Browse Source

KERNEL-1117 去掉注释,同时根据fineKit进一步修改

pull/2/head
Kalven 5 years ago
parent
commit
47ace1db7c
  1. 2
      src/main/java/com/fr/solution/plugin/design/formula/compat/FunctionConstants.java
  2. 1
      src/main/java/com/fr/solution/plugin/design/formula/compat/NameAndFunctionList.java
  3. 1
      src/main/java/com/fr/solution/plugin/design/formula/ui/GroupFormulaPane.java
  4. 1
      src/main/java/com/fr/solution/plugin/design/formula/ui/type/BaseFormulaPane.java
  5. 79
      src/main/java/com/fr/solution/plugin/design/formula/ui/type/impl/BasicFormulaPane.java
  6. 3
      src/main/java/com/fr/solution/plugin/design/formula/ui/type/impl/ScriptFormulaPane.java

2
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;

1
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;
/**
* 名称对应的函数列表

1
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;

1
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;

79
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<Formula> {
@ -86,79 +83,7 @@ public class BasicFormulaPane extends BaseFormulaPane<Formula> {
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> 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;
}

3
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;

Loading…
Cancel
Save