From d2a54a881f8969b251c34b342707ef7cc24d14a9 Mon Sep 17 00:00:00 2001 From: Jinbokai Date: Fri, 10 Aug 2018 15:00:32 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E5=8C=96=20Signed-off-by:=20?= =?UTF-8?q?Jinbokai=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jinbokai --- .../com/fr/design/actions/cell/CleanAuthorityAction.java | 1 - .../design/actions/columnrow/ResetColumnHideAction.java | 1 - .../fr/design/actions/columnrow/ResetRowHideAction.java | 1 - .../design/actions/edit/EditFloatElementNameAction.java | 2 -- .../main/java/com/fr/design/condition/HyperlinkPane.java | 4 ---- .../com/fr/design/condition/PresentHighlightPane.java | 1 - .../com/fr/design/condition/WidgetHighlightPane.java | 1 - .../com/fr/design/dscolumn/SpecifiedGroupAttrPane.java | 2 -- .../java/com/fr/design/javascript/ListenerEditPane.java | 1 - .../fr/design/mainframe/AuthorityEditToolBarPane.java | 2 -- .../fr/design/mainframe/AuthoritySheetEditedPane.java | 1 - .../com/fr/design/mainframe/AuthorityToolBarPane.java | 4 ---- .../java/com/fr/design/mainframe/ElementCasePane.java | 1 - .../java/com/fr/design/mainframe/ReportComponent.java | 1 - .../fr/design/mainframe/cell/CellElementEditPane.java | 1 - .../com/fr/design/mainframe/cell/QuickEditorRegion.java | 1 - .../cell/settingpane/style/CustomStylePane.java | 1 - .../cell/settingpane/style/PredefinedStylePane.java | 1 - .../design/mainframe/form/FormElementCaseDesigner.java | 1 - .../com/fr/design/parameter/ParameterDefinitePane.java | 1 - .../src/main/java/com/fr/design/present/BarCodePane.java | 1 - .../main/java/com/fr/design/report/ExcelExportPane.java | 3 --- .../main/java/com/fr/design/report/LayerReportPane.java | 2 -- .../main/java/com/fr/design/report/PDFExportPane.java | 1 - .../main/java/com/fr/design/report/SubReportPane.java | 3 --- .../main/java/com/fr/design/report/VerifierListPane.java | 2 -- .../java/com/fr/design/report/freeze/FreezePagePane.java | 1 - .../com/fr/design/report/freeze/FreezeWriteColPane.java | 2 -- .../com/fr/design/report/freeze/FreezeWriteRowPane.java | 2 -- .../design/report/freeze/RepeatAndFreezeSettingPane.java | 5 ----- .../main/java/com/fr/design/webattr/DragToolBarPane.java | 1 - .../src/main/java/com/fr/design/webattr/EditToolBar.java | 9 --------- .../com/fr/design/webattr/ReportWebWidgetConstants.java | 1 - .../main/java/com/fr/design/webattr/ToolBarDragPane.java | 1 - .../java/com/fr/design/webattr/WriteToolBarPane.java | 1 - .../main/java/com/fr/design/widget/ValueWidgetPane.java | 1 - .../src/main/java/com/fr/design/widget/WidgetPane.java | 1 - .../com/fr/design/widget/ui/CheckBoxGroupDefinePane.java | 1 - .../com/fr/design/widget/ui/ParameterTreeComboBox.java | 1 - .../design/widget/ui/btn/DefineAppendColumnRowPane.java | 1 - .../design/widget/ui/btn/DefineDeleteColumnRowPane.java | 1 - .../write/submit/SmartInsertDBManipulationPane.java | 2 -- .../main/java/com/fr/grid/selection/FloatSelection.java | 2 -- 43 files changed, 74 deletions(-) diff --git a/designer-realize/src/main/java/com/fr/design/actions/cell/CleanAuthorityAction.java b/designer-realize/src/main/java/com/fr/design/actions/cell/CleanAuthorityAction.java index 79157d7a8..7fdcb5958 100644 --- a/designer-realize/src/main/java/com/fr/design/actions/cell/CleanAuthorityAction.java +++ b/designer-realize/src/main/java/com/fr/design/actions/cell/CleanAuthorityAction.java @@ -26,7 +26,6 @@ public class CleanAuthorityAction extends ElementCaseAction { public CleanAuthorityAction(ElementCasePane t) { super(t); -// this.setName(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Clear", "DashBoard-Potence"})); this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Clear_DashBoard_Potence")); } diff --git a/designer-realize/src/main/java/com/fr/design/actions/columnrow/ResetColumnHideAction.java b/designer-realize/src/main/java/com/fr/design/actions/columnrow/ResetColumnHideAction.java index a1b0252f3..99aea79c0 100644 --- a/designer-realize/src/main/java/com/fr/design/actions/columnrow/ResetColumnHideAction.java +++ b/designer-realize/src/main/java/com/fr/design/actions/columnrow/ResetColumnHideAction.java @@ -11,7 +11,6 @@ public class ResetColumnHideAction extends AbstractColumnRowIndexAction { public ResetColumnHideAction(ElementCasePane t, int indexOfColumnOrRow) { super(t, indexOfColumnOrRow); -// this.setName(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"MConfig-CancelButton", "Hide"})); this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Cancel_Hide")); } diff --git a/designer-realize/src/main/java/com/fr/design/actions/columnrow/ResetRowHideAction.java b/designer-realize/src/main/java/com/fr/design/actions/columnrow/ResetRowHideAction.java index be6b8f92d..82dfbee28 100644 --- a/designer-realize/src/main/java/com/fr/design/actions/columnrow/ResetRowHideAction.java +++ b/designer-realize/src/main/java/com/fr/design/actions/columnrow/ResetRowHideAction.java @@ -11,7 +11,6 @@ public class ResetRowHideAction extends AbstractColumnRowIndexAction { public ResetRowHideAction(ElementCasePane t, int indexOfColumnOrRow) { super(t, indexOfColumnOrRow); -// this.setName(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"MConfig-CancelButton", "Hide"})); this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Cancel_Hide")); } diff --git a/designer-realize/src/main/java/com/fr/design/actions/edit/EditFloatElementNameAction.java b/designer-realize/src/main/java/com/fr/design/actions/edit/EditFloatElementNameAction.java index 63c91789d..cbb9e72b0 100644 --- a/designer-realize/src/main/java/com/fr/design/actions/edit/EditFloatElementNameAction.java +++ b/designer-realize/src/main/java/com/fr/design/actions/edit/EditFloatElementNameAction.java @@ -18,7 +18,6 @@ public class EditFloatElementNameAction extends FloatSelectionAction { public EditFloatElementNameAction(ElementCasePane t) { super(t); -// this.setName(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Set", "Float_Element_Name"})); this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Set_Float_Element_Name")); } @@ -57,7 +56,6 @@ public class EditFloatElementNameAction extends FloatSelectionAction { @Override protected String title4PopupWindow() { -// return com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Set", "Float_Element_Name"}); return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Set_Float_Element_Name"); } diff --git a/designer-realize/src/main/java/com/fr/design/condition/HyperlinkPane.java b/designer-realize/src/main/java/com/fr/design/condition/HyperlinkPane.java index 898cb68c8..3687b83b0 100644 --- a/designer-realize/src/main/java/com/fr/design/condition/HyperlinkPane.java +++ b/designer-realize/src/main/java/com/fr/design/condition/HyperlinkPane.java @@ -51,7 +51,6 @@ public class HyperlinkPane extends ConditionAttrSingleConditionPane { private static final String JS = com.fr.design.i18n.Toolkit.i18nText("FR-Designer_JavaScript"); private static final String FORMSUBMIT = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_JavaScript_Form_Submit"); private static final String DBCOMMIT = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_JavaScript_Commit_To_Database"); -// private static final String CUSTOMACTION= com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"FR-Designer_JavaScript_Custom", "FR-Designer_RWA_Submit"}); private static final String CUSTOMACTION= com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_JavaScript_Custom_Submit"); private static final String EMAIL = com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Email_sentEmail"); diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/AuthorityEditToolBarPane.java b/designer-realize/src/main/java/com/fr/design/mainframe/AuthorityEditToolBarPane.java index d098ab3ac..6bc529408 100644 --- a/designer-realize/src/main/java/com/fr/design/mainframe/AuthorityEditToolBarPane.java +++ b/designer-realize/src/main/java/com/fr/design/mainframe/AuthorityEditToolBarPane.java @@ -40,7 +40,6 @@ public class AuthorityEditToolBarPane extends AuthorityPropertyPane { super(HistoryTemplateListPane.getInstance().getCurrentEditingTemplate()); this.setLayout(new BorderLayout()); this.setBorder(null); -// UILabel authorityTitle = new UILabel(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"FR-Designer_Permissions", "FR-Designer_Edit"})) { UILabel authorityTitle = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Permissions_Edit")) { @Override public Dimension getPreferredSize() { @@ -208,7 +207,6 @@ public class AuthorityEditToolBarPane extends AuthorityPropertyPane { if (name.getText() == "") { type.setText(""); } else { -// type.setText(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"ReportServerP-Toolbar", "FR-Designer_Form_Button"})); type.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Toolbar_Button")); } } diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/AuthoritySheetEditedPane.java b/designer-realize/src/main/java/com/fr/design/mainframe/AuthoritySheetEditedPane.java index 5918adade..e5e9f44dd 100644 --- a/designer-realize/src/main/java/com/fr/design/mainframe/AuthoritySheetEditedPane.java +++ b/designer-realize/src/main/java/com/fr/design/mainframe/AuthoritySheetEditedPane.java @@ -30,7 +30,6 @@ public class AuthoritySheetEditedPane extends AuthorityPropertyPane { super(HistoryTemplateListPane.getInstance().getCurrentEditingTemplate()); this.setLayout(new BorderLayout()); this.setBorder(null); -// UILabel authorityTitle = new UILabel(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"DashBoard-Potence", "Edit"})) { UILabel authorityTitle = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Edit_DashBoard_Potence")) { @Override public Dimension getPreferredSize() { diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/AuthorityToolBarPane.java b/designer-realize/src/main/java/com/fr/design/mainframe/AuthorityToolBarPane.java index a371fa7cd..25db827d5 100644 --- a/designer-realize/src/main/java/com/fr/design/mainframe/AuthorityToolBarPane.java +++ b/designer-realize/src/main/java/com/fr/design/mainframe/AuthorityToolBarPane.java @@ -46,7 +46,6 @@ public class AuthorityToolBarPane extends BasicBeanPane extends BasicBeanPane extends BasicBeanPane toolBarButtons = toolBarPane.getToolBarButtons(); -// boolean isnotEnable = ComparatorUtils.equals(title.getText(), com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Server", "ReportServerP-Toolbar", "Choose_Role"}))&& !WorkContext.getCurrent().isRoot(); boolean isnotEnable = ComparatorUtils.equals(title.getText(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Server_Toolbar_Choose_Role"))&& !WorkContext.getCurrent().isRoot(); for (ToolBarButton button : toolBarButtons) { button.setEnabled(!isnotEnable); @@ -283,7 +280,6 @@ public class AuthorityToolBarPane extends BasicBeanPane extends Tar */ public ShortCut[] shortCuts4Authority() { return new ShortCut[]{ -// new NameSeparator(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"DashBoard-Potence", "Edit"})), new NameSeparator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Edit_DashBoard_Potence")), DesignerMode.isAuthorityEditing() ? new ExitAuthorityEditAction(this) : new AllowAuthorityEditAction(this), }; diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/ReportComponent.java b/designer-realize/src/main/java/com/fr/design/mainframe/ReportComponent.java index b3fdc37ff..1957d68bc 100644 --- a/designer-realize/src/main/java/com/fr/design/mainframe/ReportComponent.java +++ b/designer-realize/src/main/java/com/fr/design/mainframe/ReportComponent.java @@ -68,7 +68,6 @@ public abstract class ReportComponent { * @return */ public String title4PopupWindow() { -// return com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Custom", "Style"}); return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Custom_Style"); } diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/style/PredefinedStylePane.java b/designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/style/PredefinedStylePane.java index 41b1c08c8..dc7856555 100644 --- a/designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/style/PredefinedStylePane.java +++ b/designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/style/PredefinedStylePane.java @@ -124,7 +124,6 @@ public class PredefinedStylePane extends FurtherBasicBeanPane impleme * @return 标题 */ public String title4PopupWindow() { -// return com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"PageSetup-Predefined", "Style"}); return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Predefined_Style"); } diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/form/FormElementCaseDesigner.java b/designer-realize/src/main/java/com/fr/design/mainframe/form/FormElementCaseDesigner.java index 76de62961..ba883874c 100644 --- a/designer-realize/src/main/java/com/fr/design/mainframe/form/FormElementCaseDesigner.java +++ b/designer-realize/src/main/java/com/fr/design/mainframe/form/FormElementCaseDesigner.java @@ -94,7 +94,6 @@ public class FormElementCaseDesigner { } private void initVersionComboBox() { -// String[] array = {com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Auto", "Choose"}), "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16"}; String[] array = {com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Auto_Choose"), "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16"}; initcombobox(this.RCodeVersionComboBox, array, 0); } diff --git a/designer-realize/src/main/java/com/fr/design/report/ExcelExportPane.java b/designer-realize/src/main/java/com/fr/design/report/ExcelExportPane.java index 3d2f5ef6c..9b1e84036 100644 --- a/designer-realize/src/main/java/com/fr/design/report/ExcelExportPane.java +++ b/designer-realize/src/main/java/com/fr/design/report/ExcelExportPane.java @@ -51,7 +51,6 @@ public class ExcelExportPane extends BasicPane { northPane.add(passwordPane); passwordWritePane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane(); passwordPane.add(passwordWritePane); -// UILabel passwordLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"File", "Password"}) + ":"); UILabel passwordLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_File_Password") + ":"); passwordWritePane.add(passwordLabel); passwordField = new UITextField(11); @@ -70,10 +69,8 @@ public class ExcelExportPane extends BasicPane { JPanel protectedWordPane =FRGUIPaneFactory.createNormalFlowInnerContainer_M_Pane(); -// protectedWord = new UICheckBox(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Protected", "Password"})); protectedWord = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Protected_Password")); wordPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane(); -// wordPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Sheet", "Password"}) + ":")); wordPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Sheet_Password") + ":")); protectedField = new UITextField(11); wordPane.add(protectedField); diff --git a/designer-realize/src/main/java/com/fr/design/report/LayerReportPane.java b/designer-realize/src/main/java/com/fr/design/report/LayerReportPane.java index 28c82d41c..2eefe5ab0 100644 --- a/designer-realize/src/main/java/com/fr/design/report/LayerReportPane.java +++ b/designer-realize/src/main/java/com/fr/design/report/LayerReportPane.java @@ -49,7 +49,6 @@ public class LayerReportPane extends BasicBeanPane { protected void initComponents() { this.setLayout(FRGUIPaneFactory.createBorderLayout()); -// JPanel outlayerReportPane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Report_Engine", "Attribute"})); JPanel outlayerReportPane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Report_Engine_Attribute")); JPanel layerReportPane = FRGUIPaneFactory.createY_AXISBoxInnerContainer_M_Pane(); this.add(outlayerReportPane); @@ -114,7 +113,6 @@ public class LayerReportPane extends BasicBeanPane { @Override protected String title4PopupWindow() { -// return com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Report_Engine", "Attribute"}); return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Report_Engine_Attribute"); } diff --git a/designer-realize/src/main/java/com/fr/design/report/PDFExportPane.java b/designer-realize/src/main/java/com/fr/design/report/PDFExportPane.java index 64955c206..87f3d3fcf 100644 --- a/designer-realize/src/main/java/com/fr/design/report/PDFExportPane.java +++ b/designer-realize/src/main/java/com/fr/design/report/PDFExportPane.java @@ -40,7 +40,6 @@ public class PDFExportPane extends BasicPane { northPane.add(passwordPane); passwordWritePane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane(); passwordPane.add(passwordWritePane); -// UILabel passwordLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"File", "Password"}) + ":"); UILabel passwordLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_File_Password") + ":"); passwordWritePane.add(passwordLabel); passwordField = new UITextField(11); diff --git a/designer-realize/src/main/java/com/fr/design/report/SubReportPane.java b/designer-realize/src/main/java/com/fr/design/report/SubReportPane.java index 5920678c6..183bf74f0 100644 --- a/designer-realize/src/main/java/com/fr/design/report/SubReportPane.java +++ b/designer-realize/src/main/java/com/fr/design/report/SubReportPane.java @@ -45,7 +45,6 @@ public class SubReportPane extends BasicPane { this.setLayout(FRGUIPaneFactory.createM_BorderLayout()); JPanel northPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); // northPane.setLayout(FRGUIPaneFactory.createM_BorderLayout()); -// northPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Sub_Report", "Path"}),null)); northPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Sub_Report_Path"),null)); northPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Location") + ":"), BorderLayout.WEST); northPane.add(pathTextField = new UITextField(), BorderLayout.CENTER); @@ -80,7 +79,6 @@ public class SubReportPane extends BasicPane { centerPane.setLayout(FRGUIPaneFactory.createM_BorderLayout()); centerPane.setBorder(BorderFactory.createEmptyBorder(0, 5, 10, 5)); kvPane = new ReportletParameterViewPane(); -// centerPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Set", "Delivery", "Parameter"}),null)); centerPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Set_Delivery_Parameter"),null)); JPanel kcPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); kcPane.add(kvPane); @@ -96,7 +94,6 @@ public class SubReportPane extends BasicPane { @Override protected String title4PopupWindow() { -// return com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Insert", "Sub_Report"}); return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Insert_Sub_Report"); } diff --git a/designer-realize/src/main/java/com/fr/design/report/VerifierListPane.java b/designer-realize/src/main/java/com/fr/design/report/VerifierListPane.java index a122ad02e..be8f1605e 100644 --- a/designer-realize/src/main/java/com/fr/design/report/VerifierListPane.java +++ b/designer-realize/src/main/java/com/fr/design/report/VerifierListPane.java @@ -34,7 +34,6 @@ public class VerifierListPane extends ObjectJControlPane { */ public NameableCreator[] createNameableCreators() { NameableCreator[] creators = new NameableCreator[]{ -// new NameObjectCreator(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"BuildIn", "Verify"}), new NameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_BuildIn_Verify"), "/com/fr/web/images/reportlet.png", ValueVerifier.class, @@ -51,7 +50,6 @@ public class VerifierListPane extends ObjectJControlPane { }); } creators = ArrayUtils.add(creators, new NameObjectCreator( -// com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Custom", "Verify"}), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Custom_Verify"), "/com/fr/web/images/reportlet.png", WClassVerifier.class, diff --git a/designer-realize/src/main/java/com/fr/design/report/freeze/FreezePagePane.java b/designer-realize/src/main/java/com/fr/design/report/freeze/FreezePagePane.java index b9115c887..1e959dd70 100644 --- a/designer-realize/src/main/java/com/fr/design/report/freeze/FreezePagePane.java +++ b/designer-realize/src/main/java/com/fr/design/report/freeze/FreezePagePane.java @@ -12,7 +12,6 @@ public class FreezePagePane extends FreezeAndRepeatPane { public FreezePagePane(boolean isNumber) { this.isNumber = isNumber; -// start = new UILabel(isNumber ? com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Frozen", "N.O."})+" 1" : com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Frozen", "N.O."})+" A", SwingConstants.CENTER); start = new UILabel(isNumber ? com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Frozen_N.O.")+" 1" : com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Frozen_N.O.")+" A", SwingConstants.CENTER); end = new UILabel(isNumber ? " 1"+com.fr.design.i18n.Toolkit.i18nText("Row") : " A"+com.fr.design.i18n.Toolkit.i18nText("Column"), SwingConstants.CENTER); super.initComponent(); diff --git a/designer-realize/src/main/java/com/fr/design/report/freeze/FreezeWriteColPane.java b/designer-realize/src/main/java/com/fr/design/report/freeze/FreezeWriteColPane.java index db635c6a1..58735c4dc 100644 --- a/designer-realize/src/main/java/com/fr/design/report/freeze/FreezeWriteColPane.java +++ b/designer-realize/src/main/java/com/fr/design/report/freeze/FreezeWriteColPane.java @@ -10,7 +10,6 @@ public class FreezeWriteColPane extends FreezeAndRepeatPane { public FreezeWriteColPane() { -// start = new UILabel(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Frozen", "N.O."}) + " A", SwingConstants.CENTER); start = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Frozen_N.O.") + " A", SwingConstants.CENTER); end = new ColSpinner(1,Integer.MAX_VALUE,1,1); super.initComponent(); @@ -26,7 +25,6 @@ public class FreezeWriteColPane extends FreezeAndRepeatPane { @Override public void populateBean(FT ob) { -// ((UILabel)start).setText(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Frozen", "N.O."}) + StableUtils.convertIntToABC(ob.getFrom())); ((UILabel)start).setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Frozen_N.O.") + StableUtils.convertIntToABC(ob.getFrom())); ((ColSpinner)end).setValue((ob.getTo() + 1)); } diff --git a/designer-realize/src/main/java/com/fr/design/report/freeze/FreezeWriteRowPane.java b/designer-realize/src/main/java/com/fr/design/report/freeze/FreezeWriteRowPane.java index b5758b128..d9cee23b0 100644 --- a/designer-realize/src/main/java/com/fr/design/report/freeze/FreezeWriteRowPane.java +++ b/designer-realize/src/main/java/com/fr/design/report/freeze/FreezeWriteRowPane.java @@ -9,7 +9,6 @@ import com.fr.stable.StableUtils; public class FreezeWriteRowPane extends FreezeAndRepeatPane { public FreezeWriteRowPane() { -// start = new UILabel(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Frozen", "N.O."}) + " 1", SwingConstants.CENTER); start = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Frozen_N.O.") + " 1", SwingConstants.CENTER); end = new RowSpinner(1, Integer.MAX_VALUE, 1,1); super.initComponent(); @@ -23,7 +22,6 @@ public class FreezeWriteRowPane extends FreezeAndRepeatPane { @Override public void populateBean(FT ob) { -// ((UILabel)start).setText(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Frozen", "N.O."}) + String.valueOf(ob.getFrom())); ((UILabel)start).setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Frozen_N.O.") + String.valueOf(ob.getFrom())); ((RowSpinner)end).setValue(ob.getTo() + 1); } diff --git a/designer-realize/src/main/java/com/fr/design/report/freeze/RepeatAndFreezeSettingPane.java b/designer-realize/src/main/java/com/fr/design/report/freeze/RepeatAndFreezeSettingPane.java index 73e08f34d..f3551e31f 100644 --- a/designer-realize/src/main/java/com/fr/design/report/freeze/RepeatAndFreezeSettingPane.java +++ b/designer-realize/src/main/java/com/fr/design/report/freeze/RepeatAndFreezeSettingPane.java @@ -66,7 +66,6 @@ public class RepeatAndFreezeSettingPane extends BasicPane { JPanel soverlapRowStartPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane(); useRepeatTitleRCheckBox = new UICheckBox(); soverlapRowStartPane.add(useRepeatTitleRCheckBox); -// soverlapRowStartPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"PageSetup-Title_Start_Row", "From"}))); soverlapRowStartPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Title_Start_Row_Form"))); repeatTitleRowPane = new RepeatRowPane(); soverlapRowStartPane.add(repeatTitleRowPane); @@ -82,7 +81,6 @@ public class RepeatAndFreezeSettingPane extends BasicPane { JPanel soverlapColStartPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane(); useRepeatTitleCCheckBox = new UICheckBox(); soverlapColStartPane.add(useRepeatTitleCCheckBox); -// soverlapColStartPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"PageSetup-Title_Start_Column", "From"}))); soverlapColStartPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Title_Start_Column_Form"))); // 重复打印标题的结束列 repeatTitleColPane = new RepeatColPane(); @@ -99,7 +97,6 @@ public class RepeatAndFreezeSettingPane extends BasicPane { JPanel foverlapRowStartPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane(); useRepeatFinisRCheckBox = new UICheckBox(); foverlapRowStartPane.add(useRepeatFinisRCheckBox); -// foverlapRowStartPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"PageSetup-Finis_Start_Row", "From"}))); foverlapRowStartPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Finis_Start_Row_Form"))); repeatFinisRowPane = new RepeatRowPane(); foverlapRowStartPane.add(repeatFinisRowPane); @@ -115,7 +112,6 @@ public class RepeatAndFreezeSettingPane extends BasicPane { JPanel foverlapColStartPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane(); useRepeatFinisCCheckBox = new UICheckBox(); foverlapColStartPane.add(useRepeatFinisCCheckBox); -// foverlapColStartPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"PageSetup-Finis_Start_Column", "From"}))); foverlapColStartPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Finis_Start_Column_Form"))); repeatFinisColPane = new RepeatColPane(); foverlapColStartPane.add(repeatFinisColPane); @@ -179,7 +175,6 @@ public class RepeatAndFreezeSettingPane extends BasicPane { private JPanel initWriteFrozenPane() { JPanel writePanel = FRGUIPaneFactory.createBorderLayout_S_Pane(); // 填报冻结 -// UILabel writeLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Face_Write", "Frozen"}) + ":"); UILabel writeLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Face_Write_Frozen") + ":"); JPanel writeLabelPanel = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane(); writeLabelPanel.add(writeLabel); diff --git a/designer-realize/src/main/java/com/fr/design/webattr/DragToolBarPane.java b/designer-realize/src/main/java/com/fr/design/webattr/DragToolBarPane.java index 23a655aef..b79e19e13 100644 --- a/designer-realize/src/main/java/com/fr/design/webattr/DragToolBarPane.java +++ b/designer-realize/src/main/java/com/fr/design/webattr/DragToolBarPane.java @@ -136,7 +136,6 @@ public class DragToolBarPane extends WidgetToolBarPane { @Override protected String title4PopupWindow() { -// return com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"ReportServerP-Toolbar", "Set"}); return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Set_Toolbar"); } diff --git a/designer-realize/src/main/java/com/fr/design/webattr/EditToolBar.java b/designer-realize/src/main/java/com/fr/design/webattr/EditToolBar.java index f4cf64f4c..97694b058 100644 --- a/designer-realize/src/main/java/com/fr/design/webattr/EditToolBar.java +++ b/designer-realize/src/main/java/com/fr/design/webattr/EditToolBar.java @@ -152,14 +152,11 @@ public class EditToolBar extends BasicPane { this.add(splitPane); list.addListSelectionListener(listSelectionListener); JPanel backgroundPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane(); -// UIButton bgButton = new UIButton(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Background", "Set"})); UIButton bgButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Set_Background")); -// defaultCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Default", "Background"})); defaultCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Default_Background")); bgButton.addActionListener(actioner); backgroundPane.add(defaultCheckBox); backgroundPane.add(bgButton); -// backgroundPane.setBorder(BorderFactory.createTitledBorder(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Background", "Set"}))); backgroundPane.setBorder(BorderFactory.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Set_Background"))); this.add(backgroundPane, BorderLayout.SOUTH); } @@ -383,14 +380,12 @@ public class EditToolBar extends BasicPane { double rowSize[] = {p, p}; double columnSize[] = {p, p}; -// Component[][] coms = new Component[][]{{new UILabel(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Widget", "Printer-Alias"}) + ":"), nameField}, {new UILabel(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Widget", "Icon"}) + ":"), iconPane}}; Component[][] coms = new Component[][]{{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Widget_Printer_Alias") + ":"), nameField}, {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Widget_Icon") + ":"), iconPane}}; JPanel nameIconPane = TableLayoutHelper.createTableLayoutPane(coms, rowSize, columnSize); north.add(nameIconPane, BorderLayout.SOUTH); -// north.setBorder(BorderFactory.createTitledBorder(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Form-Button", "Property", "Set"}))); north.setBorder(BorderFactory.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Set_Form_Button_Property"))); this.add(north, BorderLayout.NORTH); JPanel none = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane(); @@ -447,7 +442,6 @@ public class EditToolBar extends BasicPane { export = exportToolBarProviders[i].updateCenterPane(export); } -// export.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Form-Button", "Property", "Set"}), null)); export.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Set_Form_Button_Property"), null)); return export; } @@ -455,7 +449,6 @@ public class EditToolBar extends BasicPane { private JPanel getCpane() { JPanel appendCountPane = FRGUIPaneFactory.createY_AXISBoxInnerContainer_S_Pane(); count = new UIBasicSpinner(new SpinnerNumberModel(1, 0, Integer.MAX_VALUE, 1)); -// UILabel countLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Add", "Row", "Column", "Numbers"}) + ":"); UILabel countLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Add_Row_Column_Numbers") + ":"); JPanel cpane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane(); cpane.add(countLabel); @@ -467,11 +460,9 @@ public class EditToolBar extends BasicPane { private JPanel getSubmitPane() { isVerify = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Verify-Data_Verify")); -// failSubmit = new UICheckBox(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Verify_Fail", "Still", "Submit"})); failSubmit = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Verify_Fail_Still_Submit")); isCurSheet = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Only_Submit_Current_Sheet")); JPanel submitPane = FRGUIPaneFactory.createY_AXISBoxInnerContainer_S_Pane(); -// submitPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Form-Button", "Property", "Set"}), null)); submitPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Set_Form_Button_Property"), null)); submitPane.add(isVerify); submitPane.add(failSubmit); 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 26a7d561e..55bcfceb5 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 @@ -149,7 +149,6 @@ public class ReportWebWidgetConstants { public static final WidgetOption SETPRINTEROFFSET = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Engine_SetPrinterOffset"), BaseUtils.readIcon("/com/fr/web/images/pianyi.png"), SetPrinterOffset.class); public static final WidgetOption CUSTOM_BUTTON = WidgetOptionFactory -// .createByWidgetClass(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Custom", "Form-Button"}), CustomToolBarButton.class); .createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Custom_Form_Button"), CustomToolBarButton.class); // 输出离线html报表 diff --git a/designer-realize/src/main/java/com/fr/design/webattr/ToolBarDragPane.java b/designer-realize/src/main/java/com/fr/design/webattr/ToolBarDragPane.java index e1ddac479..d339f201a 100644 --- a/designer-realize/src/main/java/com/fr/design/webattr/ToolBarDragPane.java +++ b/designer-realize/src/main/java/com/fr/design/webattr/ToolBarDragPane.java @@ -256,7 +256,6 @@ public class ToolBarDragPane extends WidgetToolBarPane { @Override protected String title4PopupWindow() { -// return com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"ReportServerP-Toolbar", "Set"}); return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Set_Toolbar"); } diff --git a/designer-realize/src/main/java/com/fr/design/webattr/WriteToolBarPane.java b/designer-realize/src/main/java/com/fr/design/webattr/WriteToolBarPane.java index 928b408b7..fb4a009da 100644 --- a/designer-realize/src/main/java/com/fr/design/webattr/WriteToolBarPane.java +++ b/designer-realize/src/main/java/com/fr/design/webattr/WriteToolBarPane.java @@ -73,7 +73,6 @@ public class WriteToolBarPane extends AbstractEditToolBarPane { rptButtonGroup.add(centerRadioButton); northPane.add(GUICoreUtils.createFlowPane(new Component[]{rptShowLocationLabel, centerRadioButton, leftRadioButton}, FlowLayout.LEFT)); -// colorBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Face_Write", "Current", "Edit", "Row", "Background", "Set"}) + ":"); colorBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Set_Face_Write_Current_Edit_Row_Background") + ":"); colorBox.setSelected(true); colorBox.addActionListener(colorListener); diff --git a/designer-realize/src/main/java/com/fr/design/widget/ValueWidgetPane.java b/designer-realize/src/main/java/com/fr/design/widget/ValueWidgetPane.java index 8fe72c095..b941b02ef 100644 --- a/designer-realize/src/main/java/com/fr/design/widget/ValueWidgetPane.java +++ b/designer-realize/src/main/java/com/fr/design/widget/ValueWidgetPane.java @@ -27,7 +27,6 @@ public class ValueWidgetPane extends WidgetPane { public JPanel initNorthPane(){ JPanel northPane = super.initNorthPane(); -// label = new UILabel(" " + com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Widget", "Value"})+ ":"); label = new UILabel(" " + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Widget_Value")+ ":"); label.setVisible(false); widgetValuePane = new JPanel(); diff --git a/designer-realize/src/main/java/com/fr/design/widget/WidgetPane.java b/designer-realize/src/main/java/com/fr/design/widget/WidgetPane.java index fa82d27ce..01946ec75 100644 --- a/designer-realize/src/main/java/com/fr/design/widget/WidgetPane.java +++ b/designer-realize/src/main/java/com/fr/design/widget/WidgetPane.java @@ -81,7 +81,6 @@ public class WidgetPane extends AbstractAttrNoScrollPane implements ItemListener double[] columnSize = {p, p, f}; double[] rowSize = {p}; Component[][] components = new Component[][]{ -// new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"FR-Designer_Selection", "FR-Designer_Widget"})), emptyLabel, editorTypeComboBox}, new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Select_Widget")), emptyLabel, editorTypeComboBox}, }; JPanel jPanel = TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize); diff --git a/designer-realize/src/main/java/com/fr/design/widget/ui/CheckBoxGroupDefinePane.java b/designer-realize/src/main/java/com/fr/design/widget/ui/CheckBoxGroupDefinePane.java index 8d76a4913..188e766ee 100644 --- a/designer-realize/src/main/java/com/fr/design/widget/ui/CheckBoxGroupDefinePane.java +++ b/designer-realize/src/main/java/com/fr/design/widget/ui/CheckBoxGroupDefinePane.java @@ -37,7 +37,6 @@ public class CheckBoxGroupDefinePane extends FieldEditorDefinePane