From 5e916c814f939d4b3228190fffcfeb05d97e84df Mon Sep 17 00:00:00 2001 From: "alex.sung" Date: Tue, 7 Aug 2018 20:17:19 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=A7=E7=BB=AD=E6=8F=90=E4=BA=A4=E5=9B=BD?= =?UTF-8?q?=E9=99=85=E5=8C=96=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fr/design/actions/help/FeedBackPane.java | 4 ++-- .../actions/server/GlobalTableDataAction.java | 3 +-- .../design/condition/LiteConditionPane.java | 4 ++-- .../data/datapane/ReportTableDataPane.java | 2 +- .../datapane/TableDataCreatorProducer.java | 2 +- .../data/datapane/TableDataSourceOP.java | 2 +- .../data/datapane/TableDataTreePane.java | 2 +- .../connect/DatabaseConnectionPane.java | 6 ++--- .../data/datapane/connect/JDBCDefPane.java | 22 +++++++++---------- .../data/datapane/connect/JNDIDefPane.java | 10 ++++----- .../datapane/preview/PreviewTablePane.java | 2 +- .../tabledatapane/ClassTableDataPane.java | 4 ++-- .../tabledatapane/DecoratedTableDataPane.java | 2 +- .../tabledatapane/EmbeddedTableDataPane.java | 2 +- .../tabledatapane/FileTableDataPane.java | 2 +- .../tabledatapane/MultiTDTableDataPane.java | 4 ++-- .../StoreProcedureParameterPane.java | 2 +- .../tabledatapane/TableDataManagerPane.java | 4 +--- .../editor/DoubleDeckValueEditorPane.java | 4 ++-- .../com/fr/design/editor/ValueEditorPane.java | 2 +- .../editor/editor/ColumnIndexEditor.java | 2 +- .../editor/editor/OldColumnIndexEditor.java | 2 +- .../com/fr/design/file/TemplateTreePane.java | 2 +- .../design/formula/FunctionManagerPane.java | 2 +- .../com/fr/design/formula/JavaEditorPane.java | 2 +- .../fr/design/formula/TinyFormulaPane.java | 2 +- .../gui/controlpane/JListControlPane.java | 2 +- .../gui/controlpane/UIListControlPane.java | 2 +- .../ui/rsyntaxtextarea/RSyntaxTextArea.java | 3 +-- .../com/fr/design/javascript/EmailPane.java | 2 +- .../com/fr/design/mainframe/DecodeDialog.java | 6 ++--- .../com/fr/design/mainframe/TemplatePane.java | 2 +- .../java/com/fr/design/menu/KeySetUtils.java | 2 +- .../design/present/dict/CustomDictPane.java | 3 +-- .../java/com/fr/design/style/FormatPane.java | 2 +- .../background/BackgroundSelectPane.java | 2 +- .../widget/component/CheckBoxDictPane.java | 4 ++-- .../src/main/java/com/fr/env/EnvListPane.java | 4 ++-- .../main/java/com/fr/env/LocalEnvPane.java | 2 +- .../main/java/com/fr/env/RemoteEnvPane.java | 2 +- .../chart/javascript/ChartEmailPane.java | 2 +- .../designer/creator/XCheckBoxGroup.java | 4 ++-- .../designer/creator/XComboCheckBox.java | 4 ++-- .../ui/designer/DateEditorDefinePane.java | 2 +- .../actions/cell/CellAttributeAction.java | 2 +- .../fr/design/expand/SortExpandAttrPane.java | 2 +- .../cell/settingpane/CellExpandAttrPane.java | 3 +-- .../java/com/fr/design/webattr/WebJsPane.java | 2 +- .../widget/ui/DateEditorDefinePane.java | 2 +- .../cellquick/CellDSColumnEditor.java | 2 +- 50 files changed, 77 insertions(+), 83 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/actions/help/FeedBackPane.java b/designer-base/src/main/java/com/fr/design/actions/help/FeedBackPane.java index a72b35e31..fb1bcf6db 100644 --- a/designer-base/src/main/java/com/fr/design/actions/help/FeedBackPane.java +++ b/designer-base/src/main/java/com/fr/design/actions/help/FeedBackPane.java @@ -179,11 +179,11 @@ public class FeedBackPane extends BasicPane { private JPanel initDetailPane() { double p = TableLayout.PREFERRED; - UILabel info = new UILabel(com.fr.design.i18n.Toolkit.i18nText("detail_description") + ":"); + UILabel info = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Detail_Description") + ":"); info.setBorder(INNER_LEFT_BORDER); JPanel contactPane = getContactPane(); contactPane.setBorder(INNER_LEFT_BORDER); - UILabel contact = new UILabel(com.fr.design.i18n.Toolkit.i18nText("contact_info") + ":"); + UILabel contact = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Contact_Info") + ":"); contact.setBorder(INNER_LEFT_BORDER); JPanel jPanel = new JPanel(); jPanel.add(detailField); diff --git a/designer-base/src/main/java/com/fr/design/actions/server/GlobalTableDataAction.java b/designer-base/src/main/java/com/fr/design/actions/server/GlobalTableDataAction.java index 288970cf8..deef91f0c 100644 --- a/designer-base/src/main/java/com/fr/design/actions/server/GlobalTableDataAction.java +++ b/designer-base/src/main/java/com/fr/design/actions/server/GlobalTableDataAction.java @@ -21,7 +21,6 @@ import com.fr.design.menu.MenuKeySet; import com.fr.file.ProcedureConfig; import com.fr.file.TableDataConfig; -import com.fr.locale.InterProviderFactory; import com.fr.transaction.CallBackAdaptor; import com.fr.transaction.Configurations; import com.fr.transaction.Worker; @@ -53,7 +52,7 @@ public class GlobalTableDataAction extends UpdateAction implements ResponseDataS @Override public String getMenuName() { - return com.fr.design.i18n.Toolkit.i18nText("DS-Server_TableData"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_DS_Server_TableData"); } @Override diff --git a/designer-base/src/main/java/com/fr/design/condition/LiteConditionPane.java b/designer-base/src/main/java/com/fr/design/condition/LiteConditionPane.java index 5a52f9ee6..e5b291bd0 100644 --- a/designer-base/src/main/java/com/fr/design/condition/LiteConditionPane.java +++ b/designer-base/src/main/java/com/fr/design/condition/LiteConditionPane.java @@ -464,13 +464,13 @@ public abstract class LiteConditionPane extends BasicBeanPa moveDownButton.addActionListener(actionListener5); // peter:加括号 - bracketButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("ConditionB-Add_bracket")); + bracketButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_ConditionB_Add_bracket")); buttonPane.add(bracketButton); bracketButton.setIcon(BaseUtils.readIcon("com/fr/design/images/condition/bracket.png")); bracketButton.addActionListener(actionListener6); // peter:去掉括号 - unBracketButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("ConditionB-Remove_bracket")); + unBracketButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_ConditionB_Remove_bracket")); buttonPane.add(unBracketButton); unBracketButton.setIcon(BaseUtils.readIcon("com/fr/design/images/condition/unBracket.png")); unBracketButton.addActionListener(actionListener7); diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/ReportTableDataPane.java b/designer-base/src/main/java/com/fr/design/data/datapane/ReportTableDataPane.java index 229820626..b480e168c 100644 --- a/designer-base/src/main/java/com/fr/design/data/datapane/ReportTableDataPane.java +++ b/designer-base/src/main/java/com/fr/design/data/datapane/ReportTableDataPane.java @@ -36,7 +36,7 @@ public class ReportTableDataPane extends LoadingBasicPane { @Override protected String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("DS-Report_TableData"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_DS_Report_TableData"); } public void populate(TableDataSource tds) { diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/TableDataCreatorProducer.java b/designer-base/src/main/java/com/fr/design/data/datapane/TableDataCreatorProducer.java index 0b298fdc9..a24169b09 100644 --- a/designer-base/src/main/java/com/fr/design/data/datapane/TableDataCreatorProducer.java +++ b/designer-base/src/main/java/com/fr/design/data/datapane/TableDataCreatorProducer.java @@ -31,7 +31,7 @@ public class TableDataCreatorProducer { } public TableDataNameObjectCreator[] createReportTableDataCreator() { - TableDataNameObjectCreator dataBase = new TableDataNameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("DS-Database_Query"), + TableDataNameObjectCreator dataBase = new TableDataNameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_DS_Database_Query"), "ds", "/com/fr/design/images/data/database.png", DBTableData.class, DBTableDataPane.class); TableDataNameObjectCreator ds_Class = new TableDataNameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tabledata_Type_Class"), diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/TableDataSourceOP.java b/designer-base/src/main/java/com/fr/design/data/datapane/TableDataSourceOP.java index 00a46a5f8..f6dcbaa52 100644 --- a/designer-base/src/main/java/com/fr/design/data/datapane/TableDataSourceOP.java +++ b/designer-base/src/main/java/com/fr/design/data/datapane/TableDataSourceOP.java @@ -106,7 +106,7 @@ public class TableDataSourceOP implements UserObjectOP { } private ExpandMutableTreeNode initServerDataNode(Map serverDataMap) { - ExpandMutableTreeNode templateNode = new ExpandMutableTreeNode(new NameObject(com.fr.design.i18n.Toolkit.i18nText("DS-Server_TableData"), SERVER_TABLE_DATA), false); + ExpandMutableTreeNode templateNode = new ExpandMutableTreeNode(new NameObject(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_DS_Server_TableData"), SERVER_TABLE_DATA), false); templateNode.addChildTreeNodes(getNodeArrayFromMap(serverDataMap)); return templateNode; } diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/TableDataTreePane.java b/designer-base/src/main/java/com/fr/design/data/datapane/TableDataTreePane.java index 309502e80..607510aeb 100644 --- a/designer-base/src/main/java/com/fr/design/data/datapane/TableDataTreePane.java +++ b/designer-base/src/main/java/com/fr/design/data/datapane/TableDataTreePane.java @@ -162,7 +162,7 @@ public class TableDataTreePane extends BasicTableDataTreePane { protected void initbuttonGroup() { // Icon[] iconArray = {BaseUtils.readIcon("/com/fr/design/images/data/datasource.png"), BaseUtils.readIcon("/com/fr/design/images/data/dock/serverdatabase.png")}; final Integer[] modeArray = {TEMPLATE_TABLE_DATA, SERVER_TABLE_DATA}; - String[] textArray = {com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tabledata_Source_Type_Template"), com.fr.design.i18n.Toolkit.i18nText("DS-Server_TableData")}; + String[] textArray = {com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tabledata_Source_Type_Template"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_DS_Server_TableData")}; buttonGroup = new UIHeadGroup(textArray) { public void tabChanged(int index) { if (op != null) { diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/connect/DatabaseConnectionPane.java b/designer-base/src/main/java/com/fr/design/data/datapane/connect/DatabaseConnectionPane.java index e867febd5..5cf887bdd 100644 --- a/designer-base/src/main/java/com/fr/design/data/datapane/connect/DatabaseConnectionPane.java +++ b/designer-base/src/main/java/com/fr/design/data/datapane/connect/DatabaseConnectionPane.java @@ -70,11 +70,11 @@ public abstract class DatabaseConnectionPane { }); Component[][] components = { - {new UILabel(com.fr.design.i18n.Toolkit.i18nText("DS-Class_Name") + ":"), reportletNamePane}, + {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_DS_Class_Name") + ":"), reportletNamePane}, {null, new UILabel(com.fr.design.i18n.Toolkit.i18nText("Function-The_class_must_implement_the_interface") + "\"com.fr.data.Tabledata\"")}, {null, new UILabel(com.fr.design.i18n.Toolkit.i18nText("Example") + ":\"com.fr.data.impl.ArrayTableData\"")}, {null,new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Class_Location_Description", StableUtils.pathJoin(ProjectConstants.WEBINF_NAME, ProjectConstants.CLASSES_NAME)))} @@ -154,7 +154,7 @@ public class ClassTableDataPane extends AbstractTableDataPane { @Override protected String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("DS-Class_TableData"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_DS_Class_TableData"); } @Override diff --git a/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/DecoratedTableDataPane.java b/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/DecoratedTableDataPane.java index 6fa627131..2ab3fee59 100644 --- a/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/DecoratedTableDataPane.java +++ b/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/DecoratedTableDataPane.java @@ -68,7 +68,7 @@ public class DecoratedTableDataPane extends AbstractTableDataPane { JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Database_Connection_Failed"), null, 0, UIManager.getIcon("OptionPane.errorIcon")); } else { - JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Datasource-Connection_successfully")); + JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Datasource_Connection_Successfully")); try { in.close(); } catch (IOException e) { diff --git a/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/MultiTDTableDataPane.java b/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/MultiTDTableDataPane.java index 42cdbda84..b13bd258c 100644 --- a/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/MultiTDTableDataPane.java +++ b/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/MultiTDTableDataPane.java @@ -190,7 +190,7 @@ public class MultiTDTableDataPane extends AbstractTableDataPane { * @param value */ public ColumnIndexEditor(int value) { - this(value, com.fr.design.i18n.Toolkit.i18nText("Datasource-Column_Index")); + this(value, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Datasource_Column_Index")); } public ColumnIndexEditor(int value, String name) { diff --git a/designer-base/src/main/java/com/fr/design/editor/editor/OldColumnIndexEditor.java b/designer-base/src/main/java/com/fr/design/editor/editor/OldColumnIndexEditor.java index 42d117862..842d83c5f 100644 --- a/designer-base/src/main/java/com/fr/design/editor/editor/OldColumnIndexEditor.java +++ b/designer-base/src/main/java/com/fr/design/editor/editor/OldColumnIndexEditor.java @@ -51,7 +51,7 @@ public class OldColumnIndexEditor extends Editor { } protected void initComponents() { - indexCheckBox = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Datasource-Column_Index")); + indexCheckBox = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Datasource_Column_Index")); nameCheckBox = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("ColumnName")); indexCheckBox.addActionListener(actionListener); nameCheckBox.addActionListener(actionListener); diff --git a/designer-base/src/main/java/com/fr/design/file/TemplateTreePane.java b/designer-base/src/main/java/com/fr/design/file/TemplateTreePane.java index a6818827c..d89a5a2f0 100644 --- a/designer-base/src/main/java/com/fr/design/file/TemplateTreePane.java +++ b/designer-base/src/main/java/com/fr/design/file/TemplateTreePane.java @@ -168,7 +168,7 @@ public class TemplateTreePane extends JPanel implements FileOperations { if (reportPaths.length == 0) { return; } - if (JOptionPane.showConfirmDialog(null, com.fr.design.i18n.Toolkit.i18nText("Confirm-Delete-File")) != JOptionPane.OK_OPTION) { + if (JOptionPane.showConfirmDialog(null, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Confirm_Delete-File")) != JOptionPane.OK_OPTION) { return; } for (String reportPath : reportPaths) { diff --git a/designer-base/src/main/java/com/fr/design/formula/FunctionManagerPane.java b/designer-base/src/main/java/com/fr/design/formula/FunctionManagerPane.java index a18c13cd7..57ad06d7d 100644 --- a/designer-base/src/main/java/com/fr/design/formula/FunctionManagerPane.java +++ b/designer-base/src/main/java/com/fr/design/formula/FunctionManagerPane.java @@ -142,7 +142,7 @@ public class FunctionManagerPane extends BasicPane { editorButton.setPreferredSize(new Dimension(editorButton.getPreferredSize().width, classNameTextField.getPreferredSize().height)); reportletNamePane.add(editorButton); editorButton.addActionListener(createEditorButtonActionListener()); - northPane.add(GUICoreUtils.createFlowPane(new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("DS-Class_Name") + ":"), + northPane.add(GUICoreUtils.createFlowPane(new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_DS_Class_Name") + ":"), reportletNamePane}, FlowLayout.LEFT)); DescriptionTextArea descriptionArea = new DescriptionTextArea(); descriptionArea.setWrapStyleWord(true); diff --git a/designer-base/src/main/java/com/fr/design/formula/JavaEditorPane.java b/designer-base/src/main/java/com/fr/design/formula/JavaEditorPane.java index 4bfd27189..edbf73300 100644 --- a/designer-base/src/main/java/com/fr/design/formula/JavaEditorPane.java +++ b/designer-base/src/main/java/com/fr/design/formula/JavaEditorPane.java @@ -185,7 +185,7 @@ public class JavaEditorPane extends BasicPane { className = info.getIntactClassName(); String message = info.getCompileMessage(); if (StringUtils.isEmpty(message)) { - message = com.fr.design.i18n.Toolkit.i18nText("Compile_Success") + "!"; + message = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Compile_Success") + "!"; } JOptionPane.showMessageDialog(null, message); } catch (InterruptedException e1) { diff --git a/designer-base/src/main/java/com/fr/design/formula/TinyFormulaPane.java b/designer-base/src/main/java/com/fr/design/formula/TinyFormulaPane.java index 2a2b6db5c..12df93459 100644 --- a/designer-base/src/main/java/com/fr/design/formula/TinyFormulaPane.java +++ b/designer-base/src/main/java/com/fr/design/formula/TinyFormulaPane.java @@ -35,7 +35,7 @@ public class TinyFormulaPane extends BasicBeanPane implements UIObserver protected void initComponents() { formulaTextField = new UITextField(); - formulaTextField.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("ExpandD-Sort_After_Expand")); + formulaTextField.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_ExpandD_Sort_After_Expand")); // 添加一公式编辑器按钮 formulaTextFieldButton = new UIButton(BaseUtils.readIcon("/com/fr/design/images/m_insert/formula.png")); diff --git a/designer-base/src/main/java/com/fr/design/gui/controlpane/JListControlPane.java b/designer-base/src/main/java/com/fr/design/gui/controlpane/JListControlPane.java index fcf7b6786..fd6f38567 100644 --- a/designer-base/src/main/java/com/fr/design/gui/controlpane/JListControlPane.java +++ b/designer-base/src/main/java/com/fr/design/gui/controlpane/JListControlPane.java @@ -385,7 +385,7 @@ public abstract class JListControlPane extends JControlPane { continue; } boolean isTrue = ComparatorUtils.equals(creator.menuName(), com.fr.design.i18n.Toolkit.i18nText("Datasource-Stored_Procedure")) || - ComparatorUtils.equals(creator.menuName(), com.fr.design.i18n.Toolkit.i18nText("DS-Relation_TableData")) || ComparatorUtils.equals(creator.menuName(), com.fr.design.i18n.Toolkit.i18nText("DS-Multi_Dimensional_Database")); + ComparatorUtils.equals(creator.menuName(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_DS_Relation_TableData")) || ComparatorUtils.equals(creator.menuName(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_DS_Multi_Dimensional_Database")); if (isTrue) { this.addShortCut(new LineSeparator()); } diff --git a/designer-base/src/main/java/com/fr/design/gui/controlpane/UIListControlPane.java b/designer-base/src/main/java/com/fr/design/gui/controlpane/UIListControlPane.java index 69cd6d020..225354ccd 100644 --- a/designer-base/src/main/java/com/fr/design/gui/controlpane/UIListControlPane.java +++ b/designer-base/src/main/java/com/fr/design/gui/controlpane/UIListControlPane.java @@ -468,7 +468,7 @@ public abstract class UIListControlPane extends UIControlPane { continue; } boolean isTrue = ComparatorUtils.equals(creator.menuName(), com.fr.design.i18n.Toolkit.i18nText("Datasource-Stored_Procedure")) || - ComparatorUtils.equals(creator.menuName(), com.fr.design.i18n.Toolkit.i18nText("DS-Relation_TableData")) || ComparatorUtils.equals(creator.menuName(), com.fr.design.i18n.Toolkit.i18nText("DS-Multi_Dimensional_Database")); + ComparatorUtils.equals(creator.menuName(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_DS_Relation_TableData")) || ComparatorUtils.equals(creator.menuName(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_DS_Multi_Dimensional_Database")); if (isTrue) { this.addShortCut(new LineSeparator()); } diff --git a/designer-base/src/main/java/com/fr/design/gui/syntax/ui/rsyntaxtextarea/RSyntaxTextArea.java b/designer-base/src/main/java/com/fr/design/gui/syntax/ui/rsyntaxtextarea/RSyntaxTextArea.java index a71d0701f..3d04602f2 100644 --- a/designer-base/src/main/java/com/fr/design/gui/syntax/ui/rsyntaxtextarea/RSyntaxTextArea.java +++ b/designer-base/src/main/java/com/fr/design/gui/syntax/ui/rsyntaxtextarea/RSyntaxTextArea.java @@ -33,7 +33,6 @@ import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.ResourceBundle; import javax.swing.JLabel; import javax.swing.JMenu; import javax.swing.JPopupMenu; @@ -474,7 +473,7 @@ private boolean fractionalFontMetricsEnabled; */ protected void appendFoldingMenu(JPopupMenu popup) { popup.addSeparator(); - foldingMenu = new JMenu(com.fr.design.i18n.Toolkit.i18nText("ContextMenu.Folding")); + foldingMenu = new JMenu(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Context_Menu_Folding")); foldingMenu.add(createPopupMenuItem(toggleCurrentFoldAction)); foldingMenu.add(createPopupMenuItem(collapseAllCommentFoldsAction)); foldingMenu.add(createPopupMenuItem(collapseAllFoldsAction)); diff --git a/designer-base/src/main/java/com/fr/design/javascript/EmailPane.java b/designer-base/src/main/java/com/fr/design/javascript/EmailPane.java index 50702419c..83665a610 100644 --- a/designer-base/src/main/java/com/fr/design/javascript/EmailPane.java +++ b/designer-base/src/main/java/com/fr/design/javascript/EmailPane.java @@ -61,7 +61,7 @@ public class EmailPane extends FurtherBasicBeanPane { protected void initCenterPane(UILabel mainTextLabel, JScrollPane scrollPane, double fill, double preferred) { double[] rowSize = { preferred, preferred, preferred, preferred, preferred, fill, preferred, preferred, preferred }; double[] columnSize = { preferred, fill}; - showTplContent = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Email-Can_Preview_Report_Content")); + showTplContent = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Email_Can_Preview_Report_Content")); centerPane = TableLayoutHelper.createCommonTableLayoutPane(new JComponent[][]{ {new UILabel(), tipsPane1}, createLinePane(com.fr.design.i18n.Toolkit.i18nText("HJS-Mail_to"), maitoEditor = new UITextField()), diff --git a/designer-base/src/main/java/com/fr/design/mainframe/DecodeDialog.java b/designer-base/src/main/java/com/fr/design/mainframe/DecodeDialog.java index 1f8cf6770..1b28ae8c4 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/DecodeDialog.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/DecodeDialog.java @@ -33,7 +33,7 @@ public class DecodeDialog { jd = new JDialog(); jd.setLayout(null); - UILabel newNameLable = new UILabel(com.fr.design.i18n.Toolkit.i18nText("ECP_input_pwd")); + UILabel newNameLable = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_ECP_Input_Pwd")); newNameLable.setBounds(20, 10, 130, 30); jt = new UITextField(StringUtils.EMPTY); jt.selectAll(); @@ -57,7 +57,7 @@ public class DecodeDialog { DesignerEnvManager.getEnvManager().setEncryptionKey(CodeUtils.passwordEncode(key)); }else{ isPwdRight = false; - hintsLabel.setText(com.fr.design.i18n.Toolkit.i18nText("ECP_re_input")); + hintsLabel.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_ECP_Re_Input")); hintsLabel.setVisible(true); } } @@ -76,7 +76,7 @@ public class DecodeDialog { jd.add(hintsLabel); jd.setSize(340, 180); jd.setModal(true); - jd.setTitle(com.fr.design.i18n.Toolkit.i18nText("ECP_decode")); + jd.setTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_ECP_Decode")); jd.setResizable(false); jd.setAlwaysOnTop(true); jd.setIconImage(BaseUtils.readImage("/com/fr/base/images/oem/logo.png")); diff --git a/designer-base/src/main/java/com/fr/design/mainframe/TemplatePane.java b/designer-base/src/main/java/com/fr/design/mainframe/TemplatePane.java index 697a7b3ab..7d8634738 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/TemplatePane.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/TemplatePane.java @@ -108,7 +108,7 @@ public class TemplatePane extends JPanel implements MouseListener { editButton.setBorder(BorderFactory.createEmptyBorder(2, 0, 0, 10)); editButton.setMargin(null); editButton.setCursor(new Cursor(Cursor.HAND_CURSOR)); - editButton.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Env-Configure_Workspace")); + editButton.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Env_Configure_Workspace")); this.add(new UILabel(" "), BorderLayout.WEST); this.add(editButton, BorderLayout.EAST); editButton.addActionListener(new ActionListener() { diff --git a/designer-base/src/main/java/com/fr/design/menu/KeySetUtils.java b/designer-base/src/main/java/com/fr/design/menu/KeySetUtils.java index 15c03e320..bb6967708 100644 --- a/designer-base/src/main/java/com/fr/design/menu/KeySetUtils.java +++ b/designer-base/src/main/java/com/fr/design/menu/KeySetUtils.java @@ -415,7 +415,7 @@ public class KeySetUtils { @Override public String getMenuName() { - return com.fr.design.i18n.Toolkit.i18nText("DS-Report_TableData"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_DS_Report_TableData"); } @Override diff --git a/designer-base/src/main/java/com/fr/design/present/dict/CustomDictPane.java b/designer-base/src/main/java/com/fr/design/present/dict/CustomDictPane.java index 33a49c311..9819fa0a0 100644 --- a/designer-base/src/main/java/com/fr/design/present/dict/CustomDictPane.java +++ b/designer-base/src/main/java/com/fr/design/present/dict/CustomDictPane.java @@ -8,7 +8,6 @@ import javax.swing.event.ChangeEvent; import com.fr.data.impl.CustomDictionary; import com.fr.design.beans.FurtherBasicBeanPane; -import com.fr.design.gui.frpane.UICorrelationPane; import com.fr.design.gui.icontainer.UIScrollPane; import com.fr.design.layout.FRGUIPaneFactory; @@ -72,7 +71,7 @@ public class CustomDictPane extends FurtherBasicBeanPane { @Override public String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("Datasource-User_Defined"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Datasource_User_Defined"); } @Override diff --git a/designer-base/src/main/java/com/fr/design/style/FormatPane.java b/designer-base/src/main/java/com/fr/design/style/FormatPane.java index 9883f94de..0c553bd8d 100644 --- a/designer-base/src/main/java/com/fr/design/style/FormatPane.java +++ b/designer-base/src/main/java/com/fr/design/style/FormatPane.java @@ -359,7 +359,7 @@ public class FormatPane extends BasicPane { SimpleDateFormat simpleDateFormat = new SimpleDateFormat(text); String sample = simpleDateFormat.format(new Date()); if (!ArrayUtils.contains(FormatField.getInstance().getDateFormatArray(), text)) { - sample += " " + com.fr.design.i18n.Toolkit.i18nText("DateFormat-Custom_Warning"); + sample += " " + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_DateFormat_Custom_Warning"); c = Color.red; } this.sampleLabel.setText(sample); diff --git a/designer-base/src/main/java/com/fr/design/style/background/BackgroundSelectPane.java b/designer-base/src/main/java/com/fr/design/style/background/BackgroundSelectPane.java index 3add0af1e..93ca55c1a 100644 --- a/designer-base/src/main/java/com/fr/design/style/background/BackgroundSelectPane.java +++ b/designer-base/src/main/java/com/fr/design/style/background/BackgroundSelectPane.java @@ -42,7 +42,7 @@ public abstract class BackgroundSelectPane extends BasicPane { this.add(backgroundPane, BorderLayout.CENTER); - UIButton button = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Choose_None")); + UIButton button = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Choose_None")); this.add(button, BorderLayout.SOUTH); button.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { diff --git a/designer-base/src/main/java/com/fr/design/widget/component/CheckBoxDictPane.java b/designer-base/src/main/java/com/fr/design/widget/component/CheckBoxDictPane.java index 623ff3564..9874a01f3 100644 --- a/designer-base/src/main/java/com/fr/design/widget/component/CheckBoxDictPane.java +++ b/designer-base/src/main/java/com/fr/design/widget/component/CheckBoxDictPane.java @@ -36,8 +36,8 @@ public class CheckBoxDictPane extends JPanel { endComboBox.setEditable(true); Component[][] components = new Component[][]{ new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Form-Delimiter")), delimiterComboBox}, - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("ComboCheckBox-Start_Symbol")),startComboBox}, - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("ComboCheckBox-End_Symbol")),endComboBox} + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Combo_CheckBox_Start_Symbol")),startComboBox}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Combo_CheckBox_End_Symbol")),endComboBox} }; returnStringPane = TableLayoutHelper.createGapTableLayoutPane(components, TableLayoutHelper.FILL_LASTCOLUMN, IntervalConstants.INTERVAL_W2, IntervalConstants.INTERVAL_L1); diff --git a/designer-base/src/main/java/com/fr/env/EnvListPane.java b/designer-base/src/main/java/com/fr/env/EnvListPane.java index 61a4dfcd4..6bff9638f 100644 --- a/designer-base/src/main/java/com/fr/env/EnvListPane.java +++ b/designer-base/src/main/java/com/fr/env/EnvListPane.java @@ -55,14 +55,14 @@ public class EnvListPane extends JListControlPane { public NameableCreator[] createNameableCreators() { NameableCreator local = new NameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("FR-Engine-Local_Workspace"), "com/fr/design/images/data/bind/localconnect.png", LocalDesignerWorkspaceInfo.class, LocalEnvPane.class); - NameableCreator remote = new NameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Env-Remote_Server"), "com/fr/design/images/data/bind/distanceconnect.png", + NameableCreator remote = new NameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Env_Remote_Server"), "com/fr/design/images/data/bind/distanceconnect.png", RemoteDesignerWorkspaceInfo.class, RemoteEnvPane.class); return new NameableCreator[]{local, remote}; } @Override protected String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("Env-Configure_Workspace"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Env_Configure_Workspace"); } /** diff --git a/designer-base/src/main/java/com/fr/env/LocalEnvPane.java b/designer-base/src/main/java/com/fr/env/LocalEnvPane.java index 84a47acd6..3aac63997 100644 --- a/designer-base/src/main/java/com/fr/env/LocalEnvPane.java +++ b/designer-base/src/main/java/com/fr/env/LocalEnvPane.java @@ -60,7 +60,7 @@ public class LocalEnvPane extends BasicBeanPane { UITextArea description = new UITextArea(); centerPane.add(description, BorderLayout.SOUTH); - description.setText(com.fr.design.i18n.Toolkit.i18nText("Env-Des1")); + description.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Env_Des1")); description.setEditable(false); } diff --git a/designer-base/src/main/java/com/fr/env/RemoteEnvPane.java b/designer-base/src/main/java/com/fr/env/RemoteEnvPane.java index 408dc6c5d..6315cc4e0 100644 --- a/designer-base/src/main/java/com/fr/env/RemoteEnvPane.java +++ b/designer-base/src/main/java/com/fr/env/RemoteEnvPane.java @@ -464,7 +464,7 @@ public class RemoteEnvPane extends BasicBeanPane { @Override public void mouseEntered(MouseEvent e) { if (java.awt.Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK)) { - passwordInput.setToolTipText(Toolkit.i18nText("CapsLock")); + passwordInput.setToolTipText(Toolkit.i18nText("Fine-Design_Basic_CapsLock")); } else { passwordInput.setToolTipText(null); } diff --git a/designer-chart/src/main/java/com/fr/design/chart/javascript/ChartEmailPane.java b/designer-chart/src/main/java/com/fr/design/chart/javascript/ChartEmailPane.java index e61c34752..fe60b47b3 100644 --- a/designer-chart/src/main/java/com/fr/design/chart/javascript/ChartEmailPane.java +++ b/designer-chart/src/main/java/com/fr/design/chart/javascript/ChartEmailPane.java @@ -32,7 +32,7 @@ public class ChartEmailPane extends EmailPane{ JPanel contentPane; if (supportExport) { double[] rSizes = { preferred, preferred, preferred, preferred, preferred, fill, preferred, preferred}; - showTplContent = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Email-Can_Preview_Report_Content")); + showTplContent = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Email_Can_Preview_Report_Content")); contentPane = TableLayoutHelper.createCommonTableLayoutPane(new JComponent[][]{ {new UILabel(), tipsPane1}, createLinePane(com.fr.design.i18n.Toolkit.i18nText("HJS-Mail_to"), maitoEditor = new UITextField()), diff --git a/designer-form/src/main/java/com/fr/design/designer/creator/XCheckBoxGroup.java b/designer-form/src/main/java/com/fr/design/designer/creator/XCheckBoxGroup.java index 1d9416911..54cdf6d30 100644 --- a/designer-form/src/main/java/com/fr/design/designer/creator/XCheckBoxGroup.java +++ b/designer-form/src/main/java/com/fr/design/designer/creator/XCheckBoxGroup.java @@ -58,9 +58,9 @@ public class XCheckBoxGroup extends XFieldEditor { new CRPropertyDescriptor("delimiter", this.data.getClass()).setI18NName( com.fr.design.i18n.Toolkit.i18nText("Form-Delimiter")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), new CRPropertyDescriptor("startSymbol", this.data.getClass()).setI18NName( - com.fr.design.i18n.Toolkit.i18nText("ComboCheckBox-Start_Symbol")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Combo_CheckBox_Start_Symbol")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), new CRPropertyDescriptor("endSymbol", this.data.getClass()).setI18NName( - com.fr.design.i18n.Toolkit.i18nText("ComboCheckBox-End_Symbol")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced") }); + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Combo_CheckBox_End_Symbol")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced") }); } if (!((CheckBoxGroup) this.toData()).isAdaptive()) { crp = (CRPropertyDescriptor[]) ArrayUtils.add(crp, new CRPropertyDescriptor("columnsInRow", this.data diff --git a/designer-form/src/main/java/com/fr/design/designer/creator/XComboCheckBox.java b/designer-form/src/main/java/com/fr/design/designer/creator/XComboCheckBox.java index 6ec877ad9..0e30258c9 100644 --- a/designer-form/src/main/java/com/fr/design/designer/creator/XComboCheckBox.java +++ b/designer-form/src/main/java/com/fr/design/designer/creator/XComboCheckBox.java @@ -41,10 +41,10 @@ public class XComboCheckBox extends XComboBox { com.fr.design.i18n.Toolkit.i18nText("Return-String")).setEditorClass(InChangeBooleanEditor.class) .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), new CRPropertyDescriptor("startSymbol", this.data.getClass()).setI18NName( - com.fr.design.i18n.Toolkit.i18nText("ComboCheckBox-Start_Symbol")) + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Combo_CheckBox_Start_Symbol")) .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), new CRPropertyDescriptor("endSymbol", this.data.getClass()).setI18NName( - com.fr.design.i18n.Toolkit.i18nText("ComboCheckBox-End_Symbol")) + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Combo_CheckBox_End_Symbol")) .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced") }); } diff --git a/designer-form/src/main/java/com/fr/design/widget/ui/designer/DateEditorDefinePane.java b/designer-form/src/main/java/com/fr/design/widget/ui/designer/DateEditorDefinePane.java index daa7f2234..8fa6102ed 100644 --- a/designer-form/src/main/java/com/fr/design/widget/ui/designer/DateEditorDefinePane.java +++ b/designer-form/src/main/java/com/fr/design/widget/ui/designer/DateEditorDefinePane.java @@ -174,7 +174,7 @@ public class DateEditorDefinePane extends DirectWriteEditorDefinePane