From 75c8ce4a28c797280aa6856b163309363b746108 Mon Sep 17 00:00:00 2001
From: Kalven <Kalven@fanruan.com>
Date: Mon, 2 Sep 2019 17:14:15 +0800
Subject: [PATCH] =?UTF-8?q?KERNEL-1117=20=E6=A0=B9=E6=8D=AEfinekit?=
 =?UTF-8?q?=E7=BB=A7=E7=BB=AD=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                                       | 4 ++--
 .../solution/plugin/design/formula/ui/GroupFormulaPane.java   | 3 +--
 .../plugin/design/formula/ui/type/impl/BasicFormulaPane.java  | 2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index 5c01230..bba9648 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,8 +20,8 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
-                    <source>6</source>
-                    <target>6</target>
+                    <source>8</source>
+                    <target>8</target>
                 </configuration>
             </plugin>
         </plugins>
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 52d854a..938cb00 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
@@ -6,7 +6,6 @@ import com.fanruan.api.design.DesignKit;
 import com.fanruan.api.design.ui.component.*;
 import com.fanruan.api.design.ui.container.BasicPane;
 import com.fanruan.api.design.ui.action.UpdateAction;
-import com.fanruan.api.design.ui.container.HistoryTemplateListPane;
 import com.fanruan.api.design.work.ParameterInputPane;
 import com.fanruan.api.design.ui.container.UIScrollPane;
 import com.fanruan.api.design.ui.component.UIQuickList;
@@ -333,7 +332,7 @@ public class GroupFormulaPane extends BasicPane implements UIFormula, OperateLis
         @Override
         public void actionPerformed(ActionEvent e) {
             CalculatorProvider calculator = CalculatorKit.createCalculator();
-            JTemplate<?, ?> template = HistoryTemplateListPane.getInstance().getCurrentEditingTemplate();
+            JTemplate<?, ?> template = DesignKit.getCurrentEditingTemplate();
             if (template != null) {
                 TableDataSource file = (TableDataSource) template.getTarget();
                 calculator.setAttribute(TableDataSource.class, file);
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 662bb4f..a513397 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
@@ -80,7 +80,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] = ParameterKit.createNewParameter(arr[i]);
+            parameters[i] = ParameterKit.newParameter(arr[i]);
         }
         return parameters;
     }