From 53dc93c96e6c4a2a4a6b2e8dfa9ae001e1ea1455 Mon Sep 17 00:00:00 2001 From: 3dot141 Date: Mon, 6 Aug 2018 20:12:05 +0800 Subject: [PATCH] =?UTF-8?q?REPORT-10025=2010.0=20&=205.0=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E4=BE=9D=E6=8D=AE=E5=9B=BD=E9=99=85=E5=8C=96=E8=A7=84=E8=8C=83?= =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=9B=BD=E9=99=85=E5=8C=96=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../actions/ExitAuthorityEditAction.java | 4 +- .../design/actions/file/PreferencePane.java | 4 +- .../fr/design/actions/help/AboutDialog.java | 32 +++++------ .../fr/design/actions/help/FeedBackPane.java | 8 +-- .../com/fr/design/constants/UIConstants.java | 6 +- .../fr/design/data/datapane/ChoosePane.java | 4 +- .../datapane/TableDataCreatorProducer.java | 2 +- .../data/datapane/VerticalChoosePane.java | 4 +- .../datapane/connect/ConnectionListPane.java | 6 +- .../data/datapane/connect/JDBCDefPane.java | 8 +-- .../datapane/preview/PreviewTablePane.java | 4 +- .../tabledatapane/ClassTableDataPane.java | 5 +- .../tabledatapane/FileTableDataPane.java | 4 +- .../tabledatapane/OneListTableModel.java | 13 ++--- .../tabledatapane/ProcedureDataPane.java | 6 +- .../wrapper/StoreProcedureDataWrapper.java | 4 +- .../editor/editor/ColumnSelectedEditor.java | 4 +- .../com/fr/design/file/TemplateTreePane.java | 4 +- .../com/fr/design/formula/FormulaPane.java | 4 +- .../fr/design/formula/FunctionConstants.java | 4 +- .../com/fr/design/formula/JavaEditorPane.java | 8 +-- .../java/com/fr/design/gui/NameInspector.java | 2 +- .../design/gui/frpane/LoadingBasicPane.java | 4 +- .../fr/design/gui/icombobox/LazyComboBox.java | 4 +- .../fr/design/gui/ilist/TableViewList.java | 4 +- .../fr/design/gui/imenu/UIScrollMenuDemo.java | 4 +- .../itableeditorpane/UITableModelAdapter.java | 4 +- .../refreshabletree/RefreshableJTree.java | 5 +- .../hyperlink/ReporletHyperNorthPane.java | 4 +- .../design/javascript/JavaScriptImplPane.java | 4 +- .../mainframe/AuthorityPropertyPane.java | 4 +- .../mainframe/NoSupportAuthorityEdit.java | 4 +- .../loghandler/DesignerLogHandler.java | 8 +-- .../widget/editors/DataTableEditor.java | 4 +- .../java/com/fr/design/menu/KeySetUtils.java | 8 +-- .../design/parameter/ParameterArrayPane.java | 6 +- .../fr/design/remote/ui/UserManagerPane.java | 14 ++--- .../java/com/fr/design/style/BorderPane.java | 4 +- .../fr/design/widget/btn/ButtonConstants.java | 4 +- .../component/NumberEditorValidatePane.java | 4 +- .../fr/design/write/submit/CustomJobPane.java | 4 +- .../write/submit/DBManipulationPane.java | 4 +- .../main/java/com/fr/env/RemoteEnvPane.java | 4 +- .../main/java/com/fr/start/BaseDesigner.java | 4 +- .../chart/axis/ChartAlertValuePane.java | 16 +++--- .../fr/design/chart/axis/MinMaxValuePane.java | 6 +- .../gui/style/ChartAxisLineStylePane.java | 4 +- .../fr/design/designer/creator/XButton.java | 10 ++-- .../designer/creator/XFileUploader.java | 4 +- .../designer/creator/XMultiFileUploader.java | 6 +- .../designer/creator/XNumberEditor.java | 4 +- .../mainframe/FormWebWidgetConstants.java | 4 +- .../wrappers/HyperlinkGroupWrapper.java | 6 +- .../ui/designer/MultiFileEditorPane.java | 6 +- .../ui/designer/ParameterTreeComboBox.java | 4 +- .../columnrow/DSColumnConditionAction.java | 6 +- .../design/dscolumn/DSColumnAdvancedPane.java | 8 +-- .../dscolumn/DSColumnConditionsPane.java | 23 ++++---- .../com/fr/design/dscolumn/DSColumnPane.java | 4 +- .../com/fr/design/mainframe/app/CptApp.java | 2 +- .../com/fr/design/report/PageSetupPane.java | 4 +- .../design/report/ValueVerifierEditPane.java | 4 +- .../webattr/ReportWebWidgetConstants.java | 10 ++-- .../com/fr/design/webattr/WebCssPane.java | 4 +- .../java/com/fr/design/webattr/WebJsPane.java | 55 ++++++++++--------- .../cellquick/CellDSColumnEditor.java | 4 +- .../src/main/java/com/fr/start/Designer.java | 2 +- 67 files changed, 216 insertions(+), 229 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/actions/ExitAuthorityEditAction.java b/designer-base/src/main/java/com/fr/design/actions/ExitAuthorityEditAction.java index 4d2b1d40a2..9d81481f78 100644 --- a/designer-base/src/main/java/com/fr/design/actions/ExitAuthorityEditAction.java +++ b/designer-base/src/main/java/com/fr/design/actions/ExitAuthorityEditAction.java @@ -18,7 +18,7 @@ public class ExitAuthorityEditAction extends TemplateComponentAction { public ExitAuthorityEditAction(TargetComponent t) { super(t); - this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Authority_Edit_Status_Exit")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Authority_Edit_Status_Exit")); this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/m_report/exit_authority_edit.png")); } @@ -60,4 +60,4 @@ public class ExitAuthorityEditAction extends TemplateComponentAction { } } } -} \ No newline at end of file +} diff --git a/designer-base/src/main/java/com/fr/design/actions/file/PreferencePane.java b/designer-base/src/main/java/com/fr/design/actions/file/PreferencePane.java index 37405bb55a..e91ccf1650 100644 --- a/designer-base/src/main/java/com/fr/design/actions/file/PreferencePane.java +++ b/designer-base/src/main/java/com/fr/design/actions/file/PreferencePane.java @@ -198,7 +198,7 @@ public class PreferencePane extends BasicPane { private void createEditPane(JPanel generalPane) { //samuel:编辑器设置 - JPanel editPane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Editor_Preference")); + JPanel editPane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Editor_Preference")); generalPane.add(editPane); //设置是否支持将字符串编辑为公式 @@ -667,4 +667,4 @@ public class PreferencePane extends BasicPane { } }); } -} \ No newline at end of file +} diff --git a/designer-base/src/main/java/com/fr/design/actions/help/AboutDialog.java b/designer-base/src/main/java/com/fr/design/actions/help/AboutDialog.java index 0981ea6805..de485a2d20 100644 --- a/designer-base/src/main/java/com/fr/design/actions/help/AboutDialog.java +++ b/designer-base/src/main/java/com/fr/design/actions/help/AboutDialog.java @@ -1,13 +1,10 @@ package com.fr.design.actions.help; -import java.awt.BorderLayout; -import java.awt.Dimension; -import java.awt.Frame; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; -import java.awt.event.KeyEvent; -import java.awt.event.WindowAdapter; -import java.awt.event.WindowEvent; +import com.fr.design.gui.frpane.UITabbedPane; +import com.fr.design.gui.ibutton.UIButton; +import com.fr.design.layout.FRGUIPaneFactory; +import com.fr.design.utils.gui.GUICoreUtils; +import com.fr.stable.ProductConstants; import javax.swing.AbstractAction; import javax.swing.ActionMap; @@ -16,13 +13,14 @@ import javax.swing.JComponent; import javax.swing.JDialog; import javax.swing.JPanel; import javax.swing.KeyStroke; - -import com.fr.design.gui.frpane.UITabbedPane; -import com.fr.design.gui.ibutton.UIButton; -import com.fr.design.layout.FRGUIPaneFactory; - -import com.fr.stable.ProductConstants; -import com.fr.design.utils.gui.GUICoreUtils; +import java.awt.BorderLayout; +import java.awt.Dimension; +import java.awt.Frame; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.awt.event.KeyEvent; +import java.awt.event.WindowAdapter; +import java.awt.event.WindowEvent; /** * Dialog displaying information about the application. @@ -48,7 +46,7 @@ public class AboutDialog extends JDialog implements ActionListener { tabbedPane = new UITabbedPane(); sysPane = new SystemInfoPane(); - tabbedPane.addTab(com.fr.design.i18n.Toolkit.i18nText("About"), aboutPanel); + tabbedPane.addTab(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_About"), aboutPanel); tabbedPane.addTab(com.fr.design.i18n.Toolkit.i18nText("System"), sysPane); buttonPanel = FRGUIPaneFactory.createRightFlowInnerContainer_S_Pane(); @@ -97,4 +95,4 @@ public class AboutDialog extends JDialog implements ActionListener { private JPanel buttonPanel; private UITabbedPane tabbedPane; private UIButton okButton; -} \ No newline at end of file +} 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 3017899768..741ce86ca6 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 @@ -96,7 +96,7 @@ public class FeedBackPane extends BasicPane { public FeedBackPane() { this.setLayout(FRGUIPaneFactory.createBorderLayout()); initDetailArea(); - UILabel tip = new UILabel(com.fr.design.i18n.Toolkit.i18nText("feedback_info")); + UILabel tip = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Feedback_Info")); tip.setBorder(TIP_BORDER); this.add(tip, BorderLayout.NORTH); UIScrollPane scrollPane = new UIScrollPane(initDetailPane()); @@ -135,7 +135,7 @@ public class FeedBackPane extends BasicPane { } }; this.detailField.setForeground(Color.gray); - this.detailField.setText(com.fr.design.i18n.Toolkit.i18nText("feedback_tip")); + this.detailField.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Feedback_Tip")); detailField.addKeyListener(new KeyAdapter() { @Override @@ -156,7 +156,7 @@ public class FeedBackPane extends BasicPane { detailField.setForeground(Color.black); String text = detailField.getText(); // 判断在中文输入状态是否还包含提示符 要删掉 - String tip = com.fr.design.i18n.Toolkit.i18nText("feedback_tip"); + String tip = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Feedback_Tip"); if (text.contains(tip)) { text = text.substring(0, text.indexOf(tip)); detailField.setText(text); @@ -348,4 +348,4 @@ public class FeedBackPane extends BasicPane { } } -} \ No newline at end of file +} diff --git a/designer-base/src/main/java/com/fr/design/constants/UIConstants.java b/designer-base/src/main/java/com/fr/design/constants/UIConstants.java index dfc6ccf13c..22bdc0a737 100644 --- a/designer-base/src/main/java/com/fr/design/constants/UIConstants.java +++ b/designer-base/src/main/java/com/fr/design/constants/UIConstants.java @@ -219,7 +219,7 @@ public interface UIConstants { @Override public String toString() { - return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Loading") + "..."; + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Loading") + "..."; } }; /** @@ -228,7 +228,7 @@ public interface UIConstants { public static final Object CONNECTION_FAILED = new Object() { public String toString() { - return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Database_Connection_Failed") + "!"; + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Database_Connection_Failed") + "!"; } }; @@ -236,4 +236,4 @@ public interface UIConstants { * 自动补全的默认快捷键，一般来说是 alt + /. */ public static final String DEFAULT_AUTO_COMPLETE = "alt + SLASH"; -} \ No newline at end of file +} diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/ChoosePane.java b/designer-base/src/main/java/com/fr/design/data/datapane/ChoosePane.java index 0932e1569f..7f51d8f16d 100644 --- a/designer-base/src/main/java/com/fr/design/data/datapane/ChoosePane.java +++ b/designer-base/src/main/java/com/fr/design/data/datapane/ChoosePane.java @@ -455,7 +455,7 @@ public class ChoosePane extends BasicBeanPane implements Refresha } if (!connect) { DesignerFrame designerFrame = DesignerContext.getDesignerFrame(); - JOptionPane.showMessageDialog(designerFrame, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Database_Connection_Failed"), + JOptionPane.showMessageDialog(designerFrame, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Database_Connection_Failed"), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Failed"), JOptionPane.INFORMATION_MESSAGE); failedToFindTable(); return null; @@ -631,4 +631,4 @@ public class ChoosePane extends BasicBeanPane implements Refresha } } -} \ No newline at end of file +} 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 158a11b8c4..98ba292e76 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 @@ -126,4 +126,4 @@ public class TableDataCreatorProducer { } return (TableDataNameObjectCreator[])ArrayUtils.addAll(creators, list.toArray(new TableDataNameObjectCreator[list.size()])); } -} \ No newline at end of file +} diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/VerticalChoosePane.java b/designer-base/src/main/java/com/fr/design/data/datapane/VerticalChoosePane.java index 69dd0bc327..ae577234dd 100644 --- a/designer-base/src/main/java/com/fr/design/data/datapane/VerticalChoosePane.java +++ b/designer-base/src/main/java/com/fr/design/data/datapane/VerticalChoosePane.java @@ -40,7 +40,7 @@ public class VerticalChoosePane extends ChoosePane implements DesignerBean { rs.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, -RIGHTBORDER)); UILabel l1 = new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Database"), UILabel.LEFT); UILabel l2 = new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Model"), UILabel.LEFT); - UILabel l3 = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Database_Select_Table"), UILabel.LEFT); + UILabel l3 = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Database_Select_Table"), UILabel.LEFT); if (labelSize > 0) { Dimension pSize = new Dimension(labelSize, 20); @@ -66,4 +66,4 @@ public class VerticalChoosePane extends ChoosePane implements DesignerBean { initDsNameComboBox(); } -} \ No newline at end of file +} diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/connect/ConnectionListPane.java b/designer-base/src/main/java/com/fr/design/data/datapane/connect/ConnectionListPane.java index d0ec909518..484a9c1161 100644 --- a/designer-base/src/main/java/com/fr/design/data/datapane/connect/ConnectionListPane.java +++ b/designer-base/src/main/java/com/fr/design/data/datapane/connect/ConnectionListPane.java @@ -43,7 +43,7 @@ public class ConnectionListPane extends JListControlPane implements ConnectionSh String tempName = getEditingName(); if (StringUtils.isEmpty(tempName)) { nameableList.stopEditing(); - JOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(ConnectionListPane.this), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Connection_Empty_Name")); + JOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(ConnectionListPane.this), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Connection_Empty_Name")); setIllegalIndex(editingIndex); isNamePermitted = false; return; @@ -52,7 +52,7 @@ public class ConnectionListPane extends JListControlPane implements ConnectionSh && isNameRepeated(new List[]{Arrays.asList(allListNames)}, tempName)) { isNamePermitted = false; nameableList.stopEditing(); - String message = Toolkit.i18nText("Fine-Design_Connection_Duplicate_Name", tempName); + String message = Toolkit.i18nText("Fine-Design_Basic_Connection_Duplicate_Name", tempName); JOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(ConnectionListPane.this), message); setIllegalIndex(editingIndex); } @@ -158,4 +158,4 @@ public class ConnectionListPane extends JListControlPane implements ConnectionSh connectionConfig.addConnection(nameObject.getName(), (Connection) nameObject.getObject()); } } -} \ No newline at end of file +} diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/connect/JDBCDefPane.java b/designer-base/src/main/java/com/fr/design/data/datapane/connect/JDBCDefPane.java index d2bd11e167..77ac5011d7 100644 --- a/designer-base/src/main/java/com/fr/design/data/datapane/connect/JDBCDefPane.java +++ b/designer-base/src/main/java/com/fr/design/data/datapane/connect/JDBCDefPane.java @@ -335,15 +335,15 @@ public class JDBCDefPane extends JPanel { {new UILabel(com.fr.design.i18n.Toolkit.i18nText("DBCP_MAX_ACTIVE") + ":", SwingConstants.RIGHT), DBCP_MAX_ACTIVE}, {new UILabel(com.fr.design.i18n.Toolkit.i18nText("DBCP_MAX_IDLE") + ":", SwingConstants.RIGHT), DBCP_MAX_IDLE}, {new UILabel(com.fr.design.i18n.Toolkit.i18nText("DBCP_MIN_IDLE") + ":", SwingConstants.RIGHT), DBCP_MIN_IDLE}, - {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Connection_Pool_Max_Wait_Time") + ":" , SwingConstants.RIGHT), DBCP_MAX_WAIT}, + {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Connection_Pool_Max_Wait_Time") + ":" , SwingConstants.RIGHT), DBCP_MAX_WAIT}, {new UILabel(com.fr.design.i18n.Toolkit.i18nText("DBCP_VALIDATION_QUERY") + ":", SwingConstants.RIGHT), DBCP_VALIDATION_QUERY}, {new UILabel(com.fr.design.i18n.Toolkit.i18nText("DBCP_TEST_ON_BORROW") + ":", SwingConstants.RIGHT), DBCP_TESTONBORROW}, {new UILabel(com.fr.design.i18n.Toolkit.i18nText("DBCP_TEST_ON_RETURN") + ":", SwingConstants.RIGHT), DBCP_TESTONRETURN}, {new UILabel(com.fr.design.i18n.Toolkit.i18nText("DBCP_TEST_WHILE_IDLE") + ":", SwingConstants.RIGHT), DBCP_TESTWHILEIDLE}, - {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Connection_Pool_Evictionruns_millis") + ":", SwingConstants.RIGHT), + {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Connection_Pool_Evictionruns_millis") + ":", SwingConstants.RIGHT), DBCP_TIMEBETWEENEVICTIONRUNSMILLS}, {new UILabel(com.fr.design.i18n.Toolkit.i18nText("DBCP_NUM_TEST_PER_EVCTION_RUN") + ":", SwingConstants.RIGHT), DBCP_NUMTESTSPEREVICTIONRUN}, - {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Connection_Pool_Mix_Evictable_Idle_Time_Millis") + ":" , SwingConstants.RIGHT), + {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Connection_Pool_Mix_Evictable_Idle_Time_Millis") + ":" , SwingConstants.RIGHT), DBCP_MINEVICTABLEIDLETIMEMILLIS}}; JPanel contextPane = TableLayoutHelper.createGapTableLayoutPane(comps, rowSize, columnSize, 10, 4); @@ -374,4 +374,4 @@ public class JDBCDefPane extends JPanel { private String driver; private String url; } -} \ No newline at end of file +} diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/preview/PreviewTablePane.java b/designer-base/src/main/java/com/fr/design/data/datapane/preview/PreviewTablePane.java index 73bb7d105a..c46279aca8 100644 --- a/designer-base/src/main/java/com/fr/design/data/datapane/preview/PreviewTablePane.java +++ b/designer-base/src/main/java/com/fr/design/data/datapane/preview/PreviewTablePane.java @@ -362,7 +362,7 @@ public class PreviewTablePane extends BasicPane { boolean status = DataOperator.getInstance().testConnection(((DBTableData) tableData).getDatabase()); if (!status) { connectionBar.close(); - throw new Exception(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Database_Connection_Failed")); + throw new Exception(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Database_Connection_Failed")); } } connectionBar.close(); @@ -485,4 +485,4 @@ public class PreviewTablePane extends BasicPane { fireLoadedListener(); } -} \ No newline at end of file +} diff --git a/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/ClassTableDataPane.java b/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/ClassTableDataPane.java index 01e8c27b22..9b33532f8d 100644 --- a/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/ClassTableDataPane.java +++ b/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/ClassTableDataPane.java @@ -25,7 +25,6 @@ import javax.swing.*; import java.awt.*; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; -import java.io.File; public class ClassTableDataPane extends AbstractTableDataPane { private UITextField classNameTextField; @@ -93,7 +92,7 @@ public class ClassTableDataPane extends AbstractTableDataPane { {new UILabel(com.fr.design.i18n.Toolkit.i18nText("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_Class_Location_Description", StableUtils.pathJoin(ProjectConstants.WEBINF_NAME, ProjectConstants.CLASSES_NAME)))} + {null,new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Class_Location_Description", StableUtils.pathJoin(ProjectConstants.WEBINF_NAME, ProjectConstants.CLASSES_NAME)))} }; JPanel northPane = TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize); this.add(northPane, BorderLayout.NORTH); @@ -174,4 +173,4 @@ public class ClassTableDataPane extends AbstractTableDataPane { } -} \ No newline at end of file +} diff --git a/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/FileTableDataPane.java b/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/FileTableDataPane.java index 78385eb510..4736e9931b 100644 --- a/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/FileTableDataPane.java +++ b/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/FileTableDataPane.java @@ -221,7 +221,7 @@ public class FileTableDataPane extends AbstractTableDataPane { FRContext.getLogger().error(e.getMessage(), e); } if (in == null) { - JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Database_Connection_Failed"), + 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")); @@ -1012,4 +1012,4 @@ public class FileTableDataPane extends AbstractTableDataPane { } } -} \ No newline at end of file +} diff --git a/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/OneListTableModel.java b/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/OneListTableModel.java index 8c909f186a..124cb2bc22 100644 --- a/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/OneListTableModel.java +++ b/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/OneListTableModel.java @@ -1,17 +1,16 @@ package com.fr.design.data.tabledata.tabledatapane; -import java.awt.Component; -import java.awt.event.ActionEvent; - import com.fr.design.gui.itableeditorpane.UITableEditAction; import com.fr.design.gui.itableeditorpane.UITableModelAdapter; import com.fr.design.mainframe.DesignerContext; import com.fr.file.FILE; import com.fr.file.FILEChooserPane; import com.fr.file.filter.ChooseFileFilter; - import com.fr.stable.CoreConstants; +import java.awt.Component; +import java.awt.event.ActionEvent; + //august：按理说，这个只有一列 就不该用jtable。不过这样总比之前用ArrayTableModel好 public abstract class OneListTableModel extends UITableModelAdapter { @@ -64,7 +63,7 @@ public abstract class OneListTableModel extends UITableModelAdapter { @Override public void actionPerformed(ActionEvent e) { super.actionPerformed(e); - FILEChooserPane fileChooser = FILEChooserPane.getInstance(false, false, true, new ChooseFileFilter("js", "javascript" + com.fr.design.i18n.Toolkit.i18nText("File"))); + FILEChooserPane fileChooser = FILEChooserPane.getInstance(false, false, true, new ChooseFileFilter("js", "javascript" + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_File"))); if(fileChooser.showOpenDialog(DesignerContext.getDesignerFrame()) == FILEChooserPane.OK_OPTION) { final FILE file = fileChooser.getSelectedFILE(); if(file == null) { @@ -90,7 +89,7 @@ public abstract class OneListTableModel extends UITableModelAdapter { @Override public void actionPerformed(ActionEvent e) { super.actionPerformed(e); - FILEChooserPane fileChooser = FILEChooserPane.getInstance(false, false, true, new ChooseFileFilter("css", "css" + com.fr.design.i18n.Toolkit.i18nText("File"))); + FILEChooserPane fileChooser = FILEChooserPane.getInstance(false, false, true, new ChooseFileFilter("css", "css" + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_File"))); if(fileChooser.showOpenDialog(DesignerContext.getDesignerFrame()) == FILEChooserPane.OK_OPTION) { final FILE file = fileChooser.getSelectedFILE(); if(file == null) { @@ -108,4 +107,4 @@ public abstract class OneListTableModel extends UITableModelAdapter { } } -} \ No newline at end of file +} diff --git a/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/ProcedureDataPane.java b/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/ProcedureDataPane.java index 7c00fa0f43..ad9095f920 100644 --- a/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/ProcedureDataPane.java +++ b/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/ProcedureDataPane.java @@ -196,7 +196,7 @@ public class ProcedureDataPane extends AbstractTableDataPane imp warningLabel.setText(StringUtils.EMPTY); } catch (Exception ex) { if (ex instanceof SQLException) { - warningLabel.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Database_Connection_Failed")); + warningLabel.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Database_Connection_Failed")); } else { warningLabel.setText(ex.getMessage()); } @@ -319,7 +319,7 @@ public class ProcedureDataPane extends AbstractTableDataPane imp storeProcedureContext.setText(procedureText); warningLabel.setText(""); } catch (Exception e) { - warningLabel.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Database_Connection_Failed")); + warningLabel.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Database_Connection_Failed")); storeProcedureContext.setText(""); editorPane.populate(new StoreProcedureParameter[0]); } @@ -369,4 +369,4 @@ public class ProcedureDataPane extends AbstractTableDataPane imp public void checkEnabled() { } } -} \ No newline at end of file +} diff --git a/designer-base/src/main/java/com/fr/design/data/tabledata/wrapper/StoreProcedureDataWrapper.java b/designer-base/src/main/java/com/fr/design/data/tabledata/wrapper/StoreProcedureDataWrapper.java index c3ad8fa4e4..6a17b18ac2 100644 --- a/designer-base/src/main/java/com/fr/design/data/tabledata/wrapper/StoreProcedureDataWrapper.java +++ b/designer-base/src/main/java/com/fr/design/data/tabledata/wrapper/StoreProcedureDataWrapper.java @@ -194,7 +194,7 @@ public final class StoreProcedureDataWrapper implements TableDataWrapper { connectionBar.close(); // bug 61345 预览失败时，关闭窗口 dialog.setVisible(false); - throw new Exception(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Database_Connection_Failed")); + throw new Exception(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Database_Connection_Failed")); } connectionBar.close(); storeProcedure.resetDataModelList(); @@ -306,4 +306,4 @@ public final class StoreProcedureDataWrapper implements TableDataWrapper { } -} \ No newline at end of file +} diff --git a/designer-base/src/main/java/com/fr/design/editor/editor/ColumnSelectedEditor.java b/designer-base/src/main/java/com/fr/design/editor/editor/ColumnSelectedEditor.java index 9bfb26987d..ade55ae8bf 100644 --- a/designer-base/src/main/java/com/fr/design/editor/editor/ColumnSelectedEditor.java +++ b/designer-base/src/main/java/com/fr/design/editor/editor/ColumnSelectedEditor.java @@ -28,7 +28,7 @@ public class ColumnSelectedEditor extends Editor { protected String[] columnNames; public ColumnSelectedEditor() { - this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_DS_Column")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_DS_Column")); this.setLayout(FRGUIPaneFactory.createLeftZeroLayout()); tableDataComboBox = new TableDataComboBox(DesignTableDataManager.getEditingTableDataSource()); columnNames = new String[0]; @@ -107,4 +107,4 @@ public class ColumnSelectedEditor extends Editor { tableDataComboBox.setSelectedItem(null); columnNameComboBox.setSelectedItem(null); } -} \ No newline at end of file +} 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 74798a7757..1c824aad81 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 @@ -175,7 +175,7 @@ public class TemplateTreePane extends JPanel implements FileOperations { FileNodeFILE nodeFile = new FileNodeFILE(new FileNode(StableUtils.pathJoin(ProjectConstants.REPORTLETS_NAME, reportPath), false)); if (nodeFile.isLocked()) { - if (JOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("fileLocked_undeleted"), + if (JOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FileLocked_Undeleted"), com.fr.design.i18n.Toolkit.i18nText("Error"), JOptionPane.YES_OPTION, JOptionPane.ERROR_MESSAGE) == JOptionPane.YES_OPTION) { refreshDockingView(); } @@ -286,4 +286,4 @@ public class TemplateTreePane extends JPanel implements FileOperations { } } } -} \ No newline at end of file +} 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 72ff977766..9c4a7f3909 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 @@ -933,7 +933,7 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula { BaseUtils.readIcon("/com/fr/design/images/dialog/variable.png"), variableResolver.resolveCurReportVariables()).createMutableTreeNode()); - rootNode.add(new TextFolderUserObject(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Parameter_Source_Type_Tabledata"), + rootNode.add(new TextFolderUserObject(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Parameter_Source_Type_Tabledata"), BaseUtils.readIcon("/com/fr/design/images/dialog/parameter.gif"), variableResolver.resolveTableDataParameterVariables()).createMutableTreeNode()); @@ -1026,4 +1026,4 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula { } FRContext.getLogger().debug(buffer.toString()); } -} \ No newline at end of file +} diff --git a/designer-base/src/main/java/com/fr/design/formula/FunctionConstants.java b/designer-base/src/main/java/com/fr/design/formula/FunctionConstants.java index 4d0da51eb4..60b4cf5dfb 100644 --- a/designer-base/src/main/java/com/fr/design/formula/FunctionConstants.java +++ b/designer-base/src/main/java/com/fr/design/formula/FunctionConstants.java @@ -129,7 +129,7 @@ public abstract class FunctionConstants { new NameAndTypeAndFunctionList(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_FormulaD-Array"), Function.ARRAY), new NameAndTypeAndFunctionList(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_FormulaD-Report"), Function.REPORT), new NameAndTypeAndFunctionList(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_FormulaD-Other"), Function.OTHER), - new NameAndTypeAndFunctionList(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Function_Type_Hierarchy"), Function.HA) + new NameAndTypeAndFunctionList(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Function_Type_Hierarchy"), Function.HA) }; public static FunctionGroup ALL = new FunctionGroup() { @@ -261,4 +261,4 @@ public abstract class FunctionConstants { } } } -} \ No newline at end of file +} 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 cf8071cbaf..4bfd27189f 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 @@ -90,7 +90,7 @@ public class JavaEditorPane extends BasicPane { this.add(jt, BorderLayout.CENTER); UILabel label = new UILabel(); label.setText("" + - com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Compile_Save_Attention") + + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Compile_Save_Attention") + ""); label.setPreferredSize(new Dimension(label.getWidth(),label.getHeight() + 20)); this.add(label, BorderLayout.SOUTH); @@ -157,11 +157,11 @@ public class JavaEditorPane extends BasicPane { } try { WorkContext.getWorkResource().write(StableUtils.pathJoin(ProjectConstants.CLASSES_NAME, getJavaPath()), text.getBytes(EncodeConstants.ENCODING_UTF_8)); - JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Common_Save_Successfully") + "！"); + JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Common_Save_Successfully") + "！"); fireSaveActionListener(); } catch (Exception e) { FineLoggerFactory.getLogger().error(e.getMessage(), e); - JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Common_Save_Failed") + "！"); + JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Common_Save_Failed") + "！"); } } @@ -282,4 +282,4 @@ public class JavaEditorPane extends BasicPane { " }\n" + "}\n"; -} \ No newline at end of file +} diff --git a/designer-base/src/main/java/com/fr/design/gui/NameInspector.java b/designer-base/src/main/java/com/fr/design/gui/NameInspector.java index fa9b90278c..c1d2f6ee71 100644 --- a/designer-base/src/main/java/com/fr/design/gui/NameInspector.java +++ b/designer-base/src/main/java/com/fr/design/gui/NameInspector.java @@ -4,5 +4,5 @@ import com.fr.design.i18n.Toolkit; public class NameInspector { - public static final String ILLEGAL_NAME_HOLDER = Toolkit.i18nText("Fine-Design_Illegal_Name_Tips"); + public static final String ILLEGAL_NAME_HOLDER = Toolkit.i18nText("Fine-Design_Basic_Illegal_Name_Tips"); } diff --git a/designer-base/src/main/java/com/fr/design/gui/frpane/LoadingBasicPane.java b/designer-base/src/main/java/com/fr/design/gui/frpane/LoadingBasicPane.java index 0633c14062..a7776e26be 100644 --- a/designer-base/src/main/java/com/fr/design/gui/frpane/LoadingBasicPane.java +++ b/designer-base/src/main/java/com/fr/design/gui/frpane/LoadingBasicPane.java @@ -55,7 +55,7 @@ public abstract class LoadingBasicPane extends BasicPane { card = new CardLayout(); setLayout(card); JPanel loadingDisPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); - UILabel loadingPane = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Loading_And_Waiting") , SwingConstants.CENTER); + UILabel loadingPane = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Loading_And_Waiting") , SwingConstants.CENTER); loadingDisPane.add(loadingPane, BorderLayout.CENTER); progressBar = new JProgressBar(); progressBar.setIndeterminate(true); @@ -94,4 +94,4 @@ public abstract class LoadingBasicPane extends BasicPane { } -} \ No newline at end of file +} diff --git a/designer-base/src/main/java/com/fr/design/gui/icombobox/LazyComboBox.java b/designer-base/src/main/java/com/fr/design/gui/icombobox/LazyComboBox.java index 8ef44bf573..be83cf5b1a 100644 --- a/designer-base/src/main/java/com/fr/design/gui/icombobox/LazyComboBox.java +++ b/designer-base/src/main/java/com/fr/design/gui/icombobox/LazyComboBox.java @@ -23,7 +23,7 @@ import java.util.concurrent.ExecutionException; public abstract class LazyComboBox extends UIComboBox implements PopupMenuListener { private static final int NUM = 80; - private static final String[] PENDING_CONTENT = new String[]{"", com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Loading") + "..."}; + private static final String[] PENDING_CONTENT = new String[]{"", com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Loading") + "..."}; /** * 是否加载完成 @@ -189,4 +189,4 @@ public abstract class LazyComboBox extends UIComboBox implements PopupMenuListen filtering = false; } } -} \ No newline at end of file +} diff --git a/designer-base/src/main/java/com/fr/design/gui/ilist/TableViewList.java b/designer-base/src/main/java/com/fr/design/gui/ilist/TableViewList.java index 93505d2049..0fd211adfe 100644 --- a/designer-base/src/main/java/com/fr/design/gui/ilist/TableViewList.java +++ b/designer-base/src/main/java/com/fr/design/gui/ilist/TableViewList.java @@ -99,7 +99,7 @@ public class TableViewList extends UIList { count--; } if (!status) { - throw new Exception(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Database_Connection_Failed")); + throw new Exception(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Database_Connection_Failed")); } TableViewList.this.setModel(processDataInAnotherThread(databaseName, searchFilter, typesFilter)); return null; @@ -278,4 +278,4 @@ public class TableViewList extends UIList { } } -} \ No newline at end of file +} diff --git a/designer-base/src/main/java/com/fr/design/gui/imenu/UIScrollMenuDemo.java b/designer-base/src/main/java/com/fr/design/gui/imenu/UIScrollMenuDemo.java index 6b2f50c7c5..3fe7471c34 100644 --- a/designer-base/src/main/java/com/fr/design/gui/imenu/UIScrollMenuDemo.java +++ b/designer-base/src/main/java/com/fr/design/gui/imenu/UIScrollMenuDemo.java @@ -16,7 +16,7 @@ public class UIScrollMenuDemo extends JFrame { UIMenuBar menuBar = new UIMenuBar(); // File Menu, F - Mnemonic - JMenu fileMenu = new JMenu("File"); + JMenu fileMenu = new JMenu("Fine-Design_Basic_File"); fileMenu.setMnemonic(KeyEvent.VK_F); menuBar.add(fileMenu); @@ -68,4 +68,4 @@ public class UIScrollMenuDemo extends JFrame { } }); } -} \ No newline at end of file +} diff --git a/designer-base/src/main/java/com/fr/design/gui/itableeditorpane/UITableModelAdapter.java b/designer-base/src/main/java/com/fr/design/gui/itableeditorpane/UITableModelAdapter.java index 113342a023..c101f1207d 100644 --- a/designer-base/src/main/java/com/fr/design/gui/itableeditorpane/UITableModelAdapter.java +++ b/designer-base/src/main/java/com/fr/design/gui/itableeditorpane/UITableModelAdapter.java @@ -235,7 +235,7 @@ public abstract class UITableModelAdapter extends AbstractTabl public void actionPerformed(ActionEvent e) { int[] selectedRow = table.getSelectedRows(); if (ismultiSelected()) { - JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(),com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Multiple_Select_Warn_Text")); + JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(),com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Multiple_Select_Warn_Text")); return; } if (table.getCellEditor() != null) { @@ -327,4 +327,4 @@ public abstract class UITableModelAdapter extends AbstractTabl } } -} \ No newline at end of file +} diff --git a/designer-base/src/main/java/com/fr/design/gui/itree/refreshabletree/RefreshableJTree.java b/designer-base/src/main/java/com/fr/design/gui/itree/refreshabletree/RefreshableJTree.java index ad8da4dd6a..b2008f3867 100644 --- a/designer-base/src/main/java/com/fr/design/gui/itree/refreshabletree/RefreshableJTree.java +++ b/designer-base/src/main/java/com/fr/design/gui/itree/refreshabletree/RefreshableJTree.java @@ -6,7 +6,6 @@ import com.fr.design.gui.itree.checkboxtree.CheckBoxTree; import com.fr.design.i18n.Toolkit; import com.fr.general.ComparatorUtils; import com.fr.general.NameObject; -import com.fr.locale.InterProviderFactory; import com.fr.stable.StringUtils; import javax.swing.Icon; @@ -37,7 +36,7 @@ public abstract class RefreshableJTree extends CheckBoxTree { @Override public String toString() { - return Toolkit.i18nText("Fine-Design_Loading") + "..."; + return Toolkit.i18nText("Fine-Design_Basic_Loading") + "..."; } }; @@ -301,4 +300,4 @@ public abstract class RefreshableJTree extends CheckBoxTree { tip.setOpaque(false); return tip; } -} \ No newline at end of file +} diff --git a/designer-base/src/main/java/com/fr/design/hyperlink/ReporletHyperNorthPane.java b/designer-base/src/main/java/com/fr/design/hyperlink/ReporletHyperNorthPane.java index 1ebef3d858..5fe7142938 100644 --- a/designer-base/src/main/java/com/fr/design/hyperlink/ReporletHyperNorthPane.java +++ b/designer-base/src/main/java/com/fr/design/hyperlink/ReporletHyperNorthPane.java @@ -164,7 +164,7 @@ public class ReporletHyperNorthPane extends AbstractHyperNorthPane { } if (tempSet.contains(list.get(i).toString())) { list.remove(i); - JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Parameter_Duplicate_Name") + "!"); + JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Parameter_Duplicate_Name") + "!"); parameterChanger(list); return; } @@ -228,4 +228,4 @@ public class JavaScriptImplPane extends AbstractHyperLinkPane { public boolean accept(Object ob) { return ob instanceof JavaScriptImpl; } -} \ No newline at end of file +} diff --git a/designer-base/src/main/java/com/fr/design/mainframe/AuthorityPropertyPane.java b/designer-base/src/main/java/com/fr/design/mainframe/AuthorityPropertyPane.java index d596291426..675b04953d 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/AuthorityPropertyPane.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/AuthorityPropertyPane.java @@ -22,7 +22,7 @@ public class AuthorityPropertyPane extends JPanel { public AuthorityPropertyPane(TargetComponent t) { this.setLayout(new BorderLayout()); this.setBorder(null); - UILabel authorityTitle = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Privilege_Preference")) { + UILabel authorityTitle = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Privilege_Preference")) { @Override public Dimension getPreferredSize() { return new Dimension(super.getPreferredSize().width, TITLE_HEIGHT); @@ -46,4 +46,4 @@ public class AuthorityPropertyPane extends JPanel { } -} \ No newline at end of file +} diff --git a/designer-base/src/main/java/com/fr/design/mainframe/NoSupportAuthorityEdit.java b/designer-base/src/main/java/com/fr/design/mainframe/NoSupportAuthorityEdit.java index 14c4d60a00..4b2b6445c1 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/NoSupportAuthorityEdit.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/NoSupportAuthorityEdit.java @@ -22,7 +22,7 @@ public class NoSupportAuthorityEdit extends AuthorityEditPane { super(HistoryTemplateListPane.getInstance().getCurrentEditingTemplate()); this.setLayout(new BorderLayout()); this.setBorder(null); - UILabel title = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Privilege_Preference")) { + UILabel title = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Privilege_Preference")) { @Override public Dimension getPreferredSize() { return new Dimension(super.getPreferredSize().width, TITLE_HEIGHT); @@ -59,4 +59,4 @@ public class NoSupportAuthorityEdit extends AuthorityEditPane { public JPanel populateCheckPane() { return null; } -} \ No newline at end of file +} diff --git a/designer-base/src/main/java/com/fr/design/mainframe/loghandler/DesignerLogHandler.java b/designer-base/src/main/java/com/fr/design/mainframe/loghandler/DesignerLogHandler.java index 6e28656092..d861d80bed 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/loghandler/DesignerLogHandler.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/loghandler/DesignerLogHandler.java @@ -86,11 +86,11 @@ public class DesignerLogHandler { caption.clearMessage(); } }; - showInfo = new JCheckBoxMenuItem(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Log_Level_Info"), true); + showInfo = new JCheckBoxMenuItem(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Log_Level_Info"), true); showInfo.addItemListener(itemlistener); - showError = new JCheckBoxMenuItem(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Log_Level_Warn"), true); + showError = new JCheckBoxMenuItem(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Log_Level_Warn"), true); showError.addItemListener(itemlistener); - showServer = new JCheckBoxMenuItem(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Log_Level_Error"), true); + showServer = new JCheckBoxMenuItem(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Log_Level_Error"), true); showServer.addItemListener(itemlistener); caption.addSetListener(new ActionListener() { @@ -320,4 +320,4 @@ public class DesignerLogHandler { public void printLoggingEvent(LoggingEvent event) { logHandlerArea.printStackTrace(event); } -} \ No newline at end of file +} diff --git a/designer-base/src/main/java/com/fr/design/mainframe/widget/editors/DataTableEditor.java b/designer-base/src/main/java/com/fr/design/mainframe/widget/editors/DataTableEditor.java index fac44a5bc8..9e3adf672c 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/widget/editors/DataTableEditor.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/widget/editors/DataTableEditor.java @@ -24,7 +24,7 @@ public class DataTableEditor extends Editor { public DataTableEditor() { this.initCompontents(); - this.setName(com.fr.design.i18n.Toolkit.i18nText("FieldBinding")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FieldBinding")); } private void initCompontents() { @@ -81,4 +81,4 @@ public class DataTableEditor extends Editor { return "bind_ds_column"; } -} \ No newline at end of file +} 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 0a73895375..16f41f431b 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 @@ -4,13 +4,9 @@ package com.fr.design.menu; -import com.fr.general.ComparatorUtils; -import com.fr.general.GeneralContext; - import javax.swing.*; import java.awt.event.KeyEvent; -import java.util.Locale; import static com.fr.design.gui.syntax.ui.rtextarea.RTADefaultInputMap.DEFAULT_MODIFIER; @@ -678,7 +674,7 @@ public class KeySetUtils { @Override public String getMenuName() { - return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Authority_Edit_Status"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Authority_Edit_Status"); } @Override @@ -1041,4 +1037,4 @@ public class KeySetUtils { -} \ No newline at end of file +} diff --git a/designer-base/src/main/java/com/fr/design/parameter/ParameterArrayPane.java b/designer-base/src/main/java/com/fr/design/parameter/ParameterArrayPane.java index 76c5265fbe..39a89bac6a 100644 --- a/designer-base/src/main/java/com/fr/design/parameter/ParameterArrayPane.java +++ b/designer-base/src/main/java/com/fr/design/parameter/ParameterArrayPane.java @@ -36,7 +36,7 @@ public class ParameterArrayPane extends JListControlPane { String tempName = getEditingName(); if (StringUtils.isEmpty(tempName)) { nameableList.stopEditing(); - JOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(ParameterArrayPane.this), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Empty_Parameter_Name")); + JOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(ParameterArrayPane.this), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Empty_Parameter_Name")); setIllegalIndex(editingIndex); return; } @@ -44,7 +44,7 @@ public class ParameterArrayPane extends JListControlPane { && isNameRepeated(new List[]{Arrays.asList(parameters), Arrays.asList(allListNames)}, tempName)) { nameableList.stopEditing(); JOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(ParameterArrayPane.this), - com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Duplicate_Parameter_Name")); + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Duplicate_Parameter_Name")); setIllegalIndex(editingIndex); } } @@ -92,4 +92,4 @@ public class ParameterArrayPane extends JListControlPane { return res_array; } -} \ No newline at end of file +} diff --git a/designer-base/src/main/java/com/fr/design/remote/ui/UserManagerPane.java b/designer-base/src/main/java/com/fr/design/remote/ui/UserManagerPane.java index ecbfe9011d..08f377b79f 100644 --- a/designer-base/src/main/java/com/fr/design/remote/ui/UserManagerPane.java +++ b/designer-base/src/main/java/com/fr/design/remote/ui/UserManagerPane.java @@ -142,7 +142,7 @@ public class UserManagerPane extends BasicPane { sync2AddedMembersFormAdded(); // 不需要重复更新右侧列表显示 但是更新一下计数显示 countLabel.setText( - Toolkit.i18nText("Fine-Design_Remote_Design_Selected_Member_Count", + Toolkit.i18nText("Fine-Design_Basic_Remote_Design_Selected_Member_Count", String.valueOf(addedMembers.size()) ) ); @@ -211,7 +211,7 @@ public class UserManagerPane extends BasicPane { @Override protected String title4PopupWindow() { - return Toolkit.i18nText("Fine-Design_Remote_Design_Add_Member"); + return Toolkit.i18nText("Fine-Design_Basic_Remote_Design_Add_Member"); } private JPanel createLeftPanel() { @@ -221,7 +221,7 @@ public class UserManagerPane extends BasicPane { BorderFactory.createCompoundBorder( new EmptyBorder(6, 0, 0, 0), UITitledBorder.createBorderWithTitle( - Toolkit.i18nText("Fine-Design_Remote_Design_Decision_Member") + Toolkit.i18nText("Fine-Design_Basic_Remote_Design_Decision_Member") ) ) ); @@ -233,7 +233,7 @@ public class UserManagerPane extends BasicPane { keyField.requestFocus(); keyField.addKeyListener(keyFieldKeyListener); keyField.getDocument().addDocumentListener(documentListener); - keyButton.setText(Toolkit.i18nText("Fine-Design_Remote_Design_Search")); + keyButton.setText(Toolkit.i18nText("Fine-Design_Basic_Remote_Design_Search")); keyButton.addActionListener(keyButtonActionListener); searchPanel.add(keyField); searchPanel.add(keyButton); @@ -279,14 +279,14 @@ public class UserManagerPane extends BasicPane { content.setBorder( BorderFactory.createCompoundBorder( new EmptyBorder(6, 0, 0, 0), - UITitledBorder.createBorderWithTitle(Toolkit.i18nText("Fine-Design_Remote_Design_Selected_Member") + UITitledBorder.createBorderWithTitle(Toolkit.i18nText("Fine-Design_Basic_Remote_Design_Selected_Member") ) ) ); // 计数 countLabel.setText( - Toolkit.i18nText("Fine-Design_Remote_Design_Selected_Member_Count", + Toolkit.i18nText("Fine-Design_Basic_Remote_Design_Selected_Member_Count", String.valueOf(addedMembers.size())) ); countLabel.setBorder(BorderFactory.createEmptyBorder(7, 12, 8, 0)); @@ -332,7 +332,7 @@ public class UserManagerPane extends BasicPane { addedList.revalidate(); addedList.repaint(); countLabel.setText( - Toolkit.i18nText("Fine-Design_Remote_Design_Selected_Member_Count", + Toolkit.i18nText("Fine-Design_Basic_Remote_Design_Selected_Member_Count", String.valueOf(addedMembers.size()) )); } diff --git a/designer-base/src/main/java/com/fr/design/style/BorderPane.java b/designer-base/src/main/java/com/fr/design/style/BorderPane.java index 3138de5e0a..7b3e29b5a0 100644 --- a/designer-base/src/main/java/com/fr/design/style/BorderPane.java +++ b/designer-base/src/main/java/com/fr/design/style/BorderPane.java @@ -106,7 +106,7 @@ public class BorderPane extends BasicPane { borderAllControlPane.add(createVerButtonPane(NO_BORDERS, com.fr.design.i18n.Toolkit.i18nText("No"))); // Button setting all borders to active with // current color and current style excepting inside borders - borderAllControlPane.add(createVerButtonPane(EXTERNAL_BORDERS, com.fr.design.i18n.Toolkit.i18nText("External"))); + borderAllControlPane.add(createVerButtonPane(EXTERNAL_BORDERS, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_External"))); borderAllControlPane.add(createVerButtonPane(INSIDE_BORDERS, com.fr.design.i18n.Toolkit.i18nText("Inside"))); @@ -728,4 +728,4 @@ public class BorderPane extends BasicPane { } } } -} \ No newline at end of file +} diff --git a/designer-base/src/main/java/com/fr/design/widget/btn/ButtonConstants.java b/designer-base/src/main/java/com/fr/design/widget/btn/ButtonConstants.java index 88fe545cf5..36990287e9 100644 --- a/designer-base/src/main/java/com/fr/design/widget/btn/ButtonConstants.java +++ b/designer-base/src/main/java/com/fr/design/widget/btn/ButtonConstants.java @@ -32,7 +32,7 @@ public class ButtonConstants { com.fr.design.i18n.Toolkit.i18nText("Custom"), com.fr.design.i18n.Toolkit.i18nText("Utils-Insert_Row"), com.fr.design.i18n.Toolkit.i18nText("Utils-Delete_Row"), - com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Button_Type_Parameter_Submit"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Button_Type_Parameter_Submit"), com.fr.design.i18n.Toolkit.i18nText("Widget-TreeNode") }; @@ -44,4 +44,4 @@ public class ButtonConstants { StableFactory.getMarkedClass(BridgeMark.SUBMIT_BUTTON, Widget.class), StableFactory.getMarkedClass(BridgeMark.TREE_NODE_TOGGLE_BUTTON, Widget.class) }; -} \ No newline at end of file +} diff --git a/designer-base/src/main/java/com/fr/design/widget/component/NumberEditorValidatePane.java b/designer-base/src/main/java/com/fr/design/widget/component/NumberEditorValidatePane.java index 550270dea4..aeba80fe1a 100644 --- a/designer-base/src/main/java/com/fr/design/widget/component/NumberEditorValidatePane.java +++ b/designer-base/src/main/java/com/fr/design/widget/component/NumberEditorValidatePane.java @@ -3,7 +3,6 @@ package com.fr.design.widget.component; import com.fr.design.designer.IntervalConstants; import com.fr.design.gui.icheckbox.UICheckBox; import com.fr.design.gui.ilable.UILabel; -import com.fr.design.gui.ispinner.UIBasicSpinner; import com.fr.design.gui.ispinner.UISpinner; import com.fr.design.gui.itextfield.UITextField; import com.fr.design.layout.FRGUIPaneFactory; @@ -16,7 +15,6 @@ import com.fr.stable.StringUtils; import javax.swing.*; import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; -import javax.swing.text.DefaultFormatter; import java.awt.*; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; @@ -77,7 +75,7 @@ public class NumberEditorValidatePane extends JPanel { JPanel errorMsgBorderPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); errorMsgBorderPane.setBorder(BorderFactory.createEmptyBorder(0, IntervalConstants.INTERVAL_L5, IntervalConstants.INTERVAL_L1, 0)); errorMsgBorderPane.add(errorMsgTextFieldPane, BorderLayout.CENTER); - UILabel numberLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Decimal_Digits")); + UILabel numberLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Decimal_Digits")); limitNumberPane = TableLayoutHelper.createGapTableLayoutPane(new Component[][]{new Component[]{numberLabel, decimalLength}}, TableLayoutHelper.FILL_LASTCOLUMN, 18, 7); limitNumberPane.setBorder(BorderFactory.createEmptyBorder(0, IntervalConstants.INTERVAL_L5, 0, 0)); double f = TableLayout.FILL; diff --git a/designer-base/src/main/java/com/fr/design/write/submit/CustomJobPane.java b/designer-base/src/main/java/com/fr/design/write/submit/CustomJobPane.java index 1c228d8534..956b9878c3 100644 --- a/designer-base/src/main/java/com/fr/design/write/submit/CustomJobPane.java +++ b/designer-base/src/main/java/com/fr/design/write/submit/CustomJobPane.java @@ -93,7 +93,7 @@ public abstract class CustomJobPane extends BasicBeanPane { this.add(objectProperiesPane, BorderLayout.CENTER); UITextArea area = new UITextArea(2, 1); - area.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Extend_Class", "com.fr.data.AbstractSubmitTask")); + area.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Extend_Class", "com.fr.data.AbstractSubmitTask")); JPanel dsPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); dsPane.add(area); dsPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Custom_Job_Description"), null)); @@ -137,4 +137,4 @@ public abstract class CustomJobPane extends BasicBeanPane { this.classNameTextField.setText(null); this.checkAddButtonEnable(); } -} \ No newline at end of file +} diff --git a/designer-base/src/main/java/com/fr/design/write/submit/DBManipulationPane.java b/designer-base/src/main/java/com/fr/design/write/submit/DBManipulationPane.java index d46ae06b8a..7e32a297b7 100644 --- a/designer-base/src/main/java/com/fr/design/write/submit/DBManipulationPane.java +++ b/designer-base/src/main/java/com/fr/design/write/submit/DBManipulationPane.java @@ -477,7 +477,7 @@ public class DBManipulationPane extends BasicBeanPane { if (ComparatorUtils.equals(selected[i], keyColumnNameValueList.get(j).cn)) { Object[] options = { com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Covered_All"), com.fr.design.i18n.Toolkit.i18nText("FR-Base_Yes"), com.fr.design.i18n.Toolkit.i18nText("FR-Base_No"), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Cover_None") }; returnValue = JOptionPane.showOptionDialog(DBManipulationPane.this, - com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Cover_Tips", keyColumnNameValueList.get(j).cn.name), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Cover_Tips", keyColumnNameValueList.get(j).cn.name), "", JOptionPane.DEFAULT_OPTION, JOptionPane.INFORMATION_MESSAGE, null, options, options[0]); // Richie:全部覆盖 if (returnValue == 0) { @@ -1095,4 +1095,4 @@ public class DBManipulationPane extends BasicBeanPane { return this; } } -} \ No newline at end of file +} 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 ff4ec66608..49bfb1b78d 100644 --- a/designer-base/src/main/java/com/fr/env/RemoteEnvPane.java +++ b/designer-base/src/main/java/com/fr/env/RemoteEnvPane.java @@ -66,7 +66,7 @@ public class RemoteEnvPane extends BasicBeanPane { private JDialog dialog; private UILabel message = new UILabel(); private UIButton okButton = new UIButton(Toolkit.i18nText("Fine-Design_Report_OK")); - private UIButton cancelButton = new UIButton(Toolkit.i18nText("Fine-Design_Report_Cancel")); + private UIButton cancelButton = new UIButton(Toolkit.i18nText("Fine-Design_Basic_Cancel")); private UILabel uiLabel = new UILabel(); /** @@ -661,4 +661,4 @@ public class RemoteEnvPane extends BasicBeanPane { fileChooserButton.setEnabled(isHttps); updateHttpsConfigPanel(); } -} \ No newline at end of file +} diff --git a/designer-base/src/main/java/com/fr/start/BaseDesigner.java b/designer-base/src/main/java/com/fr/start/BaseDesigner.java index 50613edc94..932a1ebb8b 100644 --- a/designer-base/src/main/java/com/fr/start/BaseDesigner.java +++ b/designer-base/src/main/java/com/fr/start/BaseDesigner.java @@ -41,7 +41,7 @@ public abstract class BaseDesigner extends ToolBarMenuDock { private void init(String[] args) { //初始化 - EventDispatcher.fire(ModuleEvent.MajorModuleStarting, Toolkit.i18nText("Fine-Design_Initializing")); + EventDispatcher.fire(ModuleEvent.MajorModuleStarting, Toolkit.i18nText("Fine-Design_Basic_Initializing")); // 初始化look and feel.这个在预加载之前执行是因为lookAndFeel里的东西，预加载时也要用到 DesignUtils.initLookAndFeel(); // 初始化Log Handler @@ -156,4 +156,4 @@ public abstract class BaseDesigner extends ToolBarMenuDock { protected void collectUserInformation() { } -} \ No newline at end of file +} diff --git a/designer-chart/src/main/java/com/fr/design/chart/axis/ChartAlertValuePane.java b/designer-chart/src/main/java/com/fr/design/chart/axis/ChartAlertValuePane.java index 6608c55aaf..8f6a3c6292 100644 --- a/designer-chart/src/main/java/com/fr/design/chart/axis/ChartAlertValuePane.java +++ b/designer-chart/src/main/java/com/fr/design/chart/axis/ChartAlertValuePane.java @@ -88,7 +88,7 @@ public class ChartAlertValuePane extends BasicBeanPane { JPanel lineStylePane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane(); alertLinePane.add(lineStylePane); - lineStylePane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Line_Style") + ":")); + lineStylePane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Line_Style") + ":")); lineCombo = new LineComboBox(CoreConstants.STRIKE_LINE_STYLE_ARRAY_4_CHART); lineStylePane.add(lineCombo); @@ -130,10 +130,10 @@ public class ChartAlertValuePane extends BasicBeanPane { double[] rowSize = {t, t, t, t, t}; double[] columnSize = {0.1, 0.2, 0.5, 0.2}; Component[][] components= { - {null, new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Content") + ":"), contentField = new UITextField(3)}, - {null, new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Font") + ":"), fontNameBox}, - {null, new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Font_Size") + ":"), fontSizeBox}, - {null, new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Layout") + ": "), leftButton = new UIRadioButton(getLeftName())}, + {null, new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Content") + ":"), contentField = new UITextField(3)}, + {null, new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Font") + ":"), fontNameBox}, + {null, new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Font_Size") + ":"), fontSizeBox}, + {null, new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Layout") + ": "), leftButton = new UIRadioButton(getLeftName())}, {null, null, rightButton = new UIRadioButton(getRightName())}, }; @@ -148,11 +148,11 @@ public class ChartAlertValuePane extends BasicBeanPane { } protected String getLeftName() {// 居左 居右 - return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_At_The_Left"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_At_The_Left"); } protected String getRightName() { - return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_At_The_Right"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_At_The_Right"); } @Override @@ -226,4 +226,4 @@ public class ChartAlertValuePane extends BasicBeanPane { chartAlertValue.setAlertPosition(Constants.RIGHT); } } -} \ No newline at end of file +} diff --git a/designer-chart/src/main/java/com/fr/design/chart/axis/MinMaxValuePane.java b/designer-chart/src/main/java/com/fr/design/chart/axis/MinMaxValuePane.java index 02eb1a2e11..a84cfd693e 100644 --- a/designer-chart/src/main/java/com/fr/design/chart/axis/MinMaxValuePane.java +++ b/designer-chart/src/main/java/com/fr/design/chart/axis/MinMaxValuePane.java @@ -31,9 +31,9 @@ public class MinMaxValuePane extends JPanel { protected UITextField secUnitField; public MinMaxValuePane() { - minCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Custom_Min_Value")); + minCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Custom_Min_Value")); minValueField = new UITextField(6); - maxCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Custom_Max_Value")); + maxCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Custom_Max_Value")); maxValueField = new UITextField(6); isCustomMainUnitBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Custom_Main_Graduation_Unit")); mainUnitField = new UITextField(6); @@ -201,4 +201,4 @@ public class MinMaxValuePane extends JPanel { axis.setCustomSecUnit(false); } } -} \ No newline at end of file +} diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartAxisLineStylePane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartAxisLineStylePane.java index b8db103079..aabc921102 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartAxisLineStylePane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartAxisLineStylePane.java @@ -33,7 +33,7 @@ public class ChartAxisLineStylePane extends BasicPane{ axisLineStyle = new LineComboBox(CoreConstants.LINE_STYLE_ARRAY_4_AXIS); axisLineColor = new ColorSelectBox(100); - String[] nameArray = {com.fr.design.i18n.Toolkit.i18nText("External"),com.fr.design.i18n.Toolkit.i18nText("Inside"),com.fr.design.i18n.Toolkit.i18nText("ChartF-Cross"),com.fr.design.i18n.Toolkit.i18nText("None")}; + String[] nameArray = {com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_External"),com.fr.design.i18n.Toolkit.i18nText("Inside"),com.fr.design.i18n.Toolkit.i18nText("ChartF-Cross"),com.fr.design.i18n.Toolkit.i18nText("None")}; Integer[] valueArray = {Constants.TICK_MARK_OUTSIDE, Constants.TICK_MARK_INSIDE, Constants.TICK_MARK_CROSS, Constants.TICK_MARK_NONE}; Icon[] iconArray = {BaseUtils.readIcon("/com/fr/design/images/chart/ChartAxisLineStyle/external.png"), BaseUtils.readIcon("/com/fr/design/images/chart/ChartAxisLineStyle/inside.png"), @@ -88,4 +88,4 @@ public class ChartAxisLineStylePane extends BasicPane{ } } -} \ No newline at end of file +} diff --git a/designer-form/src/main/java/com/fr/design/designer/creator/XButton.java b/designer-form/src/main/java/com/fr/design/designer/creator/XButton.java index ad33aefd53..e30957139d 100644 --- a/designer-form/src/main/java/com/fr/design/designer/creator/XButton.java +++ b/designer-form/src/main/java/com/fr/design/designer/creator/XButton.java @@ -90,9 +90,9 @@ public class XButton extends XWidgetCreator { protected CRPropertyDescriptor creatNonListenerStyle(int i) throws IntrospectionException{ CRPropertyDescriptor[] crPropertyDescriptors = { new CRPropertyDescriptor("text", this.data.getClass()).setI18NName( - com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Button_Name")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Button_Name")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), new CRPropertyDescriptor("customStyle", this.data.getClass()).setI18NName( - com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Button_Style")).setEditorClass( + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Button_Style")).setEditorClass( ButtonTypeEditor.class).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), new CRPropertyDescriptor("initialBackground", this.data.getClass()).setEditorClass( ImgBackgroundEditor.class).setI18NName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Background-Initial")).putKeyValue( @@ -162,7 +162,7 @@ public class XButton extends XWidgetCreator { protected CRPropertyDescriptor[] getisnotCustomStyle() throws IntrospectionException { return new CRPropertyDescriptor[]{ new CRPropertyDescriptor("text", this.data.getClass()) - .setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Button_Name")) + .setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Button_Name")) .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced") .setPropertyChangeListener(new PropertyChangeAdapter() { @@ -172,7 +172,7 @@ public class XButton extends XWidgetCreator { } }), new CRPropertyDescriptor("customStyle", this.data.getClass()).setI18NName( - com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Button_Style")).setEditorClass( + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Button_Style")).setEditorClass( ButtonTypeEditor.class).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced") .setPropertyChangeListener(new PropertyChangeAdapter() { @@ -309,4 +309,4 @@ public class XButton extends XWidgetCreator { } -} \ No newline at end of file +} diff --git a/designer-form/src/main/java/com/fr/design/designer/creator/XFileUploader.java b/designer-form/src/main/java/com/fr/design/designer/creator/XFileUploader.java index 75769d6532..fe0878dbe1 100644 --- a/designer-form/src/main/java/com/fr/design/designer/creator/XFileUploader.java +++ b/designer-form/src/main/java/com/fr/design/designer/creator/XFileUploader.java @@ -33,7 +33,7 @@ public class XFileUploader extends XFieldEditor { super.supportedDescriptor(), new CRPropertyDescriptor[]{ new CRPropertyDescriptor("allowTypes", this.data.getClass()) - .setI18NName(com.fr.design.i18n.Toolkit.i18nText("File-Allow_Upload_Files")) + .setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_File_Allow_Upload_Files")) .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced") }); } @@ -55,4 +55,4 @@ public class XFileUploader extends XFieldEditor { protected String getIconName() { return "file_up.png"; } -} \ No newline at end of file +} diff --git a/designer-form/src/main/java/com/fr/design/designer/creator/XMultiFileUploader.java b/designer-form/src/main/java/com/fr/design/designer/creator/XMultiFileUploader.java index f4cf8715c8..b487c169d7 100644 --- a/designer-form/src/main/java/com/fr/design/designer/creator/XMultiFileUploader.java +++ b/designer-form/src/main/java/com/fr/design/designer/creator/XMultiFileUploader.java @@ -40,10 +40,10 @@ public class XMultiFileUploader extends XFieldEditor { .setI18NName(com.fr.design.i18n.Toolkit.i18nText("SINGLE_FILE_UPLOAD")) .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), new CRPropertyDescriptor("accept", this.data.getClass()) - .setI18NName(com.fr.design.i18n.Toolkit.i18nText("File-Allow_Upload_Files")) + .setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_File_Allow_Upload_Files")) .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), new CRPropertyDescriptor("maxSize", this.data.getClass()) - .setI18NName(com.fr.design.i18n.Toolkit.i18nText("File-File_Size_Limit")) + .setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_File_Size_Limit")) .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced") }); } @@ -99,4 +99,4 @@ public class XMultiFileUploader extends XFieldEditor { public WidgetPropertyUIProvider[] getWidgetPropertyUIProviders() { return new WidgetPropertyUIProvider[]{ new MultiFileUploaderPropertyUI(this)}; } -} \ No newline at end of file +} diff --git a/designer-form/src/main/java/com/fr/design/designer/creator/XNumberEditor.java b/designer-form/src/main/java/com/fr/design/designer/creator/XNumberEditor.java index 6bbcf15032..46f7948257 100644 --- a/designer-form/src/main/java/com/fr/design/designer/creator/XNumberEditor.java +++ b/designer-form/src/main/java/com/fr/design/designer/creator/XNumberEditor.java @@ -53,7 +53,7 @@ public class XNumberEditor extends XWrapperedFieldEditor { .setI18NName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Allow_Decimals")) .putKeyValue(XCreatorConstants.PROPERTY_VALIDATE, "FR-Designer_Validate"); CRPropertyDescriptor decimalLength = new CRPropertyDescriptor("maxDecimalLength", this.data.getClass()) - .setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Decimal_Digits")) + .setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Decimal_Digits")) .putKeyValue(XCreatorConstants.PROPERTY_VALIDATE, "FR-Designer_Validate"); sup = (CRPropertyDescriptor[]) ArrayUtils.addAll(sup, ((NumberEditor)this.data).isAllowDecimals() ? new CRPropertyDescriptor[] {allowDecimal, decimalLength} : new CRPropertyDescriptor[] {allowDecimal}); @@ -104,4 +104,4 @@ public class XNumberEditor extends XWrapperedFieldEditor { return "number_field_16.png"; } -} \ No newline at end of file +} diff --git a/designer-form/src/main/java/com/fr/design/mainframe/FormWebWidgetConstants.java b/designer-form/src/main/java/com/fr/design/mainframe/FormWebWidgetConstants.java index 41b23c04e2..cd771629f4 100644 --- a/designer-form/src/main/java/com/fr/design/mainframe/FormWebWidgetConstants.java +++ b/designer-form/src/main/java/com/fr/design/mainframe/FormWebWidgetConstants.java @@ -40,10 +40,10 @@ public class FormWebWidgetConstants { Next.class); // 导出成Excel 分页导出 - public static final WidgetOption EXCELP = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Export_Excel_Page"), + public static final WidgetOption EXCELP = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Export_Excel_Page"), IOUtils.readIcon("/com/fr/web/images/excel.png"), ExcelP.class); // 导出成Excel 原样导出 - public static final WidgetOption EXCELO = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Export_Excel_Simple"), + public static final WidgetOption EXCELO = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Export_Excel_Simple"), IOUtils.readIcon("/com/fr/web/images/excel.png"), ExcelO.class); // 导出 public static final WidgetOption EXPORT = WidgetOptionFactory diff --git a/designer-form/src/main/java/com/fr/design/mainframe/widget/wrappers/HyperlinkGroupWrapper.java b/designer-form/src/main/java/com/fr/design/mainframe/widget/wrappers/HyperlinkGroupWrapper.java index 12b516bfad..bdfae2dc03 100644 --- a/designer-form/src/main/java/com/fr/design/mainframe/widget/wrappers/HyperlinkGroupWrapper.java +++ b/designer-form/src/main/java/com/fr/design/mainframe/widget/wrappers/HyperlinkGroupWrapper.java @@ -26,14 +26,14 @@ public class HyperlinkGroupWrapper implements Encoder, Decoder { @Override public String encode(Object v) { if (v == null) { - return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Hyperlink_Undefined"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Hyperlink_Undefined"); } NameJavaScriptGroup group = (NameJavaScriptGroup)v; - return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Hyperlink_Group_Count", group.size()); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Hyperlink_Group_Count", group.size()); } @Override public void validate(String txt) throws ValidationException { } -} \ No newline at end of file +} diff --git a/designer-form/src/main/java/com/fr/design/widget/ui/designer/MultiFileEditorPane.java b/designer-form/src/main/java/com/fr/design/widget/ui/designer/MultiFileEditorPane.java index 181f41af8a..49be752895 100644 --- a/designer-form/src/main/java/com/fr/design/widget/ui/designer/MultiFileEditorPane.java +++ b/designer-form/src/main/java/com/fr/design/widget/ui/designer/MultiFileEditorPane.java @@ -54,8 +54,8 @@ public class MultiFileEditorPane extends FieldEditorDefinePane double p = TableLayout.PREFERRED; Component[][] components = new Component[][]{ new Component[]{singleFileCheckBox, null }, - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("File-Allow_Upload_Files")), acceptType}, - new Component[]{new UILabel( com.fr.design.i18n.Toolkit.i18nText("File-File_Size_Limit")), fileSizePane}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_File_Allow_Upload_Files")), acceptType}, + new Component[]{new UILabel( com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_File_Size_Limit")), fileSizePane}, new Component[]{new UILabel( com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Font-Size")), fontSizeField} }; double[] rowSize = {p, p, p, p}; @@ -87,4 +87,4 @@ public class MultiFileEditorPane extends FieldEditorDefinePane return ob; } -} \ No newline at end of file +} diff --git a/designer-form/src/main/java/com/fr/design/widget/ui/designer/ParameterTreeComboBox.java b/designer-form/src/main/java/com/fr/design/widget/ui/designer/ParameterTreeComboBox.java index 8b071416b7..32f1fc86f5 100644 --- a/designer-form/src/main/java/com/fr/design/widget/ui/designer/ParameterTreeComboBox.java +++ b/designer-form/src/main/java/com/fr/design/widget/ui/designer/ParameterTreeComboBox.java @@ -169,10 +169,10 @@ public class ParameterTreeComboBox extends FRTreeComboBox { } } if (!ArrayUtils.isEmpty(parameters)) { - groupList.add(new ParameterGroup(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Parameter_Source_Type_Server"), parameters)); + groupList.add(new ParameterGroup(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Parameter_Source_Type_Server"), parameters)); } return groupList.toArray(new ParameterGroup[0]); } -} \ No newline at end of file +} diff --git a/designer-realize/src/main/java/com/fr/design/actions/columnrow/DSColumnConditionAction.java b/designer-realize/src/main/java/com/fr/design/actions/columnrow/DSColumnConditionAction.java index faf9a4f89e..6d14fb6618 100644 --- a/designer-realize/src/main/java/com/fr/design/actions/columnrow/DSColumnConditionAction.java +++ b/designer-realize/src/main/java/com/fr/design/actions/columnrow/DSColumnConditionAction.java @@ -20,14 +20,14 @@ public class DSColumnConditionAction extends AbstractCellElementAction { public DSColumnConditionAction() { super(); - this.setName(com.fr.design.i18n.Toolkit.i18nText("Filter")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Filter")); this.setMnemonic('E'); this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/expand/cellAttr.gif")); } public DSColumnConditionAction(ElementCasePane t) { super(t); - this.setName(com.fr.design.i18n.Toolkit.i18nText("Filter")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Filter")); this.setMnemonic('E'); this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/expand/cellAttr.gif")); } @@ -48,4 +48,4 @@ public class DSColumnConditionAction extends AbstractCellElementAction { protected void updateBasicPane(BasicPane bp, TemplateCellElement cellElement) { ((DSColumnConditionsPane) bp).update(cellElement); } -} \ No newline at end of file +} diff --git a/designer-realize/src/main/java/com/fr/design/dscolumn/DSColumnAdvancedPane.java b/designer-realize/src/main/java/com/fr/design/dscolumn/DSColumnAdvancedPane.java index 0af3df5415..51778fb0ce 100644 --- a/designer-realize/src/main/java/com/fr/design/dscolumn/DSColumnAdvancedPane.java +++ b/designer-realize/src/main/java/com/fr/design/dscolumn/DSColumnAdvancedPane.java @@ -80,7 +80,7 @@ public class DSColumnAdvancedPane extends BasicPane { JPanel multiNumPane = null; if (setting > DSColumnPane.SETTING_DSRELATED) { - multiNumPane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("Fill_blank_Data")); + multiNumPane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Fill_Blank_Data")); useMultiplyNumCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Column_Multiple")); multiNumPane.add(useMultiplyNumCheckBox); multiNumPane.add(new UILabel(InsetText)); @@ -338,10 +338,10 @@ public class DSColumnAdvancedPane extends BasicPane { + " " + com.fr.design.i18n.Toolkit.i18nText("BindColumn-Even_Selected_(2,4,6...)")), FlowLayout.LEFT); JPanel specifyPane = GUICoreUtils.createFlowPane(new JComponent[]{ serialTextField, new UILabel( - com.fr.design.i18n.Toolkit.i18nText("Fine-Design_DSColumn_Result_Group_Format", "1,2-3,5,8", "$__count__") + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_DSColumn_Result_Group_Format", "1,2-3,5,8", "$__count__") ) }, FlowLayout.LEFT); - serialTextField.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Format") + ":=JOINARRAY(GREPARRAY(RANGE($__count__), item!=4), \",\")"); + serialTextField.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Format") + ":=JOINARRAY(GREPARRAY(RANGE($__count__), item!=4), \",\")"); selectCountCardPane.add(undefinedPane, "UNDEFINE"); selectCountCardPane.add(topFormulaPane, "TOP"); selectCountCardPane.add(bottomFormulaPane, "BOTTOM"); @@ -537,4 +537,4 @@ public class DSColumnAdvancedPane extends BasicPane { multiNumSpinner.setEnabled(false); } } -} \ No newline at end of file +} diff --git a/designer-realize/src/main/java/com/fr/design/dscolumn/DSColumnConditionsPane.java b/designer-realize/src/main/java/com/fr/design/dscolumn/DSColumnConditionsPane.java index 8937e68eb9..f05d97557a 100644 --- a/designer-realize/src/main/java/com/fr/design/dscolumn/DSColumnConditionsPane.java +++ b/designer-realize/src/main/java/com/fr/design/dscolumn/DSColumnConditionsPane.java @@ -1,24 +1,21 @@ package com.fr.design.dscolumn; -import java.awt.BorderLayout; -import java.awt.FlowLayout; - -import com.fr.design.gui.ilable.UILabel; - -import javax.swing.JPanel; - -import com.fr.design.data.DesignTableDataManager; import com.fr.data.TableDataSource; import com.fr.design.condition.DSColumnLiteConditionPane; import com.fr.design.condition.DSColumnSimpleLiteConditionPane; +import com.fr.design.data.DesignTableDataManager; +import com.fr.design.dialog.BasicPane; import com.fr.design.gui.icheckbox.UICheckBox; +import com.fr.design.gui.ilable.UILabel; import com.fr.design.layout.FRGUIPaneFactory; -import com.fr.design.dialog.BasicPane; - +import com.fr.design.utils.gui.GUICoreUtils; import com.fr.general.data.Condition; import com.fr.report.cell.CellElement; import com.fr.report.cell.cellattr.core.group.DSColumn; -import com.fr.design.utils.gui.GUICoreUtils; + +import javax.swing.JPanel; +import java.awt.BorderLayout; +import java.awt.FlowLayout; public class DSColumnConditionsPane extends BasicPane { //peter: Lite Condition. @@ -65,7 +62,7 @@ public class DSColumnConditionsPane extends BasicPane { @Override public String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("Filter"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Filter"); } public void populate(TableDataSource tds, CellElement cellElement) { @@ -103,4 +100,4 @@ public class DSColumnConditionsPane extends BasicPane { } } -} \ No newline at end of file +} diff --git a/designer-realize/src/main/java/com/fr/design/dscolumn/DSColumnPane.java b/designer-realize/src/main/java/com/fr/design/dscolumn/DSColumnPane.java index 4ef9e7e8e1..3b55a7d76f 100644 --- a/designer-realize/src/main/java/com/fr/design/dscolumn/DSColumnPane.java +++ b/designer-realize/src/main/java/com/fr/design/dscolumn/DSColumnPane.java @@ -101,7 +101,7 @@ public class DSColumnPane extends BasicPane { tabbedPane.addTab(com.fr.design.i18n.Toolkit.i18nText("Basic"), basicPane); conditionPane = new DSColumnConditionsPane(setting); - tabbedPane.addTab(com.fr.design.i18n.Toolkit.i18nText("Filter"), conditionPane); + tabbedPane.addTab(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Filter"), conditionPane); advancedPane = new DSColumnAdvancedPane(setting); tabbedPane.addTab(com.fr.design.i18n.Toolkit.i18nText("Advanced"), advancedPane); @@ -171,4 +171,4 @@ public class DSColumnPane extends BasicPane { public void putCellElement(TemplateCellElement tplCE) { basicPane.putCellElement(tplCE); } -} \ No newline at end of file +} diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/app/CptApp.java b/designer-realize/src/main/java/com/fr/design/mainframe/app/CptApp.java index f30a03332a..38ef871cf1 100644 --- a/designer-realize/src/main/java/com/fr/design/mainframe/app/CptApp.java +++ b/designer-realize/src/main/java/com/fr/design/mainframe/app/CptApp.java @@ -116,7 +116,7 @@ class CptApp extends AbstractWorkBookApp { } }); - UIButton noButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_No")); + UIButton noButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_No")); noButton.addActionListener(new ActionListener() { @Override diff --git a/designer-realize/src/main/java/com/fr/design/report/PageSetupPane.java b/designer-realize/src/main/java/com/fr/design/report/PageSetupPane.java index 16c85da0cc..72a02aa0bd 100644 --- a/designer-realize/src/main/java/com/fr/design/report/PageSetupPane.java +++ b/designer-realize/src/main/java/com/fr/design/report/PageSetupPane.java @@ -878,7 +878,7 @@ public class PageSetupPane extends BasicPane { this.add(defaultPane, BorderLayout.NORTH); // page order - JPanel outpageOrderPane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Page_Order")); + JPanel outpageOrderPane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Page_Order")); JPanel pageOrderPane = FRGUIPaneFactory.createNColumnGridInnerContainer_S_Pane(2); outpageOrderPane.add(pageOrderPane); defaultPane.add(outpageOrderPane); @@ -1033,4 +1033,4 @@ public class PageSetupPane extends BasicPane { } } -} \ No newline at end of file +} diff --git a/designer-realize/src/main/java/com/fr/design/report/ValueVerifierEditPane.java b/designer-realize/src/main/java/com/fr/design/report/ValueVerifierEditPane.java index 8c65a1db05..0c62a9ab05 100644 --- a/designer-realize/src/main/java/com/fr/design/report/ValueVerifierEditPane.java +++ b/designer-realize/src/main/java/com/fr/design/report/ValueVerifierEditPane.java @@ -18,8 +18,8 @@ import java.awt.*; public class ValueVerifierEditPane extends JPanel { private UITableEditorPane tableEditorPane; private final String[] columnNames = new String[] { - com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Formula_Verify"), - com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Formula_Verify_Warn_Text") }; + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Formula_Verify"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Formula_Verify_Warn_Text") }; public ValueVerifierEditPane() { // ben:UITableEditorPane； diff --git a/designer-realize/src/main/java/com/fr/design/webattr/ReportWebWidgetConstants.java b/designer-realize/src/main/java/com/fr/design/webattr/ReportWebWidgetConstants.java index b95123ea43..0c5400ed07 100644 --- a/designer-realize/src/main/java/com/fr/design/webattr/ReportWebWidgetConstants.java +++ b/designer-realize/src/main/java/com/fr/design/webattr/ReportWebWidgetConstants.java @@ -89,17 +89,17 @@ public class ReportWebWidgetConstants { // 导出成Excel 分页导出 - public static final WidgetOption EXCELP = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Export_Excel_Page"), + public static final WidgetOption EXCELP = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Export_Excel_Page"), BaseUtils.readIcon("/com/fr/web/images/excel.png"), ExcelP.class); // 导出成Excel 原样导出 - public static final WidgetOption EXCELO = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Export_Excel_Simple"), + public static final WidgetOption EXCELO = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Export_Excel_Simple"), BaseUtils.readIcon("/com/fr/web/images/excel.png"), ExcelO.class); // 导出成Excel 分页分Sheet导出 - public static final WidgetOption EXCELS = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Export_Excel_Page_To_Sheet"), + public static final WidgetOption EXCELS = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Export_Excel_Page_To_Sheet"), BaseUtils.readIcon("/com/fr/web/images/excel.png"), ExcelS.class); // 导出成Word - public static final WidgetOption WORD = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Export_Word"), BaseUtils.readIcon("/com/fr/web/images/word.png"), Word.class); + public static final WidgetOption WORD = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Export_Word"), BaseUtils.readIcon("/com/fr/web/images/word.png"), Word.class); // 页面设置 public static final WidgetOption PAGESETUP = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("PageSetup-Page_Setup"), BaseUtils.readIcon("/com/fr/web/images/pageSetup.png"), PageSetup.class); // 导出 @@ -172,4 +172,4 @@ public class ReportWebWidgetConstants { //Excel导入_增量 public static final WidgetOption IMPORTEXCEL_APPEND= WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("FR-Engine_Excel_Import_Append"), BaseUtils.readIcon("/com/fr/web/images/excel.png"), ImExcelAppend.class); -} \ No newline at end of file +} diff --git a/designer-realize/src/main/java/com/fr/design/webattr/WebCssPane.java b/designer-realize/src/main/java/com/fr/design/webattr/WebCssPane.java index 23bc43a2f4..6f9801c54f 100644 --- a/designer-realize/src/main/java/com/fr/design/webattr/WebCssPane.java +++ b/designer-realize/src/main/java/com/fr/design/webattr/WebCssPane.java @@ -72,7 +72,7 @@ public class WebCssPane extends BasicPane { @Override public void actionPerformed(ActionEvent e) { FILEChooserPane fileChooser = FILEChooserPane.getInstance(false, false, true, - new ChooseFileFilter("css", "css" + com.fr.design.i18n.Toolkit.i18nText("File"))); + new ChooseFileFilter("css", "css" + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_File"))); if (fileChooser.showOpenDialog(DesignerContext.getDesignerFrame()) == FILEChooserPane.OK_OPTION) { final FILE file = fileChooser.getSelectedFILE(); @@ -122,4 +122,4 @@ public class WebCssPane extends BasicPane { } } -} \ No newline at end of file +} diff --git a/designer-realize/src/main/java/com/fr/design/webattr/WebJsPane.java b/designer-realize/src/main/java/com/fr/design/webattr/WebJsPane.java index 2a377abf69..b7aeec21fc 100644 --- a/designer-realize/src/main/java/com/fr/design/webattr/WebJsPane.java +++ b/designer-realize/src/main/java/com/fr/design/webattr/WebJsPane.java @@ -1,40 +1,41 @@ package com.fr.design.webattr; -import java.awt.BorderLayout; -import java.awt.Color; -import java.awt.Dimension; -import java.awt.FlowLayout; -import java.awt.event.*; -import java.io.IOException; -import java.io.InputStream; -import java.net.URL; -import java.net.URLConnection; -import java.util.ArrayList; -import java.util.List; - -import javax.swing.BorderFactory; -import javax.swing.ButtonGroup; - -import com.fr.design.gui.ibutton.UIRadioButton; -import com.fr.design.gui.ilable.UILabel; -import javax.swing.JOptionPane; -import javax.swing.JPanel; -import javax.swing.SwingUtilities; - import com.fr.base.FRContext; +import com.fr.design.dialog.BasicPane; +import com.fr.design.gui.frpane.EditingStringListPane; import com.fr.design.gui.ibutton.UIButton; +import com.fr.design.gui.ibutton.UIRadioButton; +import com.fr.design.gui.ilable.UILabel; import com.fr.design.gui.itextfield.UITextField; -import com.fr.design.gui.frpane.EditingStringListPane; import com.fr.design.mainframe.DesignerContext; -import com.fr.design.dialog.BasicPane; import com.fr.file.FILE; import com.fr.file.FILEChooserPane; import com.fr.file.filter.ChooseFileFilter; - import com.fr.stable.CoreConstants; import com.fr.stable.StringUtils; import com.fr.web.attr.ReportWebAttr; +import javax.swing.BorderFactory; +import javax.swing.ButtonGroup; +import javax.swing.JOptionPane; +import javax.swing.JPanel; +import javax.swing.SwingUtilities; +import java.awt.BorderLayout; +import java.awt.Color; +import java.awt.Dimension; +import java.awt.FlowLayout; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.awt.event.KeyAdapter; +import java.awt.event.KeyEvent; +import java.awt.event.KeyListener; +import java.io.IOException; +import java.io.InputStream; +import java.net.URL; +import java.net.URLConnection; +import java.util.ArrayList; +import java.util.List; + public class WebJsPane extends BasicPane { private UITextField localText; private UITextField urlText; @@ -160,7 +161,7 @@ public class WebJsPane extends BasicPane { @Override public void actionPerformed(ActionEvent e) { FILEChooserPane fileChooser = FILEChooserPane.getInstance(false, false, true, - new ChooseFileFilter("js", "javascript" + com.fr.design.i18n.Toolkit.i18nText("File"))); + new ChooseFileFilter("js", "javascript" + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_File"))); if (fileChooser.showOpenDialog(DesignerContext.getDesignerFrame()) == FILEChooserPane.OK_OPTION) { final FILE file = fileChooser.getSelectedFILE(); @@ -197,7 +198,7 @@ public class WebJsPane extends BasicPane { FRContext.getLogger().error(e.getMessage(), e); } if (in == null) { - JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Database_Connection_Failed")); + JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Database_Connection_Failed")); } else { JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Datasource-Connection_successfully")); try { @@ -283,4 +284,4 @@ public class WebJsPane extends BasicPane { } } -} \ No newline at end of file +} diff --git a/designer-realize/src/main/java/com/fr/quickeditor/cellquick/CellDSColumnEditor.java b/designer-realize/src/main/java/com/fr/quickeditor/cellquick/CellDSColumnEditor.java index a4c4949bd6..28bfe0086f 100644 --- a/designer-realize/src/main/java/com/fr/quickeditor/cellquick/CellDSColumnEditor.java +++ b/designer-realize/src/main/java/com/fr/quickeditor/cellquick/CellDSColumnEditor.java @@ -575,7 +575,7 @@ public class CellDSColumnEditor extends CellQuickEditor { //补充空白数据 JPanel multiNumPane = FRGUIPaneFactory.createYBoxEmptyBorderPane(); - useMultiNumCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fill_blank_Data")); + useMultiNumCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Fill_Blank_Data")); JPanel checkBoxPane = new JPanel(new BorderLayout()); checkBoxPane.add(useMultiNumCheckBox, BorderLayout.WEST); multiNumPane.add(checkBoxPane); @@ -1215,4 +1215,4 @@ public class CellDSColumnEditor extends CellQuickEditor { public Object getComboBoxSelected() { return ActionFactory.createAction(DSColumnCellAction.class); } -} \ No newline at end of file +} diff --git a/designer-realize/src/main/java/com/fr/start/Designer.java b/designer-realize/src/main/java/com/fr/start/Designer.java index d02fcb0164..40739f7b2c 100644 --- a/designer-realize/src/main/java/com/fr/start/Designer.java +++ b/designer-realize/src/main/java/com/fr/start/Designer.java @@ -391,7 +391,7 @@ public class Designer extends BaseDesigner { if (DesignerMode.isAuthorityEditing()) { if (plus instanceof JWorkBook && plus.toolbars4Target() == null) { //聚合块编辑 - return super.polyToolBar(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Privilege_Poly_Block_Edit")); + return super.polyToolBar(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Privilege_Poly_Block_Edit")); } else { return plus.toolBar4Authority(); }