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 8efe0dc..63a2606 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,5 +1,7 @@ package com.fr.solution.plugin.design.formula.compat; +import com.fanruan.api.util.GeneralKit; +import com.fanruan.api.util.StableKit; import com.fr.design.formula.FunctionDefNAD; import com.fr.design.formula.FunctionGroup; import com.fr.design.formula.NameAndDescription; @@ -17,11 +19,9 @@ import com.fr.function.SUM; import com.fr.function.TIME; import com.fr.general.ComparatorUtils; import com.fr.general.FRLogger; -import com.fr.general.GeneralUtils; import com.fr.plugin.ExtraClassManager; import com.fr.stable.EncodeConstants; import com.fr.stable.OperatingSystem; -import com.fr.stable.StableUtils; import com.fr.stable.StringUtils; import com.fr.stable.fun.FunctionDefContainer; import com.fr.stable.fun.mark.Mutable; @@ -96,7 +96,8 @@ 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 (StableUtils.classInstanceOf(cls, iface)) { + if (StableKit.classInstanceOf(cls, iface)) { Function inst; inst = (Function)cls.newInstance(); for (NameAndTypeAndFunctionList EMBFUNCTION : EMBFUNCTIONS) { @@ -119,7 +120,7 @@ public final class FunctionConstants { } private static boolean isNotDebugMode() { - return GeneralUtils.readBuildNO().contains("-"); + return GeneralKit.readBuildNO().contains("-"); } private static boolean isJarPath(String classFilePath) { @@ -311,7 +312,7 @@ public final class FunctionConstants { Collections.sort(all, new Comparator() { @Override public int compare(NameAndDescription o1, NameAndDescription o2) { - return ComparatorUtils.compare(o1.getName(), o2.getName()); + return GeneralKit.compare(o1.getName(), o2.getName()); } }); 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 0e9ccb2..9500904 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 @@ -1,10 +1,11 @@ package com.fr.solution.plugin.design.formula.ui; +import com.fanruan.api.util.IOKit; +import com.fanruan.api.design.util.GUICoreKit; import com.fanruan.api.util.*; import com.fr.base.BaseFormula; -import com.fr.base.BaseUtils; import com.fr.base.FRContext; import com.fr.base.Parameter; @@ -33,7 +34,6 @@ import com.fr.design.mainframe.DesignerContext; import com.fr.design.mainframe.JTemplate; import com.fr.design.parameter.ParameterInputPane; -import com.fr.design.utils.gui.GUICoreUtils; import com.fr.general.FRLogger; import com.fr.report.core.namespace.SimpleCellValueNameSpace; @@ -148,7 +148,7 @@ public class GroupFormulaPane extends BasicPane implements UIFormula, OperateLis JPanel checkBoxPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane(); checkBoxPane.setPreferredSize(new Dimension(450, 30)); checkBoxAndButtonPane.add(checkBoxPane, BorderLayout.WEST); - checkBoxAndButtonPane.add(GUICoreUtils.createFlowPane(checkValidButton, calculateButton), BorderLayout.EAST); + checkBoxAndButtonPane.add(GUICoreKit.createFlowPane(checkValidButton, calculateButton), BorderLayout.EAST); extendCheckBoxPane(checkBoxPane); variableTreeAndDescriptionArea = new VariableTreeAndDescriptionArea(); this.add(variableTreeAndDescriptionArea, BorderLayout.SOUTH); @@ -521,7 +521,7 @@ public class GroupFormulaPane extends BasicPane implements UIFormula, OperateLis private StringBuilder getText(TextUserObject selectedValue, String path) throws IOException { Reader desReader; StringBuilder desBuf = new StringBuilder(); - InputStream desInputStream = BaseKit.readResource(path + (selectedValue).displayText + ".txt"); + InputStream desInputStream = IOKit.readResource(path + (selectedValue).displayText + ".txt"); if (desInputStream == null) { String description = ""; desReader = new StringReader(description); @@ -606,7 +606,7 @@ public class GroupFormulaPane extends BasicPane implements UIFormula, OperateLis public LookDetailAction() { this.setName(DesignToolkit.getLocText("Plugin-Design_Basic_FormulaPane_Function_Detail")); this.setMnemonic('L'); - this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/m_file/preview.png")); + this.setSmallIcon(IOKit.readIcon("/com/fr/design/images/m_file/preview.png")); } // 弹出的窗口中显示函数的用法明细 @@ -709,24 +709,24 @@ public class GroupFormulaPane extends BasicPane implements UIFormula, OperateLis } rootNode.add(new TextFolderUserObject(DesignToolkit.getLocText("Plugin-Design_Basic_FormulaD_Data_Fields"), - BaseKit.readIcon("/com/fr/design/images/dialog/table.png"), + IOKit.readIcon("/com/fr/design/images/dialog/table.png"), variableResolver.resolveColumnNames()).createMutableTreeNode()); // Set cutReport Variable rootNode.add(new TextFolderUserObject(DesignToolkit.getLocText("Plugin-Design_Basic_FormulaPane_Variables"), - BaseKit.readIcon("/com/fr/design/images/dialog/variable.png"), + IOKit.readIcon("/com/fr/design/images/dialog/variable.png"), variableResolver.resolveCurReportVariables()).createMutableTreeNode()); rootNode.add(new TextFolderUserObject(DesignToolkit.getLocText("Plugin-Design_Basic_Parameter_Source_Type_Tabledata"), - BaseKit.readIcon("/com/fr/design/images/dialog/parameter.gif"), + IOKit.readIcon("/com/fr/design/images/dialog/parameter.gif"), variableResolver.resolveTableDataParameterVariables()).createMutableTreeNode()); rootNode.add(new TextFolderUserObject(DesignToolkit.getLocText("Plugin-Design_Basic_ParameterD_Report_Parameter"), - BaseKit.readIcon("/com/fr/design/images/m_report/p.gif"), + IOKit.readIcon("/com/fr/design/images/m_report/p.gif"), variableResolver.resolveReportParameterVariables()).createMutableTreeNode()); rootNode.add(new TextFolderUserObject(DesignToolkit.getLocText("Plugin-Design_Basic_M_Server_Global_Parameters"), - BaseKit.readIcon("/com/fr/design/images/dialog/parameter.gif"), + IOKit.readIcon("/com/fr/design/images/dialog/parameter.gif"), variableResolver.resolveGlobalParameterVariables()).createMutableTreeNode()); variableModel.reload(); diff --git a/src/main/java/com/fr/solution/plugin/design/formula/ui/type/BaseFormulaPane.java b/src/main/java/com/fr/solution/plugin/design/formula/ui/type/BaseFormulaPane.java index 1ac6fde..9d0e257 100644 --- a/src/main/java/com/fr/solution/plugin/design/formula/ui/type/BaseFormulaPane.java +++ b/src/main/java/com/fr/solution/plugin/design/formula/ui/type/BaseFormulaPane.java @@ -1,20 +1,13 @@ package com.fr.solution.plugin.design.formula.ui.type; +import com.fanruan.api.util.StringKit; import com.fr.base.BaseFormula; import com.fr.design.beans.FurtherBasicBeanPane; import com.fr.design.gui.icontainer.UIScrollPane; import com.fr.design.gui.syntax.ui.rsyntaxtextarea.RSyntaxTextArea; -import com.fr.general.FRLogger; import com.fr.general.Inter; -import com.fr.log.FineLoggerFactory; -import com.fr.parser.FRLexer; -import com.fr.parser.FRParser; -import com.fr.script.Calculator; import com.fr.solution.plugin.design.formula.ui.evt.OperateListener; import com.fr.stable.ProductConstants; -import com.fr.stable.StringUtils; -import com.fr.stable.script.Expression; -import com.fr.third.antlr.ANTLRException; import javax.swing.*; import java.awt.*; @@ -23,7 +16,6 @@ import java.awt.event.KeyEvent; import java.awt.event.KeyListener; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; -import java.io.StringReader; public abstract class BaseFormulaPane extends FurtherBasicBeanPane implements CommonEvent, KeyListener { @@ -205,7 +197,7 @@ public abstract class BaseFormulaPane extends FurtherBasi @Override public void keyPressed(KeyEvent e) { if (ifHasBeenWritten == 0) { - this.formulaTextArea.setText(StringUtils.EMPTY); + this.formulaTextArea.setText(StringKit.EMPTY); } } @@ -307,7 +299,7 @@ public abstract class BaseFormulaPane extends FurtherBasi public void checkContentValid() { // Execute Formula default cell element. String formulaText = formulaTextArea.getText().trim(); - if (StringUtils.isNotEmpty(formulaText)) { + if (StringKit.isNotEmpty(formulaText)) { JOptionPane.showMessageDialog( BaseFormulaPane.this, (isValidFormula(formulaText) ? Inter.getLocText("Plugin-Design_Basic_FormulaD_Valid_Formula") : Inter.getLocText("Plugin-Design_Basic_FormulaD_Invalid_Formula")) + ".", ProductConstants.PRODUCT_NAME, 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 b9e1a59..404d896 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 @@ -8,7 +8,6 @@ import com.fr.design.gui.syntax.ui.rsyntaxtextarea.SyntaxConstants; import com.fr.general.FRLogger; import com.fr.script.Calculator; import com.fr.solution.plugin.design.formula.ui.type.BaseFormulaPane; -import com.fr.stable.StringUtils; import com.fr.stable.script.Expression; import com.fr.third.antlr.ANTLRException; 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 0a5db53..3c2326c 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,5 +1,6 @@ package com.fr.solution.plugin.design.formula.ui.type.impl; +import com.fanruan.api.util.StringKit; import com.fanruan.api.util.TemplateKit; import com.fr.base.Parameter; import com.fr.base.ParameterHelper; @@ -11,7 +12,6 @@ import com.fr.general.Inter; import com.fr.script.Calculator; import com.fr.script.ScriptFactory; import com.fr.solution.plugin.design.formula.ui.type.BaseFormulaPane; -import com.fr.stable.StringUtils; import java.util.HashMap; import java.util.Map; @@ -55,7 +55,7 @@ public class ScriptFormulaPane extends BaseFormulaPane { @Override protected ScriptFormula createFormula(String content) { ScriptFormula formula; - if (StringUtils.isEmpty(content) || content.trim().charAt(0) == '=') { + if (StringKit.isEmpty(content) || content.trim().charAt(0) == '=') { formula = new ScriptFormula(content); } else { formula = new ScriptFormula("=" + content);