From 105d7308ecbd76798bdaf4c5de8f67b6ff39b55f Mon Sep 17 00:00:00 2001 From: Hoky <303455184@qq.com> Date: Wed, 10 Nov 2021 09:03:16 +0800 Subject: [PATCH] =?UTF-8?q?REPORT-60163=20=E5=85=AC=E5=BC=8F=E7=BC=96?= =?UTF-8?q?=E8=BE=91=E5=99=A8=E4=BC=98=E5=8C=962.0=201.=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E4=BA=86=E5=9B=BD=E9=99=85=E5=8C=96=E7=9A=84=E4=BD=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fr/design/formula/FormulaPane.java | 32 +++++++--------- .../function/FormulaCheckConstants.java | 17 --------- .../function/MismatchedCharFunction.java | 29 ++++++++------- .../function/MismatchedTokenFunction.java | 37 ++++++++++--------- .../function/NoViableAltForCharFunction.java | 3 +- .../function/NoViableAltFunction.java | 7 ++-- 6 files changed, 53 insertions(+), 72 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/formula/FormulaPane.java b/designer-base/src/main/java/com/fr/design/formula/FormulaPane.java index 3d1e921d06..6c0ddcab16 100644 --- a/designer-base/src/main/java/com/fr/design/formula/FormulaPane.java +++ b/designer-base/src/main/java/com/fr/design/formula/FormulaPane.java @@ -122,19 +122,13 @@ import java.util.Set; * @since 2012-3-29下午1:50:53 */ public class FormulaPane extends BasicPane implements KeyListener, UIFormula { - private final static String CONFIRM_DIALOG_TITLE = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Confirm"); public static final int DEFUAL_FOMULA_LENGTH = 103; public static final String ELLIPSIS = "..."; public static final int KEY_CODE_A = 64; public static final int KEY_CODE_Z = 91; - public static final String CHECK_RESULT = Toolkit.i18nText("Fine-Design_Basic_Formula_Check_Result"); - public static final String CONTINUE = Toolkit.i18nText("Fine-Design_Basic_Formula_Continue"); - public static final String CAL_RESULT = Toolkit.i18nText("Fine-Design_Basic_Formula_Cal_Result"); public static final String NEWLINE = "\n"; - public static final String ERROR_POSITION = Toolkit.i18nText("Fine-Design_Basic_Formula_Error_Position"); public static final String FORMULA_ICON = "/com/fr/design/images/m_file/formula.png"; public static final String PARAM_ICON = "/com/fr/design/images/m_file/param.png"; - public static final int KEY_CODE_$ = 515; private VariableTreeAndDescriptionArea variableTreeAndDescriptionArea; private RSyntaxTextArea formulaTextArea; private UITextField keyWordTextField = new UITextField(18); @@ -152,7 +146,7 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula { private JList functionNameList; private UITableEditorPane editor4CalPane; private FormulaPaneAutoCompletion autoCompletion; - private static DefaultCompletionProvider COMPLETION_PROVIDER = null; + private DefaultCompletionProvider completionProvider; private static final Map PARAM_PREFIX_MAP = new HashMap<>(); public FormulaPane() { @@ -353,11 +347,11 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula { } private CompletionProvider createCompletionProvider() { - if (COMPLETION_PROVIDER == null) { - COMPLETION_PROVIDER = new DefaultCompletionProvider(); + if (completionProvider == null) { + completionProvider = new DefaultCompletionProvider(); NameAndDescription[] nameAndDescriptions = FunctionConstants.ALL.getDescriptions(); for (NameAndDescription nameAndDescription : nameAndDescriptions) { - COMPLETION_PROVIDER.addCompletion(new FormulaCompletion(COMPLETION_PROVIDER, nameAndDescription.getName(), BaseUtils.readIcon(FORMULA_ICON))); + completionProvider.addCompletion(new FormulaCompletion(completionProvider, nameAndDescription.getName(), BaseUtils.readIcon(FORMULA_ICON))); } VariableResolver variableResolver = VariableResolver.DEFAULT; @@ -381,13 +375,13 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula { paramWithoutPre = parameter; PARAM_PREFIX_MAP.put(paramWithoutPre, StringUtils.EMPTY); } - COMPLETION_PROVIDER.addCompletion(new FormulaCompletion(COMPLETION_PROVIDER, paramWithoutPre, BaseUtils.readIcon(PARAM_ICON))); + completionProvider.addCompletion(new FormulaCompletion(completionProvider, paramWithoutPre, BaseUtils.readIcon(PARAM_ICON))); } - COMPLETION_PROVIDER.addCompletion(new FormulaCompletion(COMPLETION_PROVIDER, "$$$", BaseUtils.readIcon(PARAM_ICON))); + completionProvider.addCompletion(new FormulaCompletion(completionProvider, "$$$", BaseUtils.readIcon(PARAM_ICON))); - return COMPLETION_PROVIDER; + return completionProvider; } - return COMPLETION_PROVIDER; + return completionProvider; } public static boolean containsParam(String param) { @@ -821,7 +815,7 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula { String objectToString = EssentialUtils.objectToString(value); String result = objectToString.length() > DEFUAL_FOMULA_LENGTH ? objectToString.substring(0, DEFUAL_FOMULA_LENGTH - ELLIPSIS.length()) + ELLIPSIS : objectToString; - messageTips = messageTips + CAL_RESULT + ":" + result; + messageTips = messageTips + Toolkit.i18nText("Fine-Design_Basic_Formula_Cal_Result") + ":" + result; FineLoggerFactory.getLogger().info("value:{}", value); } catch (UtilEvalError utilEvalError) { FineLoggerFactory.getLogger().error(utilEvalError.getMessage(), utilEvalError); @@ -843,13 +837,13 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula { } else { int confirmDialog = FineJOptionPane.showConfirmDialog( FormulaPane.this, - checkResult.getTips() + ", " + ERROR_POSITION + ":" + (checkResult.getFormulaCoordinates().getColumns()) + ".", - CONFIRM_DIALOG_TITLE, + checkResult.getTips() + ", " + Toolkit.i18nText("Fine-Design_Basic_Formula_Error_Position") + ":" + (checkResult.getFormulaCoordinates().getColumns()) + ".", + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Confirm"), JOptionPane.YES_NO_OPTION, JOptionPane.WARNING_MESSAGE, null, - new String[]{CHECK_RESULT, CONTINUE}, - CHECK_RESULT); + new String[]{Toolkit.i18nText("Fine-Design_Basic_Formula_Check_Result"), Toolkit.i18nText("Fine-Design_Basic_Formula_Continue")}, + Toolkit.i18nText("Fine-Design_Basic_Formula_Check_Result")); if (confirmDialog == 0) { formulaTextArea.setCaretPosition(checkResult.getFormulaCoordinates().getColumns()); formulaTextArea.requestFocus(); diff --git a/designer-base/src/main/java/com/fr/design/formula/exception/function/FormulaCheckConstants.java b/designer-base/src/main/java/com/fr/design/formula/exception/function/FormulaCheckConstants.java index 6e3af75c55..20ad72156b 100644 --- a/designer-base/src/main/java/com/fr/design/formula/exception/function/FormulaCheckConstants.java +++ b/designer-base/src/main/java/com/fr/design/formula/exception/function/FormulaCheckConstants.java @@ -1,27 +1,10 @@ package com.fr.design.formula.exception.function; -import com.fr.design.i18n.Toolkit; - /** * @author Hoky * @date 2021/10/28 */ public class FormulaCheckConstants { - public final static String EXPECTING = Toolkit.i18nText("Fine-Design_Basic_Formula_Check_Expecting") + ": "; - public final static String FOUND = Toolkit.i18nText("Fine-Design_Basic_Formula_Check_Found"); - public final static String EXPECTING_ANYTHING = Toolkit.i18nText("Fine-Design_Basic_Formula_Check_Expecting_Anything"); - public final static String GOT_IT_ANYWAY = Toolkit.i18nText("Fine-Design_Basic_Formula_Check_GotItAnyway"); - public final static String TOKEN = Toolkit.i18nText("Fine-Design_Basic_Formula_Check_Token"); - public final static String IN_RANGE = Toolkit.i18nText("Fine-Design_Basic_Formula_Check_In_Range"); - public final static String CHECK_NOT = Toolkit.i18nText("Fine-Design_Basic_Formula_Check_Not"); - public final static String ONE_OF = Toolkit.i18nText("Fine-Design_Basic_Formula_Check_ONE_OF"); - public final static String UNEXPECTED_TOKEN = Toolkit.i18nText("Fine-Design_Basic_Formula_Check_Unexpected_Token"); - public final static String UNEXPECTED_CHAR = Toolkit.i18nText("Fine-Design_Basic_Formula_Check_Unexpected_Char"); - public final static String UNEXPECTED_END_OF_SUBTREE = Toolkit.i18nText("Fine-Design_Basic_Formula_Check_End_Of_Subtree"); - public final static String UNEXPECTED_AST_NODE = Toolkit.i18nText("Fine-Design_Basic_Formula_Check_Unexpected_AST_Node"); - public final static String MISMATCHED_TOKEN = Toolkit.i18nText("Fine-Design_Basic_Formula_Check_Mismatched_Token"); - public final static String MISMATCHED_CHAR = Toolkit.i18nText("Fine-Design_Basic_Formula_Check_Mismatched_Char"); - public final static String MISMATCHED_EOF = Toolkit.i18nText("Fine-Design_Basic_Formula_Check_Mismatched_EOF"); public static final String COLON = ":"; public static final String LEFT = "("; public static final String COMMON = ","; diff --git a/designer-base/src/main/java/com/fr/design/formula/exception/function/MismatchedCharFunction.java b/designer-base/src/main/java/com/fr/design/formula/exception/function/MismatchedCharFunction.java index e63353a08d..ca6df0852a 100644 --- a/designer-base/src/main/java/com/fr/design/formula/exception/function/MismatchedCharFunction.java +++ b/designer-base/src/main/java/com/fr/design/formula/exception/function/MismatchedCharFunction.java @@ -1,6 +1,7 @@ package com.fr.design.formula.exception.function; import com.fr.design.formula.FormulaChecker; +import com.fr.design.i18n.Toolkit; import com.fr.script.checker.result.FormulaCheckResult; import com.fr.script.checker.result.FormulaCoordinates; import com.fr.third.antlr.MismatchedCharException; @@ -32,50 +33,50 @@ public class MismatchedCharFunction implements Function= ' ' && exception.foundChar <= '~') { mesg = mesg + '\''; mesg = mesg + exception.foundChar; diff --git a/designer-base/src/main/java/com/fr/design/formula/exception/function/NoViableAltFunction.java b/designer-base/src/main/java/com/fr/design/formula/exception/function/NoViableAltFunction.java index aa7c7d3ecc..e6bfbd5df2 100644 --- a/designer-base/src/main/java/com/fr/design/formula/exception/function/NoViableAltFunction.java +++ b/designer-base/src/main/java/com/fr/design/formula/exception/function/NoViableAltFunction.java @@ -1,6 +1,7 @@ package com.fr.design.formula.exception.function; import com.fr.design.formula.FormulaChecker; +import com.fr.design.i18n.Toolkit; import com.fr.script.checker.result.FormulaCheckResult; import com.fr.script.checker.result.FormulaCoordinates; import com.fr.third.antlr.NoViableAltException; @@ -31,10 +32,10 @@ public class NoViableAltFunction implements Function