From 315f6fd73039f88f4ec585236922c877c168eded Mon Sep 17 00:00:00 2001
From: Kalven <Kalven@fanruan.com>
Date: Wed, 28 Aug 2019 09:31:18 +0800
Subject: [PATCH] =?UTF-8?q?KERNEL-1117=20=E7=94=B1=E4=BA=8Efinekit?=
 =?UTF-8?q?=E6=94=B9=E5=8F=98=EF=BC=8C=E6=94=B9=E5=8F=98=E7=9B=B8=E5=BA=94?=
 =?UTF-8?q?=E7=9A=84=E5=9C=B0=E6=96=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../plugin/design/formula/compat/FunctionConstants.java      | 5 ++---
 .../design/formula/ui/type/impl/ScriptFormulaPane.java       | 4 ++--
 2 files changed, 4 insertions(+), 5 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 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<ScriptFormula> {
         }
 
         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);