diff --git a/pom.xml b/pom.xml index 5c01230..bba9648 100644 --- a/pom.xml +++ b/pom.xml @@ -20,8 +20,8 @@ org.apache.maven.plugins maven-compiler-plugin - 6 - 6 + 8 + 8 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 { 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; }