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 63a2606..4098ddb 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,7 @@ package com.fr.solution.plugin.design.formula.compat; import com.fanruan.api.util.GeneralKit; -import com.fanruan.api.util.StableKit; +import com.fanruan.api.util.ReflectKit; import com.fr.design.formula.FunctionDefNAD; import com.fr.design.formula.FunctionGroup; import com.fr.design.formula.NameAndDescription; @@ -96,8 +96,7 @@ public final class FunctionConstants { for (String fileName : findClassNamesUnderFilePath(classFilePath)) { try { Class cls = Class.forName(pkgName + "." + fileName.substring(0, fileName.length() - 6)); -// if (StableUtils.classInstanceOf(cls, iface)) { - if (StableKit.classInstanceOf(cls, iface)) { + if (ReflectKit.classInstanceOf(cls, iface)) { Function inst; inst = (Function)cls.newInstance(); for (NameAndTypeAndFunctionList EMBFUNCTION : EMBFUNCTIONS) { 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 3c2326c..5cd85c6 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,7 +1,7 @@ package com.fr.solution.plugin.design.formula.ui.type.impl; import com.fanruan.api.util.StringKit; -import com.fanruan.api.util.TemplateKit; +import com.fanruan.api.util.RenderKit; import com.fr.base.Parameter; import com.fr.base.ParameterHelper; import com.fr.base.ScriptFormula; @@ -98,7 +98,7 @@ public class ScriptFormulaPane extends BaseFormulaPane { } try { - String content = TemplateKit.renderParameter4Tpl(formula.getPureContent(), map); + String content = RenderKit.renderParameter4Tpl(formula.getPureContent(), map); ScriptFactory.newSingletonScriptEngine().eval(String.format(FUN_TPL, content)); } catch (Exception e) { FRLogger.getLogger().error(e.getMessage(), e);