From 55d042c7906468c21aaec9c7da52c6dc882a5a13 Mon Sep 17 00:00:00 2001 From: Jinbokai Date: Wed, 18 Jul 2018 19:53:00 +0800 Subject: [PATCH 01/18] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=BF=87=E6=BB=A4?= =?UTF-8?q?=E5=99=A8=EF=BC=8C=E7=A6=81=E6=AD=A2=E8=AE=BF=E9=97=AE=E6=8C=87?= =?UTF-8?q?=E5=AE=9A=E8=B5=84=E6=BA=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jinbokai --- .../server/FineEmbedServerActivator.java | 22 ++++++++++++++ .../java/com/fr/start/server/ForbidType.java | 29 +++++++++++++++++++ 2 files changed, 51 insertions(+) create mode 100644 designer-base/src/main/java/com/fr/start/server/ForbidType.java diff --git a/designer-base/src/main/java/com/fr/start/server/FineEmbedServerActivator.java b/designer-base/src/main/java/com/fr/start/server/FineEmbedServerActivator.java index 2292da99a..01856ccd5 100644 --- a/designer-base/src/main/java/com/fr/start/server/FineEmbedServerActivator.java +++ b/designer-base/src/main/java/com/fr/start/server/FineEmbedServerActivator.java @@ -14,6 +14,8 @@ import org.apache.catalina.Context; import org.apache.catalina.LifecycleException; import org.apache.catalina.Wrapper; +import org.apache.catalina.deploy.FilterDef; +import org.apache.catalina.deploy.FilterMap; import org.apache.catalina.loader.WebappLoader; import org.apache.catalina.startup.Tomcat; @@ -62,6 +64,10 @@ public class FineEmbedServerActivator extends Activator { String docBase = new File(WorkContext.getCurrent().getPath()).getParent(); String appName = "/" + FRContext.getCommonOperator().getAppName(); Context context = tomcat.addContext(appName, docBase); + + //添加过滤器 + addFilter(context); + addDefaultServlet(context); //覆盖tomcat的WebAppClassLoader context.setLoader(new FRTomcatLoader()); @@ -72,6 +78,22 @@ public class FineEmbedServerActivator extends Activator { classes.add(FineWebApplicationInitializer.class); context.addServletContainerInitializer(initializer, classes); } + + private void addFilter(Context context){ + FilterDef filterDef = new FilterDef(); + filterDef.setFilterName("Forbidden"); + filterDef.setFilterClass("com.fr.start.server.ForbidType"); + + FilterMap filterMap = new FilterMap(); + filterMap.setFilterName("Forbidden"); + //指定过滤文件类型 + filterMap.addURLPattern("*.txt"); + filterMap.addURLPattern("*.xml"); + filterMap.addURLPattern("*.jar"); + + context.addFilterDef(filterDef); + context.addFilterMap(filterMap); + } private void addDefaultServlet(Context context) { diff --git a/designer-base/src/main/java/com/fr/start/server/ForbidType.java b/designer-base/src/main/java/com/fr/start/server/ForbidType.java new file mode 100644 index 000000000..4dac8a69f --- /dev/null +++ b/designer-base/src/main/java/com/fr/start/server/ForbidType.java @@ -0,0 +1,29 @@ +package com.fr.start.server; + +import javax.servlet.*; +import java.io.IOException; +import javax.servlet.http.HttpServletResponse; + +public class ForbidType implements Filter { + private String message; + + public void init(FilterConfig config) throws ServletException { + message = config.getInitParameter("msg"); + + System.out.println("Filter is ready."); + } + + @Override + public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain filterChain) throws IOException, ServletException { + System.out.println(message); + + HttpServletResponse response = (HttpServletResponse) servletResponse; + + response.sendRedirect("/webroot/decision"); + } + + public void destroy() { + + } + +} \ No newline at end of file From 9ce0acde726951c6b2a9879bd4875bcd03e128db Mon Sep 17 00:00:00 2001 From: "Qinghui.Liu" Date: Thu, 9 Aug 2018 21:18:31 +0800 Subject: [PATCH 02/18] =?UTF-8?q?=E4=BF=AE=E5=A4=8D10.0=E4=B8=AD=E6=97=A7?= =?UTF-8?q?=E4=BB=AA=E8=A1=A8=E7=9B=98=E7=B3=BB=E5=88=97=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=E9=A1=B9=E6=98=BE=E7=A4=BA=E7=BC=BA=E5=A4=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Qinghui.Liu --- .../mainframe/chart/gui/style/series/MeterSeriesPane.java | 2 +- .../mainframe/chart/gui/style/series/UIColorPickerPane.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/MeterSeriesPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/MeterSeriesPane.java index 859c8b556..fba9e90eb 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/MeterSeriesPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/MeterSeriesPane.java @@ -61,7 +61,7 @@ public class MeterSeriesPane extends AbstractPlotSeriesPane { return 120; } protected int getColorgroupMarginLeft () { - return 20; + return 5; } }; } diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/UIColorPickerPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/UIColorPickerPane.java index ef0c57ebb..af308adc8 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/UIColorPickerPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/UIColorPickerPane.java @@ -51,7 +51,7 @@ public class UIColorPickerPane extends BasicPane implements UIObserver { private static final int COLOR_REC_HEIGHT = 40; private static final int COLOR_REC_WIDTH = 30; protected static final int TEXTFIELD_HEIGHT = 20; - protected static final int TEXTFIELD_WIDTH = 140; + protected static final int TEXTFIELD_WIDTH = 130; protected static final int UPCONTROLPANE_WIDTH = 230; private static final int LAYOUR_DET = 6; private static final double VALUE = 100; From 2f42710132cd329f426c048250def14cfdb6b2a5 Mon Sep 17 00:00:00 2001 From: Jinbokai Date: Fri, 10 Aug 2018 11:22:37 +0800 Subject: [PATCH 03/18] =?UTF-8?q?designer-realize=E4=B8=ADi18nTextArray()?= =?UTF-8?q?=E6=9B=BF=E6=8D=A2=E4=B8=BAi18nText()=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jinbokai --- .../actions/cell/CleanAuthorityAction.java | 3 +- .../columnrow/ResetColumnHideAction.java | 3 +- .../actions/columnrow/ResetRowHideAction.java | 3 +- .../edit/EditFloatElementNameAction.java | 6 +- .../fr/design/condition/HyperlinkPane.java | 12 +- .../condition/PresentHighlightPane.java | 3 +- .../design/condition/WidgetHighlightPane.java | 3 +- .../dscolumn/SpecifiedGroupAttrPane.java | 456 +++++++++--------- .../design/javascript/ListenerEditPane.java | 3 +- .../mainframe/AuthorityEditToolBarPane.java | 11 +- .../mainframe/AuthoritySheetEditedPane.java | 3 +- .../mainframe/AuthorityToolBarPane.java | 18 +- .../fr/design/mainframe/ElementCasePane.java | 3 +- .../fr/design/mainframe/ReportComponent.java | 3 +- .../mainframe/cell/CellElementEditPane.java | 3 +- .../mainframe/cell/QuickEditorRegion.java | 3 +- .../settingpane/style/CustomStylePane.java | 3 +- .../style/PredefinedStylePane.java | 3 +- .../form/FormElementCaseDesigner.java | 3 +- .../parameter/ParameterDefinitePane.java | 3 +- .../com/fr/design/present/BarCodePane.java | 3 +- .../com/fr/design/report/ExcelExportPane.java | 9 +- .../com/fr/design/report/LayerReportPane.java | 6 +- .../com/fr/design/report/PDFExportPane.java | 3 +- .../com/fr/design/report/SubReportPane.java | 13 +- .../fr/design/report/VerifierListPane.java | 2 +- .../design/report/freeze/FreezePagePane.java | 3 +- .../report/freeze/FreezeWriteColPane.java | 6 +- .../report/freeze/FreezeWriteRowPane.java | 6 +- .../freeze/RepeatAndFreezeSettingPane.java | 15 +- .../fr/design/webattr/DragToolBarPane.java | 3 +- .../com/fr/design/webattr/EditToolBar.java | 27 +- .../webattr/ReportWebWidgetConstants.java | 3 +- .../fr/design/webattr/ToolBarDragPane.java | 3 +- .../fr/design/webattr/WriteToolBarPane.java | 3 +- .../design/webattr/WriteWebSettingPane.java | 3 +- .../com/fr/design/widget/ValueWidgetPane.java | 3 +- .../java/com/fr/design/widget/WidgetPane.java | 3 +- .../widget/ui/CheckBoxGroupDefinePane.java | 3 +- .../widget/ui/ParameterTreeComboBox.java | 3 +- .../ui/btn/DefineAppendColumnRowPane.java | 3 +- .../ui/btn/DefineDeleteColumnRowPane.java | 3 +- .../submit/SmartInsertDBManipulationPane.java | 6 +- .../com/fr/grid/selection/FloatSelection.java | 8 +- 44 files changed, 382 insertions(+), 306 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 19e7b01a6..79157d7a8 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,8 @@ 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.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 bc9d40109..a1b0252f3 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,8 @@ 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.i18nTextArray(new String[]{"MConfig-CancelButton", "Hide"})); + this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Cancel_Hide")); } @Override 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 15940ee64..be6b8f92d 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,8 @@ 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.i18nTextArray(new String[]{"MConfig-CancelButton", "Hide"})); + this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Cancel_Hide")); } @Override 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 b00cae32b..63c91789d 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,8 @@ 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.i18nTextArray(new String[]{"Set", "Float_Element_Name"})); + this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Set_Float_Element_Name")); } @Override @@ -56,7 +57,8 @@ 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.i18nTextArray(new String[]{"Set", "Float_Element_Name"}); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Set_Float_Element_Name"); } public void populate(String 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 7e0717af5..e669a9d71 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,14 +51,16 @@ public class HyperlinkPane extends ConditionAttrSingleConditionPane list = new ArrayList(); - for(int i = 0; i < conditionGroups.length; i++) { - list.add(new NameObject(conditionGroups[i].getDisplay(), conditionGroups[i])); - } - - specifiedControlPane.populate(list.toArray(new NameObject[list.size()])); - } - } else if (grouper instanceof FunctionGrouper - && ((FunctionGrouper)grouper).isCustom()) { - this.specifiedComboBox.setSelectedIndex(1); - cardLayout.show(centerCardPane, "Formula"); - formulaGroupPane.populate(grouper); + this.specifiedComboBox.setSelectedIndex(0); + cardLayout.show(centerCardPane, "Condition"); + CustomGrouper customGrouper = (CustomGrouper) grouper; + boolean force = customGrouper.isForce(); + ConditionGroup[] conditionGroups = customGrouper.getConditionGroups(); + boolean more = customGrouper.isMore(); + int other = customGrouper.getOther(); + String odisplay = customGrouper.getOtherdisplay(); + + this.forceCheckBox.setSelected(force); + + this.moreCheckBox.setSelected(more); + + if (other == CustomGrouper.TOGETHER) { + this.otherComboBox.setSelectedIndex(2); + this.otherTextField.setEnabled(true); + } else if (other == CustomGrouper.DISCARD) { + this.otherComboBox.setSelectedIndex(0); + this.otherTextField.setEnabled(false); + } else { + this.otherComboBox.setSelectedIndex(1); + this.otherTextField.setEnabled(false); + } + + if (odisplay != null) { + this.otherTextField.setText(odisplay); + } + + if (conditionGroups != null) { + java.util.List list = new ArrayList(); + for (int i = 0; i < conditionGroups.length; i++) { + list.add(new NameObject(conditionGroups[i].getDisplay(), conditionGroups[i])); + } + + specifiedControlPane.populate(list.toArray(new NameObject[list.size()])); + } + } else if (grouper instanceof FunctionGrouper + && ((FunctionGrouper) grouper).isCustom()) { + this.specifiedComboBox.setSelectedIndex(1); + cardLayout.show(centerCardPane, "Formula"); + formulaGroupPane.populate(grouper); } - + if (otherComboBox.getSelectedIndex() == 2) { otherTextField.setEnabled(true); } else { @@ -223,52 +225,53 @@ public class SpecifiedGroupAttrPane extends BasicPane { } public RecordGrouper update(CellElement cellElement, RecordGrouper recordGrouper) { - if (this.specifiedComboBox.getSelectedIndex() == 0) { - CustomGrouper customGroup = new CustomGrouper(); - + if (this.specifiedComboBox.getSelectedIndex() == 0) { + CustomGrouper customGroup = new CustomGrouper(); + if (forceCheckBox.isSelected()) { - customGroup.setForce(true); + customGroup.setForce(true); } - + if (!moreCheckBox.isSelected()) { - customGroup.setMore(false); + customGroup.setMore(false); } - + if (otherComboBox.getSelectedIndex() == 2) { - customGroup.setOther(CustomGrouper.TOGETHER); + customGroup.setOther(CustomGrouper.TOGETHER); } else if (otherComboBox.getSelectedIndex() == 0) { - customGroup.setOther(CustomGrouper.DISCARD); + customGroup.setOther(CustomGrouper.DISCARD); } else { - customGroup.setOther(CustomGrouper.LEAVE); + customGroup.setOther(CustomGrouper.LEAVE); } - + customGroup.setOdisplay(this.otherTextField.getText()); - + // Nameable[]居然不能强转成NameObject[],一定要这么写... - Nameable[] res = specifiedControlPane.update(); - NameObject[] nameObject_array = new NameObject[res.length]; - java.util.Arrays.asList(res).toArray(nameObject_array); - ConditionGroup[] res_array = new ConditionGroup[res.length]; - for (int i = 0; i < res.length; i ++) { - res_array[i] = (ConditionGroup)nameObject_array[i].getObject(); - res_array[i].setDisplay(nameObject_array[i].getName()); - } - - customGroup.setConditionGroups(res_array); - recordGrouper = customGroup; - } else { - recordGrouper = formulaGroupPane.update(); - } - - return recordGrouper; + Nameable[] res = specifiedControlPane.update(); + NameObject[] nameObject_array = new NameObject[res.length]; + java.util.Arrays.asList(res).toArray(nameObject_array); + ConditionGroup[] res_array = new ConditionGroup[res.length]; + for (int i = 0; i < res.length; i++) { + res_array[i] = (ConditionGroup) nameObject_array[i].getObject(); + res_array[i].setDisplay(nameObject_array[i].getName()); + } + + customGroup.setConditionGroups(res_array); + recordGrouper = customGroup; + } else { + recordGrouper = formulaGroupPane.update(); + } + + return recordGrouper; } - + public static class ConditionGroupDetailsPane extends BasicBeanPane { - private ConditionGroup editing; - - private DSColumnLiteConditionPane liteConditionPane; - public ConditionGroupDetailsPane(String[] displayNames) { - //alex:右侧的组内的条件细节 + private ConditionGroup editing; + + private DSColumnLiteConditionPane liteConditionPane; + + public ConditionGroupDetailsPane(String[] displayNames) { + //alex:右侧的组内的条件细节 this.setLayout(FRGUIPaneFactory.createBorderLayout()); this.setBorder(BorderFactory.createEmptyBorder(4, 4, 4, 4)); @@ -277,53 +280,53 @@ public class SpecifiedGroupAttrPane extends BasicPane { if (displayNames != null) { liteConditionPane.populateColumns(displayNames); } - } - - @Override - protected String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("SpecifiedG-Specified_Group"); - } + } @Override - public ConditionGroup updateBean() { - editing.setCondition(liteConditionPane.updateBean()); - - return editing; - } + protected String title4PopupWindow() { + return com.fr.design.i18n.Toolkit.i18nText("SpecifiedG-Specified_Group"); + } @Override - public void populateBean(ConditionGroup ob) { - editing = ob; - liteConditionPane.populateBean(ob.getCondition()); - } + public ConditionGroup updateBean() { + editing.setCondition(liteConditionPane.updateBean()); + + return editing; + } + + @Override + public void populateBean(ConditionGroup ob) { + editing = ob; + liteConditionPane.populateBean(ob.getCondition()); + } } - + private class FormulaGroupPane extends JPanel { - private String[] displayModeNames = {com.fr.design.i18n.Toolkit.i18nText("GROUPING_MODE"), com.fr.design.i18n.Toolkit.i18nText("LIST_MODE"), - com.fr.design.i18n.Toolkit.i18nText("CONTINUUM_MODE")}; - - private String InsertText = " "; - - private UIComboBox modeComboBox; - private UITextField valueField; - private JPanel southPane; - - public FormulaGroupPane() { - this.setBorder(BorderFactory.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("D-Dispaly_Divide_Result_Set_into_Groups"))); - this.setLayout(FRGUIPaneFactory.createM_BorderLayout()); - JPanel contentPane = FRGUIPaneFactory.createNColumnGridInnerContainer_S_Pane(1); - this.add(contentPane, BorderLayout.NORTH); - - JPanel northPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); - northPane.setLayout(FRGUIPaneFactory.createBorderLayout()); - contentPane.add(northPane); - modeComboBox = new UIComboBox(displayModeNames); - - northPane.add(GUICoreUtils.createFlowPane(new JComponent[] { new UILabel(InsertText), new UILabel(com.fr.design.i18n.Toolkit.i18nText("Display_Modes") + ": "), - modeComboBox }, FlowLayout.LEFT), BorderLayout.WEST); - - UILabel label = new UILabel("="); + private String[] displayModeNames = {com.fr.design.i18n.Toolkit.i18nText("GROUPING_MODE"), com.fr.design.i18n.Toolkit.i18nText("LIST_MODE"), + com.fr.design.i18n.Toolkit.i18nText("CONTINUUM_MODE")}; + + private String InsertText = " "; + + private UIComboBox modeComboBox; + private UITextField valueField; + private JPanel southPane; + + public FormulaGroupPane() { + this.setBorder(BorderFactory.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("D-Dispaly_Divide_Result_Set_into_Groups"))); + this.setLayout(FRGUIPaneFactory.createM_BorderLayout()); + JPanel contentPane = FRGUIPaneFactory.createNColumnGridInnerContainer_S_Pane(1); + this.add(contentPane, BorderLayout.NORTH); + + JPanel northPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); + northPane.setLayout(FRGUIPaneFactory.createBorderLayout()); + contentPane.add(northPane); + modeComboBox = new UIComboBox(displayModeNames); + + northPane.add(GUICoreUtils.createFlowPane(new JComponent[]{new UILabel(InsertText), new UILabel(com.fr.design.i18n.Toolkit.i18nText("Display_Modes") + ": "), + modeComboBox}, FlowLayout.LEFT), BorderLayout.WEST); + + UILabel label = new UILabel("="); label.setFont(new Font("Dialog", Font.BOLD, 12)); valueField = new UITextField(16); valueField.setText("$$$"); @@ -333,7 +336,7 @@ public class SpecifiedGroupAttrPane extends BasicPane { formulaButton.setPreferredSize(new Dimension(25, valueField.getPreferredSize().height)); formulaButton.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent evt) { - BaseFormula valueFormula = BaseFormula.createFormulaBuilder().build(); + BaseFormula valueFormula = BaseFormula.createFormulaBuilder().build(); String text = valueField.getText(); if (text == null || text.length() <= 0) { valueFormula.setContent("$$$"); @@ -342,60 +345,61 @@ public class SpecifiedGroupAttrPane extends BasicPane { } final UIFormula formulaPane = FormulaFactory.createFormulaPane(); - - formulaPane.populate(valueFormula, new CustomVariableResolver(displayNames == null? new String[0] : displayNames, true)); - formulaPane.showLargeWindow(SwingUtilities.getWindowAncestor(FormulaGroupPane.this), new DialogActionAdapter(){ - @Override - public void doOk() { - BaseFormula valueFormula = formulaPane.update(); + + formulaPane.populate(valueFormula, new CustomVariableResolver(displayNames == null ? new String[0] : displayNames, true)); + formulaPane.showLargeWindow(SwingUtilities.getWindowAncestor(FormulaGroupPane.this), new DialogActionAdapter() { + @Override + public void doOk() { + BaseFormula valueFormula = formulaPane.update(); if (valueFormula.getContent().length() <= 1) { valueField.setText("$$$"); } else { valueField.setText(valueFormula.getContent().substring(1)); } - } - }).setVisible(true); + } + }).setVisible(true); } }); - - southPane = GUICoreUtils.createFlowPane(new JComponent[] {new UILabel(InsertText), //new UILabel(com.fr.design.i18n.Toolkit.i18nText("I-Message_FunctionGrouper_2")), - new UILabel(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Custom", "Value"}) + ": "), label, valueField, formulaButton}, FlowLayout.LEFT); + + southPane = GUICoreUtils.createFlowPane(new JComponent[]{new UILabel(InsertText), //new UILabel(com.fr.design.i18n.Toolkit.i18nText("I-Message_FunctionGrouper_2")), +// new UILabel(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Custom", "Value"}) + ": "), label, valueField, formulaButton}, FlowLayout.LEFT); + new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Custom_Value") + ": "), label, valueField, formulaButton}, FlowLayout.LEFT); contentPane.add(southPane); - } - - // populate - public void populate(RecordGrouper grouper) { - if (grouper instanceof FunctionGrouper) { - int mode = ((FunctionGrouper)grouper).getDivideMode(); - if (mode == FunctionGrouper.GROUPING_MODE) { - this.modeComboBox.setSelectedIndex(0); - } else if (mode == FunctionGrouper.LIST_MODE) { - this.modeComboBox.setSelectedIndex(1); - } else { - this.modeComboBox.setSelectedIndex(2); - } - String formulaContent = ((FunctionGrouper)grouper).getFormulaContent(); - if(formulaContent == null) { - this.valueField.setText("$$$"); - } else { - this.valueField.setText(formulaContent); - } - } - } - - public RecordGrouper update() { - FunctionGrouper grouper = new FunctionGrouper(); - grouper.setCustom(true); - if (this.modeComboBox.getSelectedIndex() == 0) { - grouper.setDivideMode(FunctionGrouper.GROUPING_MODE); - } else if (this.modeComboBox.getSelectedIndex() == 1) { - grouper.setDivideMode(FunctionGrouper.LIST_MODE); - } else if (this.modeComboBox.getSelectedIndex() == 2) { - grouper.setDivideMode(FunctionGrouper.CONTINUUM_MODE); - } - grouper.setFormulaContent(this.valueField.getText()); - - return grouper; - } + } + + // populate + public void populate(RecordGrouper grouper) { + if (grouper instanceof FunctionGrouper) { + int mode = ((FunctionGrouper) grouper).getDivideMode(); + if (mode == FunctionGrouper.GROUPING_MODE) { + this.modeComboBox.setSelectedIndex(0); + } else if (mode == FunctionGrouper.LIST_MODE) { + this.modeComboBox.setSelectedIndex(1); + } else { + this.modeComboBox.setSelectedIndex(2); + } + String formulaContent = ((FunctionGrouper) grouper).getFormulaContent(); + if (formulaContent == null) { + this.valueField.setText("$$$"); + } else { + this.valueField.setText(formulaContent); + } + } + } + + public RecordGrouper update() { + FunctionGrouper grouper = new FunctionGrouper(); + grouper.setCustom(true); + if (this.modeComboBox.getSelectedIndex() == 0) { + grouper.setDivideMode(FunctionGrouper.GROUPING_MODE); + } else if (this.modeComboBox.getSelectedIndex() == 1) { + grouper.setDivideMode(FunctionGrouper.LIST_MODE); + } else if (this.modeComboBox.getSelectedIndex() == 2) { + grouper.setDivideMode(FunctionGrouper.CONTINUUM_MODE); + } + grouper.setFormulaContent(this.valueField.getText()); + + return grouper; + } } } \ No newline at end of file diff --git a/designer-realize/src/main/java/com/fr/design/javascript/ListenerEditPane.java b/designer-realize/src/main/java/com/fr/design/javascript/ListenerEditPane.java index 08925ba4b..6b8930cff 100644 --- a/designer-realize/src/main/java/com/fr/design/javascript/ListenerEditPane.java +++ b/designer-realize/src/main/java/com/fr/design/javascript/ListenerEditPane.java @@ -45,7 +45,8 @@ public class ListenerEditPane extends BasicBeanPane { 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("FR-Designer_JavaScript_Form_Submit"); private static final String DBCOMMIT = com.fr.design.i18n.Toolkit.i18nText("FR-Designer_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.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"); private Listener listener; 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 35c67af1d..6dbb8fc59 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,8 +40,8 @@ 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.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() { return new Dimension(super.getPreferredSize().width, TITLE_HEIGHT); @@ -148,12 +148,12 @@ public class AuthorityEditToolBarPane extends AuthorityPropertyPane { type = new UILabel(); typePane = new JPanel(new BorderLayout()); typePane.add(type, BorderLayout.CENTER); - type.setBorder(BorderFactory.createEmptyBorder(0,LEFT_GAP,0,0)); + type.setBorder(BorderFactory.createEmptyBorder(0, LEFT_GAP, 0, 0)); typePane.setBorder(BorderFactory.createLineBorder(Color.lightGray)); name = new UILabel(); namePane = new JPanel(new BorderLayout()); namePane.add(name, BorderLayout.CENTER); - name.setBorder(BorderFactory.createEmptyBorder(0,LEFT_GAP,0,0)); + name.setBorder(BorderFactory.createEmptyBorder(0, LEFT_GAP, 0, 0)); namePane.setBorder(BorderFactory.createLineBorder(Color.lightGray)); checkPane = new JPanel(); checkPane.setLayout(new BorderLayout()); @@ -208,7 +208,8 @@ 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.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 b56cf1bcd..5918adade 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,8 @@ 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.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() { return new Dimension(super.getPreferredSize().width, TITLE_HEIGHT); 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 539a1e45c..a371fa7cd 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 @@ -45,7 +45,10 @@ 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.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); } @@ -271,14 +275,16 @@ 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.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 ea74cc7b3..b3fdc37ff 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,8 @@ 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.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 3f889ff42..41b1c08c8 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,8 @@ 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.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 6578caf00..76de62961 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,8 @@ 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.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 a813a2f7f..7f3cfd562 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 @@ -53,7 +53,8 @@ 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.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); passwordWritePane.add(passwordField); @@ -71,9 +72,11 @@ 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.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.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); protectedWordPane.add(protectedWord); 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 60b0a3b4d..2a0dd6f31 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,8 @@ 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.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); outlayerReportPane.add(layerReportPane); @@ -113,7 +114,8 @@ 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.i18nTextArray(new String[]{"Report_Engine", "Attribute"}); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Report_Engine_Attribute"); } @Override 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 bb1db256b..bec9c016b 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,8 @@ 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.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); passwordWritePane.add(passwordField); 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 d684f6f84..f81c857ce 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,8 @@ 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.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); pathTextField.setEditable(false); @@ -79,8 +80,9 @@ 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)); - JPanel kcPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); +// 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); extend = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Hyperlink-Extends_Report_Parameters")); kcPane.add(extend, BorderLayout.SOUTH); @@ -94,8 +96,9 @@ 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.i18nTextArray(new String[]{"Insert", "Sub_Report"}); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Insert_Sub_Report"); + } public void populate(ElementCase report, CellElement cellElment) { Object cellValue = cellElment.getValue(); 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 25a025a26..c95823199 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 @@ -1 +1 @@ -package com.fr.design.report; import com.fr.data.Verifier; import com.fr.design.ExtraDesignClassManager; import com.fr.design.fun.VerifyDefineProvider; import com.fr.design.gui.controlpane.NameObjectCreator; import com.fr.design.gui.controlpane.NameableCreator; import com.fr.design.gui.controlpane.ObjectJControlPane; import com.fr.design.mainframe.ElementCasePane; import com.fr.general.NameObject; import com.fr.report.write.ReportWriteAttr; import com.fr.report.write.ValueVerifier; import com.fr.report.write.WClassVerifier; import com.fr.stable.ArrayUtils; import com.fr.stable.Nameable; import java.util.ArrayList; import java.util.Set; /** * 校验列表 */ public class VerifierListPane extends ObjectJControlPane { public VerifierListPane(ElementCasePane ePane) { super(ePane); } /** * 创建选项 * * @return 选项 */ public NameableCreator[] createNameableCreators() { NameableCreator[] creators = new NameableCreator[]{ new NameObjectCreator(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"BuildIn", "Verify"}), "/com/fr/web/images/reportlet.png", ValueVerifier.class, BuildInVerifierPane.class) }; Set set = ExtraDesignClassManager.getInstance().getArray(VerifyDefineProvider.MARK_STRING); for (VerifyDefineProvider provider : set) { creators = ArrayUtils.add(creators, new NameObjectCreator( provider.nameForVerifier(), provider.iconPath(), provider.classForVerifier(), provider.appearanceForVerifier() ) { }); } creators = ArrayUtils.add(creators, new NameObjectCreator( com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Custom", "Verify"}), "/com/fr/web/images/reportlet.png", WClassVerifier.class, CustomVerifierPane.class)); return creators; } @Override protected String title4PopupWindow() { return "Verify Collections"; } public void populate(ReportWriteAttr reportWriteAttr) { if (reportWriteAttr == null) { return; } java.util.List nameObjectList = new ArrayList<>(); int verifierCount = reportWriteAttr.getVerifierCount(); for (int i = 0; i < verifierCount; i++) { Verifier verifier = reportWriteAttr.getVerifier(i); nameObjectList.add(new NameObject(verifier.getName(), verifier)); } this.populate(nameObjectList.toArray(new NameObject[nameObjectList.size()])); } public void updateReportWriteAttr(ReportWriteAttr reportWriteAttr) { // Nameable[]居然不能强转成NameObject[],一定要这么写... Nameable[] res = this.update(); NameObject[] res_array = new NameObject[res.length]; java.util.Arrays.asList(res).toArray(res_array); reportWriteAttr.clearVerifiers(); for (int i = 0; i < res_array.length; i++) { NameObject nameObject = res_array[i]; if (nameObject.getObject() instanceof Verifier) { Verifier verifier = (Verifier) nameObject.getObject(); verifier.setName(nameObject.getName()); reportWriteAttr.addVerifier(verifier); } } } } \ No newline at end of file +package com.fr.design.report; import com.fr.data.Verifier; import com.fr.design.ExtraDesignClassManager; import com.fr.design.fun.VerifyDefineProvider; import com.fr.design.gui.controlpane.NameObjectCreator; import com.fr.design.gui.controlpane.NameableCreator; import com.fr.design.gui.controlpane.ObjectJControlPane; import com.fr.design.mainframe.ElementCasePane; import com.fr.general.NameObject; import com.fr.report.write.ReportWriteAttr; import com.fr.report.write.ValueVerifier; import com.fr.report.write.WClassVerifier; import com.fr.stable.ArrayUtils; import com.fr.stable.Nameable; import java.util.ArrayList; import java.util.Set; /** * 校验列表 */ public class VerifierListPane extends ObjectJControlPane { public VerifierListPane(ElementCasePane ePane) { super(ePane); } /** * 创建选项 * * @return 选项 */ 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, BuildInVerifierPane.class) }; Set set = ExtraDesignClassManager.getInstance().getArray(VerifyDefineProvider.MARK_STRING); for (VerifyDefineProvider provider : set) { creators = ArrayUtils.add(creators, new NameObjectCreator( provider.nameForVerifier(), provider.iconPath(), provider.classForVerifier(), provider.appearanceForVerifier() ) { }); } 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, CustomVerifierPane.class)); return creators; } @Override protected String title4PopupWindow() { return "Verify Collections"; } public void populate(ReportWriteAttr reportWriteAttr) { if (reportWriteAttr == null) { return; } java.util.List nameObjectList = new ArrayList<>(); int verifierCount = reportWriteAttr.getVerifierCount(); for (int i = 0; i < verifierCount; i++) { Verifier verifier = reportWriteAttr.getVerifier(i); nameObjectList.add(new NameObject(verifier.getName(), verifier)); } this.populate(nameObjectList.toArray(new NameObject[nameObjectList.size()])); } public void updateReportWriteAttr(ReportWriteAttr reportWriteAttr) { // Nameable[]居然不能强转成NameObject[],一定要这么写... Nameable[] res = this.update(); NameObject[] res_array = new NameObject[res.length]; java.util.Arrays.asList(res).toArray(res_array); reportWriteAttr.clearVerifiers(); for (int i = 0; i < res_array.length; i++) { NameObject nameObject = res_array[i]; if (nameObject.getObject() instanceof Verifier) { Verifier verifier = (Verifier) nameObject.getObject(); verifier.setName(nameObject.getName()); reportWriteAttr.addVerifier(verifier); } } } } \ No newline at end of file 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 8902a9820..b9115c887 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,8 @@ 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.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 f41f41e1b..db635c6a1 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,8 @@ 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.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(); this.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Column"))); @@ -25,7 +26,8 @@ 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.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 fa8e2e680..b5758b128 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,8 @@ 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.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(); this.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Row"))); @@ -22,7 +23,8 @@ 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.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 1ba0fd930..b389eb6e5 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,8 @@ 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.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); @@ -81,7 +82,8 @@ 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.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(); soverlapColStartPane.add(repeatTitleColPane); @@ -97,7 +99,8 @@ 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.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); @@ -112,7 +115,8 @@ 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.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); @@ -175,7 +179,8 @@ 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.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); writePanel.add(writeLabelPanel, BorderLayout.NORTH); 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 19b0ebe0b..35294c5db 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 @@ -138,7 +138,8 @@ 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.i18nTextArray(new String[]{"ReportServerP-Toolbar", "Set"}); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Set_Toolbar"); } ListCellRenderer optionRenderer = new DefaultListCellRenderer() { 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 247d5b197..6b8db7450 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,12 +152,15 @@ 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"})); - defaultCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Default", "Background"})); +// 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.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); } @@ -380,13 +383,15 @@ 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.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.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(); centerPane = FRGUIPaneFactory.createCardLayout_S_Pane(); @@ -442,14 +447,16 @@ 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.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; } 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.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); cpane.add(count); @@ -460,10 +467,12 @@ 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.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.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); submitPane.add(isCurSheet); 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 c1ae8da70..267844582 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,8 @@ 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.i18nTextArray(new String[]{"Custom", "Form-Button"}), CustomToolBarButton.class); + .createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Custom_Form_Button"), CustomToolBarButton.class); // 输出离线html报表 public static final WidgetOption WRITEOFFLINEHTML = WidgetOptionFactory 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 debadcfab..fa872b924 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,8 @@ 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.i18nTextArray(new String[]{"ReportServerP-Toolbar", "Set"}); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Set_Toolbar"); } public void setCheckBoxSelected(boolean b) { 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 1a6b3d454..e9f562a14 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,8 @@ 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.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); colorButton = new UIColorButton(BaseUtils.readIcon("/com/fr/design/images/gui/color/background.png")); diff --git a/designer-realize/src/main/java/com/fr/design/webattr/WriteWebSettingPane.java b/designer-realize/src/main/java/com/fr/design/webattr/WriteWebSettingPane.java index 765d526be..d37d530bb 100644 --- a/designer-realize/src/main/java/com/fr/design/webattr/WriteWebSettingPane.java +++ b/designer-realize/src/main/java/com/fr/design/webattr/WriteWebSettingPane.java @@ -76,7 +76,8 @@ public class WriteWebSettingPane extends WebSettingPane { unloadCheck = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Unload_Check")); unloadCheck.setSelected(true); - showWidgets = new UICheckBox(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"FR-Engine_Event_showWidgets"})); +// showWidgets = new UICheckBox(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"FR-Engine_Event_showWidgets"})); + showWidgets = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Event_Show_Widgets")); showWidgets.setSelected(false); isAutoStash = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Write_Auto_Stash")); isAutoStash.setSelected(false); 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 8006c818a..8fe72c095 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,8 @@ 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.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(); widgetValuePane.setLayout(FRGUIPaneFactory.createBorderLayout()); 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 01a8ee9d9..7fd3d95e0 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,8 @@ 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.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); return jPanel; 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 fb6f2442d..8d76a4913 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,8 @@ public class CheckBoxGroupDefinePane extends FieldEditorDefinePane Date: Fri, 10 Aug 2018 12:46:19 +0800 Subject: [PATCH 04/18] ForbidType.java edited online with Bitbucket --- .../java/com/fr/start/server/ForbidType.java | 28 ------------------- 1 file changed, 28 deletions(-) diff --git a/designer-base/src/main/java/com/fr/start/server/ForbidType.java b/designer-base/src/main/java/com/fr/start/server/ForbidType.java index 4dac8a69f..8b1378917 100644 --- a/designer-base/src/main/java/com/fr/start/server/ForbidType.java +++ b/designer-base/src/main/java/com/fr/start/server/ForbidType.java @@ -1,29 +1 @@ -package com.fr.start.server; -import javax.servlet.*; -import java.io.IOException; -import javax.servlet.http.HttpServletResponse; - -public class ForbidType implements Filter { - private String message; - - public void init(FilterConfig config) throws ServletException { - message = config.getInitParameter("msg"); - - System.out.println("Filter is ready."); - } - - @Override - public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain filterChain) throws IOException, ServletException { - System.out.println(message); - - HttpServletResponse response = (HttpServletResponse) servletResponse; - - response.sendRedirect("/webroot/decision"); - } - - public void destroy() { - - } - -} \ No newline at end of file From 6d32858b9095b5abae2d72d2c5c89c8bb8215550 Mon Sep 17 00:00:00 2001 From: Jinbokai Date: Fri, 10 Aug 2018 12:48:25 +0800 Subject: [PATCH 05/18] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=97=A0=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/fr/start/server/ForbidType.java | 29 ------------------- 1 file changed, 29 deletions(-) delete mode 100644 designer-base/src/main/java/com/fr/start/server/ForbidType.java diff --git a/designer-base/src/main/java/com/fr/start/server/ForbidType.java b/designer-base/src/main/java/com/fr/start/server/ForbidType.java deleted file mode 100644 index 4dac8a69f..000000000 --- a/designer-base/src/main/java/com/fr/start/server/ForbidType.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.fr.start.server; - -import javax.servlet.*; -import java.io.IOException; -import javax.servlet.http.HttpServletResponse; - -public class ForbidType implements Filter { - private String message; - - public void init(FilterConfig config) throws ServletException { - message = config.getInitParameter("msg"); - - System.out.println("Filter is ready."); - } - - @Override - public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain filterChain) throws IOException, ServletException { - System.out.println(message); - - HttpServletResponse response = (HttpServletResponse) servletResponse; - - response.sendRedirect("/webroot/decision"); - } - - public void destroy() { - - } - -} \ No newline at end of file From d9e4f33212fe44e0641190c64884473189c0483c Mon Sep 17 00:00:00 2001 From: Jinbokai Date: Fri, 10 Aug 2018 13:01:58 +0800 Subject: [PATCH 06/18] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=BF=87=E6=BB=A4?= =?UTF-8?q?=E5=99=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jinbokai 文件过滤注册 Signed-off-by: Jinbokai --- designer-base/src/main/java/com/fr/start/server/ForbidType.java | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 designer-base/src/main/java/com/fr/start/server/ForbidType.java diff --git a/designer-base/src/main/java/com/fr/start/server/ForbidType.java b/designer-base/src/main/java/com/fr/start/server/ForbidType.java deleted file mode 100644 index e69de29bb..000000000 From 33b1f6a02dc7c08ec19da1f7fd02c173c597aebe Mon Sep 17 00:00:00 2001 From: Jinbokai Date: Fri, 10 Aug 2018 13:48:20 +0800 Subject: [PATCH 07/18] =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E5=8C=96=20Signed-off-?= =?UTF-8?q?by:=20Jinbokai=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jinbokai --- .../java/com/fr/design/report/ExcelExportPane.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) 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 234babc6e..c6e81c3b3 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 @@ -21,7 +21,7 @@ public class ExcelExportPane extends BasicPane { private UITextField passwordField; private UICheckBox protectedWord; private UITextField protectedField; - + private JPanel passwordWritePane; private JPanel wordPane; @@ -44,7 +44,7 @@ public class ExcelExportPane extends BasicPane { isExportHidenColumn = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_ReportD_Export_Hided_Column")); isExportHidenColumn.setSelected(false); rowAndColumnPane.add(isExportHidenColumn); - + JPanel passwordPane =FRGUIPaneFactory.createNormalFlowInnerContainer_M_Pane(); isNeedPassword = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_IS_Need_Password"), false); passwordPane.add(isNeedPassword); @@ -67,14 +67,14 @@ 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"))); + wordPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Sheet_Password") + ":")); protectedField = new UITextField(11); wordPane.add(protectedField); protectedWordPane.add(protectedWord); @@ -92,7 +92,7 @@ public class ExcelExportPane extends BasicPane { }); } - + @Override protected String title4PopupWindow() { return "ExcelExport"; @@ -125,7 +125,7 @@ public class ExcelExportPane extends BasicPane { public ExcelExportAttr update() { ExcelExportAttr excelExportAttr = new ExcelExportAttr(); - + excelExportAttr.setExportHidedColumn(isExportHidenColumn.isSelected()); excelExportAttr.setExportHidedRow(isExportHidedRow.isSelected()); if (!isNeedPassword.isSelected()) { From fce857fd1d27da60484519fcbf091586e4b1dc91 Mon Sep 17 00:00:00 2001 From: Jinbokai Date: Fri, 10 Aug 2018 13:49:20 +0800 Subject: [PATCH 08/18] =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E5=8C=96=20Signed-off-?= =?UTF-8?q?by:=20Jinbokai=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jinbokai --- .../src/main/java/com/fr/design/report/ExcelExportPane.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 c6e81c3b3..3d2f5ef6c 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 @@ -52,7 +52,7 @@ public class ExcelExportPane extends BasicPane { 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")); + UILabel passwordLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_File_Password") + ":"); passwordWritePane.add(passwordLabel); passwordField = new UITextField(11); passwordWritePane.add(passwordField); From c085d77d45b7b23605b01ed85b99050f0e494c8e Mon Sep 17 00:00:00 2001 From: Jinbokai Date: Fri, 10 Aug 2018 14:01:28 +0800 Subject: [PATCH 09/18] =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E5=8C=96=20Signed-off-?= =?UTF-8?q?by:=20Jinbokai=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jinbokai --- .../fr/design/report/VerifierListPane.java | 103 +++++++++++++++++- 1 file changed, 102 insertions(+), 1 deletion(-) 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 c95823199..a122ad02e 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 @@ -1 +1,102 @@ -package com.fr.design.report; import com.fr.data.Verifier; import com.fr.design.ExtraDesignClassManager; import com.fr.design.fun.VerifyDefineProvider; import com.fr.design.gui.controlpane.NameObjectCreator; import com.fr.design.gui.controlpane.NameableCreator; import com.fr.design.gui.controlpane.ObjectJControlPane; import com.fr.design.mainframe.ElementCasePane; import com.fr.general.NameObject; import com.fr.report.write.ReportWriteAttr; import com.fr.report.write.ValueVerifier; import com.fr.report.write.WClassVerifier; import com.fr.stable.ArrayUtils; import com.fr.stable.Nameable; import java.util.ArrayList; import java.util.Set; /** * 校验列表 */ public class VerifierListPane extends ObjectJControlPane { public VerifierListPane(ElementCasePane ePane) { super(ePane); } /** * 创建选项 * * @return 选项 */ 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, BuildInVerifierPane.class) }; Set set = ExtraDesignClassManager.getInstance().getArray(VerifyDefineProvider.MARK_STRING); for (VerifyDefineProvider provider : set) { creators = ArrayUtils.add(creators, new NameObjectCreator( provider.nameForVerifier(), provider.iconPath(), provider.classForVerifier(), provider.appearanceForVerifier() ) { }); } 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, CustomVerifierPane.class)); return creators; } @Override protected String title4PopupWindow() { return "Verify Collections"; } public void populate(ReportWriteAttr reportWriteAttr) { if (reportWriteAttr == null) { return; } java.util.List nameObjectList = new ArrayList<>(); int verifierCount = reportWriteAttr.getVerifierCount(); for (int i = 0; i < verifierCount; i++) { Verifier verifier = reportWriteAttr.getVerifier(i); nameObjectList.add(new NameObject(verifier.getName(), verifier)); } this.populate(nameObjectList.toArray(new NameObject[nameObjectList.size()])); } public void updateReportWriteAttr(ReportWriteAttr reportWriteAttr) { // Nameable[]居然不能强转成NameObject[],一定要这么写... Nameable[] res = this.update(); NameObject[] res_array = new NameObject[res.length]; java.util.Arrays.asList(res).toArray(res_array); reportWriteAttr.clearVerifiers(); for (int i = 0; i < res_array.length; i++) { NameObject nameObject = res_array[i]; if (nameObject.getObject() instanceof Verifier) { Verifier verifier = (Verifier) nameObject.getObject(); verifier.setName(nameObject.getName()); reportWriteAttr.addVerifier(verifier); } } } } \ No newline at end of file +package com.fr.design.report; + +import com.fr.data.Verifier; +import com.fr.design.ExtraDesignClassManager; +import com.fr.design.fun.VerifyDefineProvider; +import com.fr.design.gui.controlpane.NameObjectCreator; +import com.fr.design.gui.controlpane.NameableCreator; +import com.fr.design.gui.controlpane.ObjectJControlPane; +import com.fr.design.mainframe.ElementCasePane; + +import com.fr.general.NameObject; +import com.fr.report.write.ReportWriteAttr; +import com.fr.report.write.ValueVerifier; +import com.fr.report.write.WClassVerifier; +import com.fr.stable.ArrayUtils; +import com.fr.stable.Nameable; + +import java.util.ArrayList; +import java.util.Set; + +/** + * 校验列表 + */ +public class VerifierListPane extends ObjectJControlPane { + + public VerifierListPane(ElementCasePane ePane) { + super(ePane); + } + + /** + * 创建选项 + * + * @return 选项 + */ + 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, + BuildInVerifierPane.class) + }; + Set set = ExtraDesignClassManager.getInstance().getArray(VerifyDefineProvider.MARK_STRING); + for (VerifyDefineProvider provider : set) { + creators = ArrayUtils.add(creators, new NameObjectCreator( + provider.nameForVerifier(), + provider.iconPath(), + provider.classForVerifier(), + provider.appearanceForVerifier() + ) { + }); + } + 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, + CustomVerifierPane.class)); + return creators; + } + + @Override + protected String title4PopupWindow() { + return "Verify Collections"; + } + + public void populate(ReportWriteAttr reportWriteAttr) { + if (reportWriteAttr == null) { + return; + } + + java.util.List nameObjectList = new ArrayList<>(); + + int verifierCount = reportWriteAttr.getVerifierCount(); + for (int i = 0; i < verifierCount; i++) { + Verifier verifier = reportWriteAttr.getVerifier(i); + nameObjectList.add(new NameObject(verifier.getName(), verifier)); + } + + this.populate(nameObjectList.toArray(new NameObject[nameObjectList.size()])); + } + + public void updateReportWriteAttr(ReportWriteAttr reportWriteAttr) { + // Nameable[]居然不能强转成NameObject[],一定要这么写... + Nameable[] res = this.update(); + NameObject[] res_array = new NameObject[res.length]; + java.util.Arrays.asList(res).toArray(res_array); + + reportWriteAttr.clearVerifiers(); + + for (int i = 0; i < res_array.length; i++) { + NameObject nameObject = res_array[i]; + if (nameObject.getObject() instanceof Verifier) { + Verifier verifier = (Verifier) nameObject.getObject(); + verifier.setName(nameObject.getName()); + reportWriteAttr.addVerifier(verifier); + } + } + } + + +} \ No newline at end of file From c61e82c9e5efe4e8d4a6d7eedb1f0378dbc41aed Mon Sep 17 00:00:00 2001 From: "alex.sung" Date: Fri, 10 Aug 2018 14:05:11 +0800 Subject: [PATCH 10/18] =?UTF-8?q?=E8=A7=84=E8=8C=83=E5=9B=BD=E9=99=85?= =?UTF-8?q?=E5=8C=96=E6=96=87=E4=BB=B6=E5=8F=8A=E5=9B=BD=E9=99=85=E5=8C=96?= =?UTF-8?q?=E5=AE=9A=E4=B9=89=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../datapane/TableDataNameObjectCreator.java | 2 +- .../data/datapane/TableDataSourceOP.java | 2 +- .../connect/DatabaseConnectionPane.java | 6 +++--- .../tabledatapane/DBTableDataPane.java | 2 +- .../tabledatapane/FileTableDataPane.java | 2 +- .../fr/design/gui/date/UICalendarPanel.java | 2 +- .../com/fr/design/style/AlignmentPane.java | 2 +- .../main/java/com/fr/env/RemoteEnvPane.java | 4 ++-- .../chart/javascript/ChartEmailPane.java | 8 ++++---- .../design/chart/report/GisMapDataPane.java | 2 +- .../fr/design/chart/report/MapSinglePane.java | 2 +- .../chart/report/MapTableCubeDataPane.java | 2 +- .../mainframe/MiddleChartPropertyPane.java | 2 +- .../mainframe/chart/PaneTitleConstants.java | 6 +++--- .../chart/gui/data/CalculateComboBox.java | 6 +++--- .../BubblePlotReportDataContentPane.java | 2 +- .../style/ChartAxisTitleNoFormulaPane.java | 2 +- .../chart/gui/style/ChartAxisTitlePane.java | 2 +- .../chart/gui/style/ChartBorderPane.java | 2 +- .../chart/gui/style/DateAxisValuePane.java | 2 +- .../style/datalabel/ChartDataLabelPane.java | 2 +- .../gui/style/series/BubbleSeriesPane.java | 2 +- .../gui/style/series/StockSeriesPane.java | 2 +- .../chart/gui/style/title/ChartTitlePane.java | 2 +- .../style/title/ChartTitlePaneNoFormula.java | 2 +- .../designer/style/VanChartTitlePane.java | 2 +- .../beans/actions/ConnectionAction.java | 2 +- .../beans/painters/AbstractPainter.java | 2 +- .../designer/creator/XCheckBoxGroup.java | 2 +- .../design/designer/creator/XRadioGroup.java | 2 +- .../properties/FRBorderLayoutConstraints.java | 2 +- .../items/FRBorderConstraintsItems.java | 10 +++++----- .../design/form/javascript/FormEmailPane.java | 4 ++-- .../design/mainframe/WidgetToolBarPane.java | 2 +- .../widget/accessibles/ColorPalette.java | 2 +- .../editors/BorderLayoutDirectionEditor.java | 8 ++++---- .../ui/designer/ButtonGroupDictPane.java | 2 +- .../actions/cell/CellExpandAttrAction.java | 2 +- .../actions/cell/UIToolbarBorderButton.java | 4 ++-- .../actions/columnrow/CancelColumnAction.java | 2 +- .../actions/columnrow/CancelRowAction.java | 2 +- .../export/AbstractExcelExportAction.java | 2 +- .../actions/file/export/CSVExportAction.java | 2 +- .../export/PageToSheetExcelExportAction.java | 2 +- .../actions/file/export/SVGExportAction.java | 2 +- .../actions/file/export/TextExportAction.java | 2 +- .../utils/DeprecatedActionManager.java | 2 +- .../com/fr/design/condition/PagePane.java | 8 ++++---- .../design/dscolumn/DSColumnAdvancedPane.java | 20 +++++++++---------- .../fr/design/dscolumn/DSColumnBasicPane.java | 4 ++-- .../dscolumn/DSColumnConditionsPane.java | 2 +- .../com/fr/design/dscolumn/DSColumnPane.java | 2 +- .../dscolumn/ResultSetGroupDockingPane.java | 4 ++-- .../dscolumn/SpecifiedGroupAttrPane.java | 4 ++-- .../fr/design/expand/ExpandDirectionPane.java | 2 +- .../mainframe/CellElementPropertyPane.java | 2 +- .../fr/design/mainframe/SheetNameTabPane.java | 4 ++-- .../com/fr/design/mainframe/app/CptApp.java | 2 +- .../cell/settingpane/CellExpandAttrPane.java | 8 ++++---- .../com/fr/design/present/BarCodePane.java | 2 +- .../fr/design/present/CurrencyLinePane.java | 2 +- .../com/fr/design/report/LayerReportPane.java | 4 ++-- .../com/fr/design/report/RowColumnPane.java | 4 ++-- .../com/fr/design/report/SubReportPane.java | 2 +- .../com/fr/design/report/WordExportPane.java | 2 +- .../fr/design/webattr/ErrorTemplatePane.java | 2 +- .../java/com/fr/design/webattr/EventPane.java | 4 ++-- .../com/fr/design/webattr/SettingToolBar.java | 2 +- .../com/fr/design/webattr/WebCssPane.java | 4 ++-- .../java/com/fr/design/webattr/WebJsPane.java | 6 +++--- .../design/widget/ui/ButtonGroupDictPane.java | 2 +- .../ui/btn/DefineAppendColumnRowPane.java | 4 ++-- .../ui/btn/DefineDeleteColumnRowPane.java | 2 +- .../com/fr/grid/selection/CellSelection.java | 2 +- .../cellquick/CellDSColumnEditor.java | 12 +++++------ .../start/CollectUserInformationDialog.java | 2 +- 76 files changed, 126 insertions(+), 126 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/TableDataNameObjectCreator.java b/designer-base/src/main/java/com/fr/design/data/datapane/TableDataNameObjectCreator.java index 2b18c3e78..1ec28a97c 100644 --- a/designer-base/src/main/java/com/fr/design/data/datapane/TableDataNameObjectCreator.java +++ b/designer-base/src/main/java/com/fr/design/data/datapane/TableDataNameObjectCreator.java @@ -113,7 +113,7 @@ public class TableDataNameObjectCreator extends NameObjectCreator { * @return 提示 */ public String createTooltip() { - return b ? com.fr.design.i18n.Toolkit.i18nText("Connect_SQL_Cannot_Null") : null; + return b ? com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Connect_SQL_Cannot_Null") : null; } public String getPrefix() { diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/TableDataSourceOP.java b/designer-base/src/main/java/com/fr/design/data/datapane/TableDataSourceOP.java index f6dcbaa52..33a065df1 100644 --- a/designer-base/src/main/java/com/fr/design/data/datapane/TableDataSourceOP.java +++ b/designer-base/src/main/java/com/fr/design/data/datapane/TableDataSourceOP.java @@ -100,7 +100,7 @@ public class TableDataSourceOP implements UserObjectOP { } private ExpandMutableTreeNode initTemplateDataNode(Map templateDataMap) { - ExpandMutableTreeNode templateNode = new ExpandMutableTreeNode(new NameObject(com.fr.design.i18n.Toolkit.i18nText("DS-TableData"), TEMPLATE_TABLE_DATA), true); + ExpandMutableTreeNode templateNode = new ExpandMutableTreeNode(new NameObject(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_DS_TableData"), TEMPLATE_TABLE_DATA), true); templateNode.addChildTreeNodes(getNodeArrayFromMap(templateDataMap)); return templateNode; } diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/connect/DatabaseConnectionPane.java b/designer-base/src/main/java/com/fr/design/data/datapane/connect/DatabaseConnectionPane.java index 5cf887bdd..00b5eecf3 100644 --- a/designer-base/src/main/java/com/fr/design/data/datapane/connect/DatabaseConnectionPane.java +++ b/designer-base/src/main/java/com/fr/design/data/datapane/connect/DatabaseConnectionPane.java @@ -57,7 +57,7 @@ public abstract class DatabaseConnectionPane { throw new Exception(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Connect_SQL_Cannot_Null") + "."); } catch (Exception e) { // JOptionPane.showMessageDialog(DBTableDataPane.this, - // com.fr.design.i18n.Toolkit.i18nText("Connect_SQL_Cannot_Null") + "."); + // com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Connect_SQL_Cannot_Null") + "."); } } 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 1a37065e4..fa26b6781 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 @@ -179,7 +179,7 @@ public class FileTableDataPane extends AbstractTableDataPane { chooseFile = new UIButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Selection")); chooseFile.addActionListener(chooseFileListener); - testConnection = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Datasource-Test_Connection")); + testConnection = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Datasource_Test_Connection")); testConnection.setEnabled(false); testConnection.addActionListener(testConnectionListener);// 测试连接按钮 diff --git a/designer-base/src/main/java/com/fr/design/gui/date/UICalendarPanel.java b/designer-base/src/main/java/com/fr/design/gui/date/UICalendarPanel.java index 9a8f1c011..2d9b50f89 100644 --- a/designer-base/src/main/java/com/fr/design/gui/date/UICalendarPanel.java +++ b/designer-base/src/main/java/com/fr/design/gui/date/UICalendarPanel.java @@ -46,7 +46,7 @@ import java.util.Date; public class UICalendarPanel extends JPanel { private static final Font FONT_SONG = new Font(com.fr.design.i18n.Toolkit.i18nText("Song_TypeFace"),0,12); - private static final Font FONT_BLACK = new Font(com.fr.design.i18n.Toolkit.i18nText("Black_Font"),0,12); + private static final Font FONT_BLACK = new Font(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Black_Font"),0,12); private static final int WEEKDAY_COUNT = 7; private static final int TOTAL_DAYS_COUNT = 42; diff --git a/designer-base/src/main/java/com/fr/design/style/AlignmentPane.java b/designer-base/src/main/java/com/fr/design/style/AlignmentPane.java index 718bc088b..1eed53608 100644 --- a/designer-base/src/main/java/com/fr/design/style/AlignmentPane.java +++ b/designer-base/src/main/java/com/fr/design/style/AlignmentPane.java @@ -184,7 +184,7 @@ public class AlignmentPane extends BasicPane { private JPanel getAlignment() { //algnment. - JPanel aligmentPane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("Alignment-Style")); + JPanel aligmentPane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Alignment_Style")); JPanel horAlignmentPane = FRGUIPaneFactory.createMediumHGapFlowInnerContainer_M_Pane(); // aligmentPane.add(horAlignmentPane); horAlignmentComboBox = new AlignmentComboBox(CoreConstants.HORIZONTAL_ALIGNMENT_ARRAY); 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 1902eb694..31cbabd14 100644 --- a/designer-base/src/main/java/com/fr/env/RemoteEnvPane.java +++ b/designer-base/src/main/java/com/fr/env/RemoteEnvPane.java @@ -250,7 +250,7 @@ public class RemoteEnvPane extends BasicBeanPane { testPanel.setPreferredSize(new Dimension(437, 20)); UIButton testConnectionButton = new UIButton(Toolkit.i18nText("Fine-Design_Basic_Remote_Env_Test_Connection")); - testConnectionButton.setToolTipText(Toolkit.i18nText("Datasource-Test_Connection")); + testConnectionButton.setToolTipText(Toolkit.i18nText("Fine-Design_Basic_Datasource_Test_Connection")); testConnectionButton.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent ev) { @@ -587,7 +587,7 @@ public class RemoteEnvPane extends BasicBeanPane { message.setBorder(BorderFactory.createEmptyBorder(8, 5, 0, 0)); okButton.setEnabled(false); - dialog = new JDialog((Dialog) SwingUtilities.getWindowAncestor(RemoteEnvPane.this), Toolkit.i18nText("Datasource-Test_Connection"), true); + dialog = new JDialog((Dialog) SwingUtilities.getWindowAncestor(RemoteEnvPane.this), Toolkit.i18nText("Fine-Design_Basic_Datasource_Test_Connection"), true); dialog.setSize(new Dimension(268, 118)); okButton.setEnabled(false); diff --git a/designer-chart/src/main/java/com/fr/design/chart/javascript/ChartEmailPane.java b/designer-chart/src/main/java/com/fr/design/chart/javascript/ChartEmailPane.java index fe60b47b3..ba7c49521 100644 --- a/designer-chart/src/main/java/com/fr/design/chart/javascript/ChartEmailPane.java +++ b/designer-chart/src/main/java/com/fr/design/chart/javascript/ChartEmailPane.java @@ -37,8 +37,8 @@ public class ChartEmailPane extends EmailPane{ {new UILabel(), tipsPane1}, createLinePane(com.fr.design.i18n.Toolkit.i18nText("HJS-Mail_to"), maitoEditor = new UITextField()), createLinePane(com.fr.design.i18n.Toolkit.i18nText("HJS-CC_to"), ccEditor = new UITextField()), - createLinePane(com.fr.design.i18n.Toolkit.i18nText("EmailPane-BCC"), bccEditor = new UITextField()), - createLinePane(com.fr.design.i18n.Toolkit.i18nText("EmailPane-mailSubject"), titleEditor = new UITextField()), + createLinePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Email_Pane_BCC"), bccEditor = new UITextField()), + createLinePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Email_Pane_Mail_Subject"), titleEditor = new UITextField()), {mainTextLabel, scrollPane}, {new UILabel(), showTplContent}, {new UILabel(), tipsPane2}},rSizes, columnSize, 6); @@ -48,8 +48,8 @@ public class ChartEmailPane extends EmailPane{ {new UILabel(), tipsPane1}, createLinePane(com.fr.design.i18n.Toolkit.i18nText("HJS-Mail_to"), maitoEditor = new UITextField()), createLinePane(com.fr.design.i18n.Toolkit.i18nText("HJS-CC_to"), ccEditor = new UITextField()), - createLinePane(com.fr.design.i18n.Toolkit.i18nText("EmailPane-BCC"), bccEditor = new UITextField()), - createLinePane(com.fr.design.i18n.Toolkit.i18nText("EmailPane-mailSubject"), titleEditor = new UITextField()), + createLinePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Email_Pane_BCC"), bccEditor = new UITextField()), + createLinePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Email_Pane_Mail_Subject"), titleEditor = new UITextField()), {mainTextLabel, scrollPane}, {new UILabel(), tipsPane2}},rSizes, columnSize, 8); } diff --git a/designer-chart/src/main/java/com/fr/design/chart/report/GisMapDataPane.java b/designer-chart/src/main/java/com/fr/design/chart/report/GisMapDataPane.java index 13d66c6e6..8212e65ed 100644 --- a/designer-chart/src/main/java/com/fr/design/chart/report/GisMapDataPane.java +++ b/designer-chart/src/main/java/com/fr/design/chart/report/GisMapDataPane.java @@ -130,7 +130,7 @@ public class GisMapDataPane extends DataContentsPane{ @Override protected String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("Data_Setting"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Data_Setting"); } }, BorderLayout.CENTER); diff --git a/designer-chart/src/main/java/com/fr/design/chart/report/MapSinglePane.java b/designer-chart/src/main/java/com/fr/design/chart/report/MapSinglePane.java index 76b1e1624..bc68b39f6 100644 --- a/designer-chart/src/main/java/com/fr/design/chart/report/MapSinglePane.java +++ b/designer-chart/src/main/java/com/fr/design/chart/report/MapSinglePane.java @@ -57,7 +57,7 @@ public class MapSinglePane extends FurtherBasicBeanPane { @Override protected String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("Data_Setting"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Data_Setting"); } }, BorderLayout.CENTER); } diff --git a/designer-chart/src/main/java/com/fr/design/chart/report/MapTableCubeDataPane.java b/designer-chart/src/main/java/com/fr/design/chart/report/MapTableCubeDataPane.java index 8552dbb98..bb5d62b84 100644 --- a/designer-chart/src/main/java/com/fr/design/chart/report/MapTableCubeDataPane.java +++ b/designer-chart/src/main/java/com/fr/design/chart/report/MapTableCubeDataPane.java @@ -77,7 +77,7 @@ public class MapTableCubeDataPane extends FurtherBasicBeanPane{ String tmp = DateUtils.getDate2LStr(toDate); toDate = DateUtils.DATETIMEFORMAT2.parse(tmp); } catch (ParseException e) { - FineLoggerFactory.getLogger().error(com.fr.design.i18n.Toolkit.i18nText("Cannot_Get_Date")); + FineLoggerFactory.getLogger().error(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Cannot_Get_Date")); } return toDate; } diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/datalabel/ChartDataLabelPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/datalabel/ChartDataLabelPane.java index ab4ca532e..3b675c845 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/datalabel/ChartDataLabelPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/datalabel/ChartDataLabelPane.java @@ -93,7 +93,7 @@ public class ChartDataLabelPane extends BasicScrollPane{ protected String[] getLabelLocationNameArray() { Plot plot = chart.getPlot(); if(plot instanceof BarPlot){ - return new String[] {com.fr.design.i18n.Toolkit.i18nText("BarInside"), com.fr.design.i18n.Toolkit.i18nText("BarOutSide"), com.fr.design.i18n.Toolkit.i18nText("Center")}; + return new String[] {com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Bar_Inside"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Bar_Outside"), com.fr.design.i18n.Toolkit.i18nText("Center")}; }else if(plot instanceof PiePlot){ return new String[] {com.fr.design.i18n.Toolkit.i18nText("Chart_In_Pie"), com.fr.design.i18n.Toolkit.i18nText("Chart_Out_Pie")}; }else if(plot instanceof RangePlot){ diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/BubbleSeriesPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/BubbleSeriesPane.java index 04de8bfe1..af2cb81b0 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/BubbleSeriesPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/BubbleSeriesPane.java @@ -52,7 +52,7 @@ public class BubbleSeriesPane extends AbstractPlotSeriesPane{ protected void initCom(){ String[] nameArray = {com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Chart_Bubble", "Chart_Area"}), - com.fr.design.i18n.Toolkit.i18nText("Bubble-Width")}; + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Bubble_Width")}; Integer[] valueArray = {BubblePlot.BUBBLE_AREA, BubblePlot.BUBBLE_WIDTH}; bubbleMean = new UIButtonGroup(nameArray, valueArray); zoomTime = new UITextField(); diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/StockSeriesPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/StockSeriesPane.java index 72e89d6c7..1d13777eb 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/StockSeriesPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/StockSeriesPane.java @@ -56,7 +56,7 @@ public class StockSeriesPane extends AbstractPlotSeriesPane { new Component[]{new JSeparator(),null}, - new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("DownBarBorderStyleAndColor")), null}, + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Down_Bar_Border_Style_And_Color")), null}, new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Border_Line_Style")), downLineBox}, new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Border-Color")), downBorderColor}, new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Border_Line_Style")), downBackColor}, diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/title/ChartTitlePane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/title/ChartTitlePane.java index 6d08de497..7796be1fb 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/title/ChartTitlePane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/title/ChartTitlePane.java @@ -110,7 +110,7 @@ public class ChartTitlePane extends BasicScrollPane { Component[][] components = new Component[][]{ new Component[]{null,titleContent,null}, new Component[]{null,textAttrPane,null}, - new Component[]{null,new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Alignment-Style") + ":"),alignmentPane} , + new Component[]{null,new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Alignment_Style") + ":"),alignmentPane} , } ; return TableLayoutHelper.createTableLayoutPane(components,rowSize,columnSize); diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/title/ChartTitlePaneNoFormula.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/title/ChartTitlePaneNoFormula.java index 7de40187b..0ebc26685 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/title/ChartTitlePaneNoFormula.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/title/ChartTitlePaneNoFormula.java @@ -110,7 +110,7 @@ public class ChartTitlePaneNoFormula extends BasicScrollPane { Component[][] components = new Component[][]{ new Component[]{null,titleContent,null}, new Component[]{null,textAttrPane,null}, - new Component[]{null,new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Alignment-Style") + ":"),alignmentPane} , + new Component[]{null,new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Alignment_Style") + ":"),alignmentPane} , } ; return TableLayoutHelper.createTableLayoutPane(components,rowSize,columnSize); diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/style/VanChartTitlePane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/style/VanChartTitlePane.java index 9a1c7e727..eba50bcf7 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/style/VanChartTitlePane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/style/VanChartTitlePane.java @@ -150,7 +150,7 @@ public class VanChartTitlePane extends AbstractVanChartScrollPane { Component[][] components = new Component[][]{ new Component[]{null,null}, - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("BorderLayout-Constraints"), SwingConstants.LEFT),alignmentPane}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_BorderLayout_Constraints"), SwingConstants.LEFT),alignmentPane}, new Component[]{null,customFloatPositionButton} }; diff --git a/designer-form/src/main/java/com/fr/design/designer/beans/actions/ConnectionAction.java b/designer-form/src/main/java/com/fr/design/designer/beans/actions/ConnectionAction.java index 55ceb7ccf..c9f84d837 100644 --- a/designer-form/src/main/java/com/fr/design/designer/beans/actions/ConnectionAction.java +++ b/designer-form/src/main/java/com/fr/design/designer/beans/actions/ConnectionAction.java @@ -16,7 +16,7 @@ public class ConnectionAction extends UpdateAction implements ToggleButtonUpdate public ConnectionAction(FormDesigner fd) { this.fd = fd; - this.setName(com.fr.design.i18n.Toolkit.i18nText("Connectionline")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Connecti_Online")); this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/toolbarbtn/connector.png")); } diff --git a/designer-form/src/main/java/com/fr/design/designer/beans/painters/AbstractPainter.java b/designer-form/src/main/java/com/fr/design/designer/beans/painters/AbstractPainter.java index ab2e4ded9..f7e162a92 100644 --- a/designer-form/src/main/java/com/fr/design/designer/beans/painters/AbstractPainter.java +++ b/designer-form/src/main/java/com/fr/design/designer/beans/painters/AbstractPainter.java @@ -82,7 +82,7 @@ public abstract class AbstractPainter implements HoverPainter { g2d.setStroke(XCreatorConstants.STROKE); g2d.setColor(bColor); if (!accept) { - g2d.drawString(com.fr.design.i18n.Toolkit.i18nText("Cannot-Add_To_This_Area") + "!", x + width / 3, y + height / 2); + g2d.drawString(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Cannot_Add_To_This_Area") + "!", x + width / 3, y + height / 2); } else if (drawBackground) { g2d.fillRect(x, y, width, height); } else { diff --git a/designer-form/src/main/java/com/fr/design/designer/creator/XCheckBoxGroup.java b/designer-form/src/main/java/com/fr/design/designer/creator/XCheckBoxGroup.java index 54cdf6d30..5ee63aaf7 100644 --- a/designer-form/src/main/java/com/fr/design/designer/creator/XCheckBoxGroup.java +++ b/designer-form/src/main/java/com/fr/design/designer/creator/XCheckBoxGroup.java @@ -64,7 +64,7 @@ public class XCheckBoxGroup extends XFieldEditor { } if (!((CheckBoxGroup) this.toData()).isAdaptive()) { crp = (CRPropertyDescriptor[]) ArrayUtils.add(crp, new CRPropertyDescriptor("columnsInRow", this.data - .getClass()).setI18NName(com.fr.design.i18n.Toolkit.i18nText("Button-Group-Display-Columns")).putKeyValue( + .getClass()).setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Button_Group_Display_Columns")).putKeyValue( XCreatorConstants.PROPERTY_CATEGORY, "Advanced")); } return crp; diff --git a/designer-form/src/main/java/com/fr/design/designer/creator/XRadioGroup.java b/designer-form/src/main/java/com/fr/design/designer/creator/XRadioGroup.java index f0a81a165..f85c98451 100644 --- a/designer-form/src/main/java/com/fr/design/designer/creator/XRadioGroup.java +++ b/designer-form/src/main/java/com/fr/design/designer/creator/XRadioGroup.java @@ -56,7 +56,7 @@ public class XRadioGroup extends XFieldEditor { .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced").setEditorClass(InChangeBooleanEditor.class)}; if (!toData().isAdaptive()) { crp = (CRPropertyDescriptor[]) ArrayUtils.add(crp, new CRPropertyDescriptor("columnsInRow", this.data - .getClass()).setI18NName(com.fr.design.i18n.Toolkit.i18nText("Button-Group-Display-Columns")).putKeyValue( + .getClass()).setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Button_Group_Display_Columns")).putKeyValue( XCreatorConstants.PROPERTY_CATEGORY, "Advanced")); } return crp; diff --git a/designer-form/src/main/java/com/fr/design/designer/properties/FRBorderLayoutConstraints.java b/designer-form/src/main/java/com/fr/design/designer/properties/FRBorderLayoutConstraints.java index cb8c3e918..2e03754d2 100644 --- a/designer-form/src/main/java/com/fr/design/designer/properties/FRBorderLayoutConstraints.java +++ b/designer-form/src/main/java/com/fr/design/designer/properties/FRBorderLayoutConstraints.java @@ -84,7 +84,7 @@ public class FRBorderLayoutConstraints implements ConstraintsGroupModel { if (column == 0) { switch (row) { case 0: - return com.fr.design.i18n.Toolkit.i18nText("BorderLayout-Constraints"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_BorderLayout_Constraints"); case 1: return com.fr.design.i18n.Toolkit.i18nText("Title"); default: diff --git a/designer-form/src/main/java/com/fr/design/designer/properties/items/FRBorderConstraintsItems.java b/designer-form/src/main/java/com/fr/design/designer/properties/items/FRBorderConstraintsItems.java index 45f3d89b5..80085df89 100644 --- a/designer-form/src/main/java/com/fr/design/designer/properties/items/FRBorderConstraintsItems.java +++ b/designer-form/src/main/java/com/fr/design/designer/properties/items/FRBorderConstraintsItems.java @@ -10,7 +10,7 @@ public class FRBorderConstraintsItems implements ItemProvider { public FRBorderConstraintsItems(String[] directions) { Item[] item = createItems(directions); - VALUE_ITEMS = (Item[]) ArrayUtils.add(item, new Item(com.fr.design.i18n.Toolkit.i18nText("BorderLayout-Center"), + VALUE_ITEMS = (Item[]) ArrayUtils.add(item, new Item(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_BorderLayout_Center"), WBorderLayout.CENTER)); } @@ -23,13 +23,13 @@ public class FRBorderConstraintsItems implements ItemProvider { Item[] items = new Item[directions.length]; for (int i = 0; i < directions.length; i++) { if (WBorderLayout.NORTH == directions[i]) { - items[i] = new Item(com.fr.design.i18n.Toolkit.i18nText("BorderLayout-North"), WBorderLayout.NORTH); + items[i] = new Item(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_BorderLayout_North"), WBorderLayout.NORTH); } else if (WBorderLayout.SOUTH == directions[i]) { - items[i] = new Item(com.fr.design.i18n.Toolkit.i18nText("BorderLayout-South"), WBorderLayout.SOUTH); + items[i] = new Item(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_BorderLayout_South"), WBorderLayout.SOUTH); } else if (WBorderLayout.WEST == directions[i]) { - items[i] = new Item(com.fr.design.i18n.Toolkit.i18nText("BorderLayout-West"), WBorderLayout.WEST); + items[i] = new Item(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_BorderLayout_West"), WBorderLayout.WEST); } else if (WBorderLayout.EAST == directions[i]) { - items[i] = new Item(com.fr.design.i18n.Toolkit.i18nText("BorderLayout-East"), WBorderLayout.EAST); + items[i] = new Item(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_BorderLayout_East"), WBorderLayout.EAST); } } return items; diff --git a/designer-form/src/main/java/com/fr/design/form/javascript/FormEmailPane.java b/designer-form/src/main/java/com/fr/design/form/javascript/FormEmailPane.java index 0efcf02d8..68974ba25 100644 --- a/designer-form/src/main/java/com/fr/design/form/javascript/FormEmailPane.java +++ b/designer-form/src/main/java/com/fr/design/form/javascript/FormEmailPane.java @@ -25,8 +25,8 @@ public class FormEmailPane extends EmailPane{ {new UILabel(), tipsPane1}, createLinePane(com.fr.design.i18n.Toolkit.i18nText("HJS-Mail_to"), maitoEditor = new UITextField()), createLinePane(com.fr.design.i18n.Toolkit.i18nText("HJS-CC_to"), ccEditor = new UITextField()), - createLinePane(com.fr.design.i18n.Toolkit.i18nText("EmailPane-BCC"), bccEditor = new UITextField()), - createLinePane(com.fr.design.i18n.Toolkit.i18nText("EmailPane-mailSubject"), titleEditor = new UITextField()), + createLinePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Email_Pane_BCC"), bccEditor = new UITextField()), + createLinePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Email_Pane_Mail_Subject"), titleEditor = new UITextField()), {mainTextLabel, scrollPane}, {new UILabel(), tipsPane2}},rowSize, columnSize, 7); } diff --git a/designer-form/src/main/java/com/fr/design/mainframe/WidgetToolBarPane.java b/designer-form/src/main/java/com/fr/design/mainframe/WidgetToolBarPane.java index bde1367c4..f681d7386 100644 --- a/designer-form/src/main/java/com/fr/design/mainframe/WidgetToolBarPane.java +++ b/designer-form/src/main/java/com/fr/design/mainframe/WidgetToolBarPane.java @@ -146,7 +146,7 @@ public class WidgetToolBarPane extends BasicPane implements DesignToolbarProvide if (wo != null && wo.length > 0) { this.componentsList4Form.add(new TitleLabel(com.fr.design.i18n.Toolkit.i18nText("Chart"))); UIButton chartButton = new UIButton(BaseUtils.readIcon("com/fr/design/images/toolbarbtn/chart.png")); - chartButton.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Click-Me")); + chartButton.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Click_Me")); chartButton.addMouseListener(new MouseAdapter() { @Override public void mouseClicked(MouseEvent e) { diff --git a/designer-form/src/main/java/com/fr/design/mainframe/widget/accessibles/ColorPalette.java b/designer-form/src/main/java/com/fr/design/mainframe/widget/accessibles/ColorPalette.java index f1123a140..1d8526061 100644 --- a/designer-form/src/main/java/com/fr/design/mainframe/widget/accessibles/ColorPalette.java +++ b/designer-form/src/main/java/com/fr/design/mainframe/widget/accessibles/ColorPalette.java @@ -24,7 +24,7 @@ public class ColorPalette extends JPopupMenu { private Object[] colors = new Object[]{new Object[]{com.fr.design.i18n.Toolkit.i18nText("Black"), new Color(0, 0, 0)}, new Object[]{com.fr.design.i18n.Toolkit.i18nText("Crimson"), new Color(128, 0, 0)}, new Object[]{com.fr.design.i18n.Toolkit.i18nText("Red"), new Color(255, 0, 0)}, new Object[]{com.fr.design.i18n.Toolkit.i18nText("Pink"), new Color(255, 0, 255)}, new Object[]{com.fr.design.i18n.Toolkit.i18nText("Rose_Red"), new Color(255, 153, 204)}, new Object[]{com.fr.design.i18n.Toolkit.i18nText("Brown"), new Color(153, 51, 0)}, new Object[]{com.fr.design.i18n.Toolkit.i18nText("Orange"), new Color(255, 102, 0)}, new Object[]{com.fr.design.i18n.Toolkit.i18nText("Light_Orange"), new Color(255, 153, 0)}, new Object[]{com.fr.design.i18n.Toolkit.i18nText("Golden"), new Color(255, 204, 0)}, - new Object[]{com.fr.design.i18n.Toolkit.i18nText("Brown_Orange"), new Color(255, 204, 153)}, new Object[]{"", new Color(51, 51, 0)}, new Object[]{"", new Color(128, 128, 0)}, new Object[]{"", new Color(153, 204, 0)}, + new Object[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Brown_Orange"), new Color(255, 204, 153)}, new Object[]{"", new Color(51, 51, 0)}, new Object[]{"", new Color(128, 128, 0)}, new Object[]{"", new Color(153, 204, 0)}, new Object[]{"", new Color(255, 255, 0)}, new Object[]{"", new Color(255, 255, 153)}, new Object[]{"", new Color(0, 51, 0)}, new Object[]{"", new Color(0, 128, 0)}, new Object[]{"", new Color(51, 153, 102)}, new Object[]{"", new Color(172, 168, 153)}, new Object[]{"", new Color(204, 255, 204)}, new Object[]{"", new Color(0, 51, 102)}, new Object[]{"", new Color(0, 128, 128)}, new Object[]{"", new Color(51, 204, 204)}, new Object[]{"", new Color(0, 255, 255)}, new Object[]{"", new Color(204, 255, 255)}, diff --git a/designer-form/src/main/java/com/fr/design/mainframe/widget/editors/BorderLayoutDirectionEditor.java b/designer-form/src/main/java/com/fr/design/mainframe/widget/editors/BorderLayoutDirectionEditor.java index 3d6249f2b..f42f47be8 100644 --- a/designer-form/src/main/java/com/fr/design/mainframe/widget/editors/BorderLayoutDirectionEditor.java +++ b/designer-form/src/main/java/com/fr/design/mainframe/widget/editors/BorderLayoutDirectionEditor.java @@ -16,10 +16,10 @@ import com.fr.stable.StringUtils; public class BorderLayoutDirectionEditor extends AbstractPropertyEditor { public static final Item[] ITEMS = new Item[] { - new Item(com.fr.design.i18n.Toolkit.i18nText("BorderLayout-North"), WBorderLayout.NORTH), - new Item(com.fr.design.i18n.Toolkit.i18nText("BorderLayout-South"), WBorderLayout.SOUTH), - new Item(com.fr.design.i18n.Toolkit.i18nText("BorderLayout-West"), WBorderLayout.WEST), - new Item(com.fr.design.i18n.Toolkit.i18nText("BorderLayout-East"), WBorderLayout.EAST) }; + new Item(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_BorderLayout_North"), WBorderLayout.NORTH), + new Item(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_BorderLayout_South"), WBorderLayout.SOUTH), + new Item(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_BorderLayout_West"), WBorderLayout.WEST), + new Item(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_BorderLayout_East"), WBorderLayout.EAST) }; private ComboCheckBox comboBox; diff --git a/designer-form/src/main/java/com/fr/design/widget/ui/designer/ButtonGroupDictPane.java b/designer-form/src/main/java/com/fr/design/widget/ui/designer/ButtonGroupDictPane.java index 83916c729..b80edf3e8 100644 --- a/designer-form/src/main/java/com/fr/design/widget/ui/designer/ButtonGroupDictPane.java +++ b/designer-form/src/main/java/com/fr/design/widget/ui/designer/ButtonGroupDictPane.java @@ -32,7 +32,7 @@ public class ButtonGroupDictPane extends JPanel { this.setLayout(FRGUIPaneFactory.createBorderLayout()); adaptiveCheckbox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Adaptive"), true); adaptiveCheckbox.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0)); - this.columnLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Button-Group-Display-Columns") + ":"); + this.columnLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Button_Group_Display_Columns") + ":"); columnSpinner = new UIBasicSpinner(new SpinnerNumberModel(0, 0, Integer.MAX_VALUE, 1)); JPanel jPanel = TableLayoutHelper.createGapTableLayoutPane(new Component[][]{new Component[]{adaptiveCheckbox, columnLabel, columnSpinner}}, TableLayoutHelper.FILL_LASTCOLUMN, 18, 7); diff --git a/designer-realize/src/main/java/com/fr/design/actions/cell/CellExpandAttrAction.java b/designer-realize/src/main/java/com/fr/design/actions/cell/CellExpandAttrAction.java index bd99539d9..f6b6a3123 100644 --- a/designer-realize/src/main/java/com/fr/design/actions/cell/CellExpandAttrAction.java +++ b/designer-realize/src/main/java/com/fr/design/actions/cell/CellExpandAttrAction.java @@ -18,7 +18,7 @@ public class CellExpandAttrAction extends CellAttributeTableAction{ @Override public String getID() { - return com.fr.design.i18n.Toolkit.i18nText("ExpandD-Expand_Attribute"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_ExpandD_Expand_Attribute"); } } \ No newline at end of file diff --git a/designer-realize/src/main/java/com/fr/design/actions/cell/UIToolbarBorderButton.java b/designer-realize/src/main/java/com/fr/design/actions/cell/UIToolbarBorderButton.java index bb2be95be..647354389 100644 --- a/designer-realize/src/main/java/com/fr/design/actions/cell/UIToolbarBorderButton.java +++ b/designer-realize/src/main/java/com/fr/design/actions/cell/UIToolbarBorderButton.java @@ -292,10 +292,10 @@ public class UIToolbarBorderButton extends UICombinationButton implements PopupH new CellBorderStyle(Color.black, Constants.LINE_THICK, Color.black, Constants.LINE_THICK, Color.black, Constants.LINE_THICK, Color.black, Constants.LINE_THICK, Color.black, Constants.LINE_NONE, Color.black, Constants.LINE_NONE) }; private static final String[] BorderStyleTooltips = { com.fr.design.i18n.Toolkit.i18nText("NO_Border_Line"), com.fr.design.i18n.Toolkit.i18nText("Bottom_Border_Line"), - com.fr.design.i18n.Toolkit.i18nText("Left_Border_Line"), com.fr.design.i18n.Toolkit.i18nText("Right_Border_Line"), com.fr.design.i18n.Toolkit.i18nText("Double_Bottom_BorderLine"), + com.fr.design.i18n.Toolkit.i18nText("Left_Border_Line"), com.fr.design.i18n.Toolkit.i18nText("Right_Border_Line"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Double_Bottom_BorderLine"), com.fr.design.i18n.Toolkit.i18nText("Thick_Bottom_Border_Line"), com.fr.design.i18n.Toolkit.i18nText("Top_Bottom_Border_Line"), com.fr.design.i18n.Toolkit.i18nText("Top_And_Double_Bottom_Border_Line"), com.fr.design.i18n.Toolkit.i18nText("Top_And_Thick_Bottom_Border_Line"), - com.fr.design.i18n.Toolkit.i18nText("All_Border_Line"), com.fr.design.i18n.Toolkit.i18nText("Out_Border_Line"), com.fr.design.i18n.Toolkit.i18nText("Out_Thick_Border_Line") }; + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_All_Border_Line"), com.fr.design.i18n.Toolkit.i18nText("Out_Border_Line"), com.fr.design.i18n.Toolkit.i18nText("Out_Thick_Border_Line") }; @Override public void hidePopupMenu() { diff --git a/designer-realize/src/main/java/com/fr/design/actions/columnrow/CancelColumnAction.java b/designer-realize/src/main/java/com/fr/design/actions/columnrow/CancelColumnAction.java index 20795b567..629dbb24a 100644 --- a/designer-realize/src/main/java/com/fr/design/actions/columnrow/CancelColumnAction.java +++ b/designer-realize/src/main/java/com/fr/design/actions/columnrow/CancelColumnAction.java @@ -11,7 +11,7 @@ public class CancelColumnAction extends CellSelectionAction{ public CancelColumnAction(ElementCasePane t) { super(t); - this.setName(com.fr.design.i18n.Toolkit.i18nText("Cancel_Repeat_Attributes")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Cancel_Repeat_Attributes")); } @Override diff --git a/designer-realize/src/main/java/com/fr/design/actions/columnrow/CancelRowAction.java b/designer-realize/src/main/java/com/fr/design/actions/columnrow/CancelRowAction.java index 11e8b813d..1ed0ff88e 100644 --- a/designer-realize/src/main/java/com/fr/design/actions/columnrow/CancelRowAction.java +++ b/designer-realize/src/main/java/com/fr/design/actions/columnrow/CancelRowAction.java @@ -12,7 +12,7 @@ public class CancelRowAction extends CellSelectionAction { public CancelRowAction(ElementCasePane t) { super(t); - this.setName(com.fr.design.i18n.Toolkit.i18nText("Cancel_Repeat_Attributes")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Cancel_Repeat_Attributes")); } @Override diff --git a/designer-realize/src/main/java/com/fr/design/actions/file/export/AbstractExcelExportAction.java b/designer-realize/src/main/java/com/fr/design/actions/file/export/AbstractExcelExportAction.java index 3d984b9e9..37ab34d76 100644 --- a/designer-realize/src/main/java/com/fr/design/actions/file/export/AbstractExcelExportAction.java +++ b/designer-realize/src/main/java/com/fr/design/actions/file/export/AbstractExcelExportAction.java @@ -26,7 +26,7 @@ public abstract class AbstractExcelExportAction extends AbstractExportAction { if (hasLayerReport(tpl)) { return new ChooseFileFilter(new String[]{"zip"}, "ZIP"); } else { - return new ChooseFileFilter(new String[]{"xls", "xlsx"}, com.fr.design.i18n.Toolkit.i18nText("Export-Excel")); + return new ChooseFileFilter(new String[]{"xls", "xlsx"}, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Export_Excel")); } } diff --git a/designer-realize/src/main/java/com/fr/design/actions/file/export/CSVExportAction.java b/designer-realize/src/main/java/com/fr/design/actions/file/export/CSVExportAction.java index f564c2bdc..54f8ef357 100644 --- a/designer-realize/src/main/java/com/fr/design/actions/file/export/CSVExportAction.java +++ b/designer-realize/src/main/java/com/fr/design/actions/file/export/CSVExportAction.java @@ -41,7 +41,7 @@ public class CSVExportAction extends AbstractExportAction { @Override protected ChooseFileFilter getChooseFileFilter() { - return new ChooseFileFilter(FileExtension.CSV, com.fr.design.i18n.Toolkit.i18nText("Export-CSV")); + return new ChooseFileFilter(FileExtension.CSV, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Export_CSV")); } @Override diff --git a/designer-realize/src/main/java/com/fr/design/actions/file/export/PageToSheetExcelExportAction.java b/designer-realize/src/main/java/com/fr/design/actions/file/export/PageToSheetExcelExportAction.java index 91f941f96..934c39bb7 100644 --- a/designer-realize/src/main/java/com/fr/design/actions/file/export/PageToSheetExcelExportAction.java +++ b/designer-realize/src/main/java/com/fr/design/actions/file/export/PageToSheetExcelExportAction.java @@ -30,7 +30,7 @@ public class PageToSheetExcelExportAction extends AbstractExcelExportAction { @Override protected ChooseFileFilter getChooseFileFilter() { - return new ChooseFileFilter(FileExtension.XLS, com.fr.design.i18n.Toolkit.i18nText("Export-Excel")); + return new ChooseFileFilter(FileExtension.XLS, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Export_Excel")); } @Override diff --git a/designer-realize/src/main/java/com/fr/design/actions/file/export/SVGExportAction.java b/designer-realize/src/main/java/com/fr/design/actions/file/export/SVGExportAction.java index 39c27c796..027158bd0 100644 --- a/designer-realize/src/main/java/com/fr/design/actions/file/export/SVGExportAction.java +++ b/designer-realize/src/main/java/com/fr/design/actions/file/export/SVGExportAction.java @@ -35,7 +35,7 @@ public class SVGExportAction extends AbstractExportAction { @Override protected ChooseFileFilter getChooseFileFilter() { - return new ChooseFileFilter(FileExtension.SVG, com.fr.design.i18n.Toolkit.i18nText("Export-SVG")); + return new ChooseFileFilter(FileExtension.SVG, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Export_SVG")); } @Override diff --git a/designer-realize/src/main/java/com/fr/design/actions/file/export/TextExportAction.java b/designer-realize/src/main/java/com/fr/design/actions/file/export/TextExportAction.java index 663137843..1028d55d9 100644 --- a/designer-realize/src/main/java/com/fr/design/actions/file/export/TextExportAction.java +++ b/designer-realize/src/main/java/com/fr/design/actions/file/export/TextExportAction.java @@ -34,7 +34,7 @@ public class TextExportAction extends AbstractExportAction { @Override protected ChooseFileFilter getChooseFileFilter() { - return new ChooseFileFilter(FileExtension.TXT, com.fr.design.i18n.Toolkit.i18nText("Export-Text")); + return new ChooseFileFilter(FileExtension.TXT, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Export_Text")); } @Override diff --git a/designer-realize/src/main/java/com/fr/design/actions/utils/DeprecatedActionManager.java b/designer-realize/src/main/java/com/fr/design/actions/utils/DeprecatedActionManager.java index 7cb122003..1184ce8ab 100644 --- a/designer-realize/src/main/java/com/fr/design/actions/utils/DeprecatedActionManager.java +++ b/designer-realize/src/main/java/com/fr/design/actions/utils/DeprecatedActionManager.java @@ -106,7 +106,7 @@ public class DeprecatedActionManager { formulaAction.setMnemonic('F'); NewPresentAction barcodeAction = new NewPresentAction(ePane, com.fr.design.i18n.Toolkit.i18nText("M_Insert-Barcode"), BarcodePresent.class.getName()); barcodeAction.setMnemonic('B'); - NewPresentAction currencyLineAction = new NewPresentAction(ePane, com.fr.design.i18n.Toolkit.i18nText("Currency_Line"), CurrencyLinePresent.class.getName()); + NewPresentAction currencyLineAction = new NewPresentAction(ePane, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Currency_Line"), CurrencyLinePresent.class.getName()); currencyLineAction.setMnemonic('L'); NewPresentAction nonePresentAction = new NewPresentAction(ePane, com.fr.design.i18n.Toolkit.i18nText("Present-No_Present"), "NOPRESENT"); nonePresentAction.setMnemonic('N'); diff --git a/designer-realize/src/main/java/com/fr/design/condition/PagePane.java b/designer-realize/src/main/java/com/fr/design/condition/PagePane.java index 88b942e39..eea1c715c 100644 --- a/designer-realize/src/main/java/com/fr/design/condition/PagePane.java +++ b/designer-realize/src/main/java/com/fr/design/condition/PagePane.java @@ -21,10 +21,10 @@ public class PagePane extends ConditionAttrSingleConditionPane this.add(pageLabel); this.pageComboBox = new UIComboBox(new String[] { com.fr.design.i18n.Toolkit.i18nText("Utils-No_Pagination"), - com.fr.design.i18n.Toolkit.i18nText("CellWrite-Page_After_Row"), - com.fr.design.i18n.Toolkit.i18nText("CellWrite-Page_Before_Row"), - com.fr.design.i18n.Toolkit.i18nText("CellWrite-Page_After_Column"), - com.fr.design.i18n.Toolkit.i18nText("CellWrite-Page_Before_Column") }); + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Cell_Write_Page_After_Row"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Cell_Write_Page_Before_Row"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Cell_Write_Page_After_Column"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Cell_Write_Page_Before_Column") }); this.add(this.pageComboBox); this.pageComboBox.setSelectedIndex(0); } 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 51778fb0c..86cd742bc 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 @@ -58,11 +58,11 @@ public class DSColumnAdvancedPane extends BasicPane { if (setting > DSColumnPane.SETTING_DSRELATED) { selectCountPane = new SelectCountPane(); - selectCountPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("BindColumn-Results_Filter"), null)); + selectCountPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Bind_Column_Results_Filter"), null)); } valuePane = new ValuePane(); - valuePane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("BindColumn-Custom_Data_Appearance"), null)); + valuePane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Bind_Column_Custom_Data_Appearance"), null)); JPanel extendablePane = null; @@ -70,10 +70,10 @@ public class DSColumnAdvancedPane extends BasicPane { // extendableDirectionPane JPanel extendableDirectionPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane(); - extendableDirectionPane.add(horizontalExtendableCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("ExpandD-Horizontal_Extendable"))); - extendableDirectionPane.add(verticalExtendableCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("ExpandD-Vertical_Extendable"))); + extendableDirectionPane.add(horizontalExtendableCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_ExpandD_Horizontal_Extendable"))); + extendableDirectionPane.add(verticalExtendableCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_ExpandD_Vertical_Extendable"))); - extendablePane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("ExpandD-Expandable")); + extendablePane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_ExpandD_Expandable")); extendablePane.setLayout(new BorderLayout()); extendablePane.add(extendableDirectionPane, BorderLayout.CENTER); } @@ -81,7 +81,7 @@ public class DSColumnAdvancedPane extends BasicPane { JPanel multiNumPane = null; if (setting > DSColumnPane.SETTING_DSRELATED) { 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")); + useMultiplyNumCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Column_Multiple")); multiNumPane.add(useMultiplyNumCheckBox); multiNumPane.add(new UILabel(InsetText)); @@ -295,8 +295,8 @@ public class DSColumnAdvancedPane extends BasicPane { selectCountComboBox = new UIComboBox(new String[]{ com.fr.design.i18n.Toolkit.i18nText("Undefined"), - com.fr.design.i18n.Toolkit.i18nText("BindColumn-Top_N"), - com.fr.design.i18n.Toolkit.i18nText("BindColumn-Bottom_N"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Bind_Column_Top_N"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Bind_Column_Bottom_N"), com.fr.design.i18n.Toolkit.i18nText("Odd"), com.fr.design.i18n.Toolkit.i18nText("Even"), com.fr.design.i18n.Toolkit.i18nText("Specify"),}); @@ -332,9 +332,9 @@ public class DSColumnAdvancedPane extends BasicPane { topFormulaPane = new JFormulaField("-1"); bottomFormulaPane = new JFormulaField("-1"); serialTextField = new UITextField(18); - JPanel oddPane = GUICoreUtils.createFlowPane(new UILabel(com.fr.design.i18n.Toolkit.i18nText("BindColumn-Result_Serial_Number_Start_From_1") + JPanel oddPane = GUICoreUtils.createFlowPane(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Bind_Column_Result_Serial_Number_Start_From_1") + " " + com.fr.design.i18n.Toolkit.i18nText("BindColumn-Odd_Selected_(1,3,5...)")), FlowLayout.LEFT); - JPanel evenPane = GUICoreUtils.createFlowPane(new UILabel(com.fr.design.i18n.Toolkit.i18nText("BindColumn-Result_Serial_Number_Start_From_1") + JPanel evenPane = GUICoreUtils.createFlowPane(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Bind_Column_Result_Serial_Number_Start_From_1") + " " + com.fr.design.i18n.Toolkit.i18nText("BindColumn-Even_Selected_(2,4,6...)")), FlowLayout.LEFT); JPanel specifyPane = GUICoreUtils.createFlowPane(new JComponent[]{ serialTextField, new UILabel( diff --git a/designer-realize/src/main/java/com/fr/design/dscolumn/DSColumnBasicPane.java b/designer-realize/src/main/java/com/fr/design/dscolumn/DSColumnBasicPane.java index 5b53dd4d1..624a413c9 100644 --- a/designer-realize/src/main/java/com/fr/design/dscolumn/DSColumnBasicPane.java +++ b/designer-realize/src/main/java/com/fr/design/dscolumn/DSColumnBasicPane.java @@ -73,11 +73,11 @@ public class DSColumnBasicPane extends BasicPane { } resultSetGroupPane = new ResultSetGroupPopUpPane(setting > DSColumnPane.SETTING_DSRELATED); - resultSetGroupPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Data_Setting"), null)); + resultSetGroupPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Data_Setting"), null)); if (setting > DSColumnPane.SETTING_DSRELATED) { expandDirectionPane = new ExpandDirectionPane(); - expandDirectionPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("ExpandD-Expand_Direction"), null)); + expandDirectionPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_ExpandD_Expand_Direction"), null)); } double[] rowSize = {TableLayout.PREFERRED, TableLayout.PREFERRED, 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 f05d97557..3ff74bca2 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 @@ -56,7 +56,7 @@ public class DSColumnConditionsPane extends BasicPane { JPanel reSelectPane = GUICoreUtils.createFlowPane(pane, FlowLayout.LEFT); this.add(reSelectPane, BorderLayout.NORTH); - reSelectPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("BindColumn-The_Conditions_of_FatherCell"), null)); + reSelectPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Bind_Column_The_Conditions_Of_Father_Cell"), null)); } } 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 3b55a7d76..c9cb95e1a 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 @@ -111,7 +111,7 @@ public class DSColumnPane extends BasicPane { @Override protected String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("ExpandD-Data_Column"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_ExpandD_Data_Column"); } /** diff --git a/designer-realize/src/main/java/com/fr/design/dscolumn/ResultSetGroupDockingPane.java b/designer-realize/src/main/java/com/fr/design/dscolumn/ResultSetGroupDockingPane.java index 57e7372e7..1792ea837 100644 --- a/designer-realize/src/main/java/com/fr/design/dscolumn/ResultSetGroupDockingPane.java +++ b/designer-realize/src/main/java/com/fr/design/dscolumn/ResultSetGroupDockingPane.java @@ -46,7 +46,7 @@ public class ResultSetGroupDockingPane extends ResultSetGroupPane { } public void initComponents() { - goBox = new UIComboBox(new String[]{com.fr.design.i18n.Toolkit.i18nText("BindColumn-Group"), com.fr.design.i18n.Toolkit.i18nText("BindColumn-Select"), com.fr.design.i18n.Toolkit.i18nText("BindColumn-Summary")}); + goBox = new UIComboBox(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Bind_Column_Group"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Bind_Column_Select"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Bind_Column_Summary")}); initCardPane(); contentPane = layoutPane(); this.setLayout(new BorderLayout()); @@ -56,7 +56,7 @@ public class ResultSetGroupDockingPane extends ResultSetGroupPane { private JPanel layoutPane() { double p = TableLayout.PREFERRED; double f = TableLayout.FILL; - UILabel dataSetLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Data_Setting")); + UILabel dataSetLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Data_Setting")); dataSetLabel.setPreferredSize(new Dimension(60, 20)); Component[][] components = new Component[][] { diff --git a/designer-realize/src/main/java/com/fr/design/dscolumn/SpecifiedGroupAttrPane.java b/designer-realize/src/main/java/com/fr/design/dscolumn/SpecifiedGroupAttrPane.java index 780ebe327..134b2758a 100644 --- a/designer-realize/src/main/java/com/fr/design/dscolumn/SpecifiedGroupAttrPane.java +++ b/designer-realize/src/main/java/com/fr/design/dscolumn/SpecifiedGroupAttrPane.java @@ -310,7 +310,7 @@ public class SpecifiedGroupAttrPane extends BasicPane { private JPanel southPane; public FormulaGroupPane() { - this.setBorder(BorderFactory.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("D-Dispaly_Divide_Result_Set_into_Groups"))); + this.setBorder(BorderFactory.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_D_Dispaly_Divide_Result_Set_into_Groups"))); this.setLayout(FRGUIPaneFactory.createM_BorderLayout()); JPanel contentPane = FRGUIPaneFactory.createNColumnGridInnerContainer_S_Pane(1); this.add(contentPane, BorderLayout.NORTH); @@ -320,7 +320,7 @@ public class SpecifiedGroupAttrPane extends BasicPane { contentPane.add(northPane); modeComboBox = new UIComboBox(displayModeNames); - northPane.add(GUICoreUtils.createFlowPane(new JComponent[] { new UILabel(InsertText), new UILabel(com.fr.design.i18n.Toolkit.i18nText("Display_Modes") + ": "), + northPane.add(GUICoreUtils.createFlowPane(new JComponent[] { new UILabel(InsertText), new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Display_Modes") + ": "), modeComboBox }, FlowLayout.LEFT), BorderLayout.WEST); UILabel label = new UILabel("="); diff --git a/designer-realize/src/main/java/com/fr/design/expand/ExpandDirectionPane.java b/designer-realize/src/main/java/com/fr/design/expand/ExpandDirectionPane.java index eb7af6cfa..c22e08646 100644 --- a/designer-realize/src/main/java/com/fr/design/expand/ExpandDirectionPane.java +++ b/designer-realize/src/main/java/com/fr/design/expand/ExpandDirectionPane.java @@ -39,7 +39,7 @@ public class ExpandDirectionPane extends JPanel { this.add(innerthis); t2bRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Utils-Top_to_Bottom")); l2rRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Utils-Left_to_Right")); - noneRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("ExpandD-Not_Expand")); + noneRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_ExpandD_Not_Expand")); ButtonGroup bg = new ButtonGroup(); bg.add(t2bRadioButton); bg.add(l2rRadioButton); diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/CellElementPropertyPane.java b/designer-realize/src/main/java/com/fr/design/mainframe/CellElementPropertyPane.java index 5a578349b..4707d1a47 100644 --- a/designer-realize/src/main/java/com/fr/design/mainframe/CellElementPropertyPane.java +++ b/designer-realize/src/main/java/com/fr/design/mainframe/CellElementPropertyPane.java @@ -100,7 +100,7 @@ public class CellElementPropertyPane extends DockingView { cellElementEditPane = new CellElementEditPane(); cellElementEditPane.addTitleChangeListner(titleListener); titlePane = new JPanel(new BorderLayout()); - title = new UILabel(this.getViewTitle() + '-' + com.fr.design.i18n.Toolkit.i18nText("ExpandD-Expand_Attribute")) { + title = new UILabel(this.getViewTitle() + '-' + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_ExpandD_Expand_Attribute")) { private static final long serialVersionUID = 1L; @Override diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/SheetNameTabPane.java b/designer-realize/src/main/java/com/fr/design/mainframe/SheetNameTabPane.java index a15df052f..c4bb323bd 100644 --- a/designer-realize/src/main/java/com/fr/design/mainframe/SheetNameTabPane.java +++ b/designer-realize/src/main/java/com/fr/design/mainframe/SheetNameTabPane.java @@ -863,10 +863,10 @@ public class SheetNameTabPane extends JComponent implements MouseListener, Mouse } int count = reportComposite.getEditingWorkBook().getReportCount(); if (count <= 1) { - JOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(reportComposite), com.fr.design.i18n.Toolkit.i18nText("At_least_one_visual_worksheet") + "！"); + JOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(reportComposite), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_At_Least_One_Visual_Worksheet") + "！"); return; } - int returnValue = JOptionPane.showConfirmDialog(SwingUtilities.getWindowAncestor(reportComposite), com.fr.design.i18n.Toolkit.i18nText("Des-Remove_WorkSheet"), ProductConstants.APP_NAME, + int returnValue = JOptionPane.showConfirmDialog(SwingUtilities.getWindowAncestor(reportComposite), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Des_Remove_Work_Sheet"), ProductConstants.APP_NAME, JOptionPane.OK_CANCEL_OPTION); if (returnValue == JOptionPane.OK_OPTION) { if (DesignerContext.getFormatState() != DesignerContext.FORMAT_STATE_NULL) { 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 a16bceaa4..1a4f05b7e 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 @@ -47,7 +47,7 @@ class CptApp extends AbstractWorkBookApp { if (XMLEncryptUtils.isCptEncoded() && !XMLEncryptUtils.checkVaild(DesignerEnvManager.getEnvManager().getEncryptionKey())) { if (!new DecodeDialog(file).isPwdRight()) { - FRContext.getLogger().error(com.fr.design.i18n.Toolkit.i18nText("ECP-error_pwd")); + FRContext.getLogger().error(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_ECP_Error_Pwd")); return new WorkBook(); } } diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/CellExpandAttrPane.java b/designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/CellExpandAttrPane.java index 6d00c4e1f..2c673c78f 100644 --- a/designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/CellExpandAttrPane.java +++ b/designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/CellExpandAttrPane.java @@ -43,7 +43,7 @@ public class CellExpandAttrPane extends AbstractCellAttrPane { * @return */ public JPanel createContentPane() { - String[] nameArray = {com.fr.design.i18n.Toolkit.i18nText("ExpandD-Not_Expand"), com.fr.design.i18n.Toolkit.i18nText("Utils-Top_to_Bottom"), com.fr.design.i18n.Toolkit.i18nText("Utils-Left_to_Right")}; + String[] nameArray = {com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_ExpandD_Not_Expand"), com.fr.design.i18n.Toolkit.i18nText("Utils-Top_to_Bottom"), com.fr.design.i18n.Toolkit.i18nText("Utils-Left_to_Right")}; Icon[][] iconArray = { {BaseUtils.readIcon("/com/fr/design/images/expand/none16x16.png"), BaseUtils.readIcon("/com/fr/design/images/expand/none16x16_selected@1x.png")}, {BaseUtils.readIcon("/com/fr/design/images/expand/vertical.png"), BaseUtils.readIcon("/com/fr/design/images/expand/vertical_selected@1x.png")}, @@ -54,8 +54,8 @@ public class CellExpandAttrPane extends AbstractCellAttrPane { expandDirectionButton.setAllToolTips(nameArray); leftFatherPane = new ExpandLeftFatherPane(); rightFatherPane = new ExpandUpFatherPane(); - horizontalExpandableCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("ExpandD-Horizontal_Extendable")); - verticalExpandableCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("ExpandD-Vertical_Extendable")); + horizontalExpandableCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_ExpandD_Horizontal_Extendable")); + verticalExpandableCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_ExpandD_Vertical_Extendable")); sortAfterExpand = new SortExpandAttrPane(); initAllNames(); return layoutPane(); @@ -237,7 +237,7 @@ public class CellExpandAttrPane extends AbstractCellAttrPane { * @return */ public String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("ExpandD-Expand_Attribute"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_ExpandD_Expand_Attribute"); } diff --git a/designer-realize/src/main/java/com/fr/design/present/BarCodePane.java b/designer-realize/src/main/java/com/fr/design/present/BarCodePane.java index e0cbd723c..966c72efd 100644 --- a/designer-realize/src/main/java/com/fr/design/present/BarCodePane.java +++ b/designer-realize/src/main/java/com/fr/design/present/BarCodePane.java @@ -80,7 +80,7 @@ public class BarCodePane extends FurtherBasicBeanPane { initVersionComboBox(); initErrorCorrectComboBox(); - drawingTextCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("BarCodeD-Drawing_Text")); + drawingTextCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Bar_CodeD_Drawing_Text")); drawingTextCheckBox.setSelected(true); double p = TableLayout.PREFERRED; double f = TableLayout.FILL; diff --git a/designer-realize/src/main/java/com/fr/design/present/CurrencyLinePane.java b/designer-realize/src/main/java/com/fr/design/present/CurrencyLinePane.java index 5ce431519..3fc4e981f 100644 --- a/designer-realize/src/main/java/com/fr/design/present/CurrencyLinePane.java +++ b/designer-realize/src/main/java/com/fr/design/present/CurrencyLinePane.java @@ -124,7 +124,7 @@ public class CurrencyLinePane extends FurtherBasicBeanPane * @return 同上 */ public String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("Currency_Line"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Currency_Line"); } /** 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 60b0a3b4d..8f7e4c78a 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 @@ -54,7 +54,7 @@ public class LayerReportPane extends BasicBeanPane { this.add(outlayerReportPane); outlayerReportPane.add(layerReportPane); JPanel isLayerReportBoxPanle = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane(); - isLayerReportBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Execute_Report_by_Layer_Engine")); + isLayerReportBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Execute_Report_by_Layer_Engine")); isLayerReportBox.setSelected(false); isLayerReportBoxPanle.add(isLayerReportBox); layerReportPane.add(isLayerReportBoxPanle); @@ -150,7 +150,7 @@ public class LayerReportPane extends BasicBeanPane { public void checkValid() throws Exception { if (isLayerReportBox.isSelected()) { if (!ReportUtils.isLayerReportUsable(worksheet)) { - int value = JOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("After_Changed_Some_Attributes_Are_Different") + "?", + int value = JOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_After_Changed_Some_Attributes_Are_Different") + "?", ProductConstants.PRODUCT_NAME, JOptionPane.YES_NO_OPTION); if (value != JOptionPane.YES_OPTION) { isLayerReportBox.setSelected(false); diff --git a/designer-realize/src/main/java/com/fr/design/report/RowColumnPane.java b/designer-realize/src/main/java/com/fr/design/report/RowColumnPane.java index 989b0ba8e..94267695e 100644 --- a/designer-realize/src/main/java/com/fr/design/report/RowColumnPane.java +++ b/designer-realize/src/main/java/com/fr/design/report/RowColumnPane.java @@ -38,9 +38,9 @@ public class RowColumnPane extends BasicPane { this.add(centerPane, BorderLayout.CENTER); centerPane.setBorder(BorderFactory.createEmptyBorder(6, 12, 6, 8)); - entireRowRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("EditRC-Entire_row")); + entireRowRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Edit_RC_Entire_Row")); entireRowRadioButton.setMnemonic('r'); - entireColRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("EditRC-Entire_column")); + entireColRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Edit_RC-Entire_Column")); entireColRadioButton.setMnemonic('c'); entireRowRadioButton.setSelected(true); 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 d684f6f84..fbc33c4ab 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 @@ -52,7 +52,7 @@ public class SubReportPane extends BasicPane { UIButton browseButton = new UIButton("..."); northPane.add(browseButton, BorderLayout.EAST); browseButton.setPreferredSize(new java.awt.Dimension(20, 20)); - browseButton.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Click_this_button")); + browseButton.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Click_this_button")); browseButton.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { diff --git a/designer-realize/src/main/java/com/fr/design/report/WordExportPane.java b/designer-realize/src/main/java/com/fr/design/report/WordExportPane.java index d5c9936a1..db3211c33 100644 --- a/designer-realize/src/main/java/com/fr/design/report/WordExportPane.java +++ b/designer-realize/src/main/java/com/fr/design/report/WordExportPane.java @@ -40,7 +40,7 @@ public class WordExportPane extends BasicPane { MultilineLabel wordLineLabel = new MultilineLabel(); wordLineLabel.setPreferredSize(new Dimension(250, 100)); - wordLineLabel.setText(com.fr.design.i18n.Toolkit.i18nText("alert_word")); + wordLineLabel.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Alert_Word")); wordLineLabel.setForeground(Color.RED); alertPane.add(wordLineLabel); diff --git a/designer-realize/src/main/java/com/fr/design/webattr/ErrorTemplatePane.java b/designer-realize/src/main/java/com/fr/design/webattr/ErrorTemplatePane.java index 798dfb39a..41ac5c521 100644 --- a/designer-realize/src/main/java/com/fr/design/webattr/ErrorTemplatePane.java +++ b/designer-realize/src/main/java/com/fr/design/webattr/ErrorTemplatePane.java @@ -38,7 +38,7 @@ public class ErrorTemplatePane extends BasicBeanPane { {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Template_Parameters") + ":"), null}, {new UILabel("message" + ":"), new UILabel(com.fr.design.i18n.Toolkit.i18nText("Verify-Message"))}, {new UILabel("charset" + ":"), new UILabel(com.fr.design.i18n.Toolkit.i18nText("Server_Charset"))}, - {new UILabel("exception" + ":"), new UILabel(com.fr.design.i18n.Toolkit.i18nText("Exception_StackTrace"))} + {new UILabel("exception" + ":"), new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Exception_Stack_Trace"))} }; JPanel northPane = TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize); diff --git a/designer-realize/src/main/java/com/fr/design/webattr/EventPane.java b/designer-realize/src/main/java/com/fr/design/webattr/EventPane.java index 3e4dceab0..6090c4878 100644 --- a/designer-realize/src/main/java/com/fr/design/webattr/EventPane.java +++ b/designer-realize/src/main/java/com/fr/design/webattr/EventPane.java @@ -96,7 +96,7 @@ public class EventPane extends BasicPane { @Override protected String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("Event_Set"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Event_Set"); } @@ -168,7 +168,7 @@ public class EventPane extends BasicPane { return; } - int val = JOptionPane.showConfirmDialog(EventPane.this, com.fr.design.i18n.Toolkit.i18nText("Are_You_Sure_To_Delete_The_Data") + "?", "Message", + int val = JOptionPane.showConfirmDialog(EventPane.this, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Are_You_Sure_To_Delete_The_Data") + "?", "Message", JOptionPane.YES_NO_OPTION); if (val != JOptionPane.YES_OPTION) { return; diff --git a/designer-realize/src/main/java/com/fr/design/webattr/SettingToolBar.java b/designer-realize/src/main/java/com/fr/design/webattr/SettingToolBar.java index 8fce63057..20a5a4f1f 100644 --- a/designer-realize/src/main/java/com/fr/design/webattr/SettingToolBar.java +++ b/designer-realize/src/main/java/com/fr/design/webattr/SettingToolBar.java @@ -31,7 +31,7 @@ public class SettingToolBar extends JPanel { this.add(new UILabel(name)); this.toolBarPane = toolBarPane; setButton = GUICoreUtils.createTransparentButton(setIcon, setIcon, setIcon); - setButton.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Edit_Button_ToolBar")); + setButton.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Edit_Button_ToolBar")); setButton.setAction(new SetAction()); delButton = GUICoreUtils.createTransparentButton(delIcon, delIcon, delIcon); delButton.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Remove_Button_ToolBar")); 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 6f9801c54..f4c566fb8 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 @@ -43,11 +43,11 @@ public class WebCssPane extends BasicPane { chooseFile = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Selection")); chooseFile.setPreferredSize(new Dimension(75, 23)); chooseFile.addActionListener(chooseFileListener); - northPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Disk_File") + ":"), FlowLayout.LEFT); + northPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Disk_File") + ":"), FlowLayout.LEFT); northPane.add(localText, FlowLayout.CENTER); northPane.add(chooseFile, FlowLayout.RIGHT); outnorth.add(northPane,BorderLayout.NORTH); - UILabel infor = new UILabel(com.fr.design.i18n.Toolkit.i18nText("CSS_warning")); + UILabel infor = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_CSS_Warning")); infor.setForeground(new Color(207, 42, 39)); outnorth.add(infor,BorderLayout.CENTER); this.add(outnorth, BorderLayout.NORTH); 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 8584516be..ab051dc58 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 @@ -51,7 +51,7 @@ public class WebJsPane extends BasicPane { this.setLayout(new BorderLayout(0, 20)); this.setBorder(BorderFactory.createEmptyBorder(10, 5, 0, 0)); - localFileRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Disk_File") + ":", true); + localFileRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Disk_File") + ":", true); urlFileRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Url_location")+ ":", false); ButtonGroup bg = new ButtonGroup(); bg.add(localFileRadioButton); @@ -125,7 +125,7 @@ public class WebJsPane extends BasicPane { if (url.matches("^[a-zA-z]+://.+js")) { return url; } else { - JOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(WebJsPane.this), com.fr.design.i18n.Toolkit.i18nText("Add_JS_warning")); + JOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(WebJsPane.this), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Add_JS_warning")); return ""; } } @@ -186,7 +186,7 @@ public class WebJsPane extends BasicPane { public void actionPerformed(ActionEvent arg0) { String uri = urlText.getText(); if (!uri.matches("^[a-zA-z]+://.+js")) { - JOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(WebJsPane.this), com.fr.design.i18n.Toolkit.i18nText("Add_JS_warning")); + JOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(WebJsPane.this), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Add_JS_warning")); return; } InputStream in = null; diff --git a/designer-realize/src/main/java/com/fr/design/widget/ui/ButtonGroupDictPane.java b/designer-realize/src/main/java/com/fr/design/widget/ui/ButtonGroupDictPane.java index 345b150d8..d8455b923 100644 --- a/designer-realize/src/main/java/com/fr/design/widget/ui/ButtonGroupDictPane.java +++ b/designer-realize/src/main/java/com/fr/design/widget/ui/ButtonGroupDictPane.java @@ -47,7 +47,7 @@ public class ButtonGroupDictPane extends JPanel { columnLabel.setVisible(!adaptiveCheckbox.isSelected()); } }); - this.columnLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Button-Group-Display-Columns") + ":"); + this.columnLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Button_Group_Display_Columns") + ":"); columnSpinner = new UIBasicSpinner(new SpinnerNumberModel(0, 0, Integer.MAX_VALUE, 1)); double f = TableLayout.FILL; diff --git a/designer-realize/src/main/java/com/fr/design/widget/ui/btn/DefineAppendColumnRowPane.java b/designer-realize/src/main/java/com/fr/design/widget/ui/btn/DefineAppendColumnRowPane.java index 7a07384a7..5688e182c 100644 --- a/designer-realize/src/main/java/com/fr/design/widget/ui/btn/DefineAppendColumnRowPane.java +++ b/designer-realize/src/main/java/com/fr/design/widget/ui/btn/DefineAppendColumnRowPane.java @@ -41,10 +41,10 @@ public class DefineAppendColumnRowPane extends BasicPane { crEditor = new ColumnRowEditor(); jNumberEditor = new UISpinner(0, 100 , 1, 0); - rowCountLable = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Edit-Row_Count")); + rowCountLable = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Edit_Row_Count")); JPanel lpane = FRGUIPaneFactory.createBorderLayout_S_Pane(); lpane.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0)); - UILabel label = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Append_Delete_Row_Message")); + UILabel label = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Append_Delete_Row_Message")); label.setForeground(new Color(0x8F8F92)); lpane.add(label); Component[][] components = { { new UILabel(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Specify", "Cell"})), crEditor }, { rowCountLable, jNumberEditor } ,{lpane,null}}; diff --git a/designer-realize/src/main/java/com/fr/design/widget/ui/btn/DefineDeleteColumnRowPane.java b/designer-realize/src/main/java/com/fr/design/widget/ui/btn/DefineDeleteColumnRowPane.java index 0793f8ad5..54ac18855 100644 --- a/designer-realize/src/main/java/com/fr/design/widget/ui/btn/DefineDeleteColumnRowPane.java +++ b/designer-realize/src/main/java/com/fr/design/widget/ui/btn/DefineDeleteColumnRowPane.java @@ -35,7 +35,7 @@ public class DefineDeleteColumnRowPane extends BasicPane { double rowSize[] = { p, p}; double columnSize[] = { p, f}; crEditor = new ColumnRowEditor(); - UILabel messageLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Append_Delete_Row_Message")); + UILabel messageLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Append_Delete_Row_Message")); messageLabel.setForeground(new Color(0x8F8F92)); Component[][] components = { { new UILabel(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Specify", "Cell"})), crEditor }, diff --git a/designer-realize/src/main/java/com/fr/grid/selection/CellSelection.java b/designer-realize/src/main/java/com/fr/grid/selection/CellSelection.java index cff3f5ddc..efd7d344d 100644 --- a/designer-realize/src/main/java/com/fr/grid/selection/CellSelection.java +++ b/designer-realize/src/main/java/com/fr/grid/selection/CellSelection.java @@ -385,7 +385,7 @@ public class CellSelection extends Selection { TemplateElementCase ec = ePane.getEditingElementCase(); Iterator cells = ec.intersect(column, row, columnSpan, rowSpan); if (cells.hasNext()) { // alex:有两个以上的格子在这个区域内 - int returnValue = JOptionPane.showConfirmDialog(SwingUtilities.getWindowAncestor(ePane), com.fr.design.i18n.Toolkit.i18nText("Des-Merger_Cell"), com.fr.design.i18n.Toolkit.i18nText("Utils-Merge_Cell"), + int returnValue = JOptionPane.showConfirmDialog(SwingUtilities.getWindowAncestor(ePane), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Des_Merger_Cell"), com.fr.design.i18n.Toolkit.i18nText("Utils-Merge_Cell"), JOptionPane.OK_CANCEL_OPTION); if (returnValue != JOptionPane.OK_OPTION) { return false; 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 2f4582cc2..aa0873c72 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 @@ -570,8 +570,8 @@ public class CellDSColumnEditor extends CellQuickEditor { //可扩展性 JPanel extendableDirectionPane = FRGUIPaneFactory.createYBoxEmptyBorderPane(); - extendableDirectionPane.add(heCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("ExpandD-Horizontal_Extendable"))); - extendableDirectionPane.add(veCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("ExpandD-Vertical_Extendable"))); + extendableDirectionPane.add(heCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_ExpandD_Horizontal_Extendable"))); + extendableDirectionPane.add(veCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_ExpandD_Vertical_Extendable"))); //补充空白数据 JPanel multiNumPane = FRGUIPaneFactory.createYBoxEmptyBorderPane(); @@ -582,7 +582,7 @@ public class CellDSColumnEditor extends CellQuickEditor { multiNumSpinner = new UISpinner(1, 10000, 1, 1); //数据倍数 - UILabel multipleLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Column_Multiple")); + UILabel multipleLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Column_Multiple")); multiPane = TableLayoutHelper.createGapTableLayoutPane(new Component[][]{ new Component[]{ multipleLabel, multiNumSpinner @@ -849,12 +849,12 @@ public class CellDSColumnEditor extends CellQuickEditor { public ResultSetFilterConfigPane() { this.setLayout(FRGUIPaneFactory.createBorderLayout()); - UILabel filterLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("BindColumn-Results_Filter")); + UILabel filterLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Bind_Column_Results_Filter")); //结果集筛选下拉框 rsComboBox = new UIComboBox(new String[]{ com.fr.design.i18n.Toolkit.i18nText("Undefined"), - com.fr.design.i18n.Toolkit.i18nText("BindColumn-Top_N"), - com.fr.design.i18n.Toolkit.i18nText("BindColumn-Bottom_N"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Bind_Column_Top_N"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Bind_Column_Bottom_N"), com.fr.design.i18n.Toolkit.i18nText("Odd"), com.fr.design.i18n.Toolkit.i18nText("Even"), com.fr.design.i18n.Toolkit.i18nText("Specify") diff --git a/designer-realize/src/main/java/com/fr/start/CollectUserInformationDialog.java b/designer-realize/src/main/java/com/fr/start/CollectUserInformationDialog.java index b9f8b9125..5d25e29ea 100644 --- a/designer-realize/src/main/java/com/fr/start/CollectUserInformationDialog.java +++ b/designer-realize/src/main/java/com/fr/start/CollectUserInformationDialog.java @@ -157,7 +157,7 @@ public class CollectUserInformationDialog extends UIDialog { JPanel buttonsPane = FRGUIPaneFactory.createRightFlowInnerContainer_S_Pane(); controlPane.add(buttonsPane, BorderLayout.EAST); - UIButton finishButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Collect-Use_Designer")); + UIButton finishButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Collect_Use_Designer")); finishButton.setMnemonic('F'); buttonsPane.add(finishButton); finishButton.addActionListener(verifyActionListener); From 77073f89c6c0539c90c45167198675f52e96a8bb Mon Sep 17 00:00:00 2001 From: "alex.sung" Date: Fri, 10 Aug 2018 14:33:44 +0800 Subject: [PATCH 11/18] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E5=9B=BD=E9=99=85?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/fr/grid/selection/CellSelection.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/designer-realize/src/main/java/com/fr/grid/selection/CellSelection.java b/designer-realize/src/main/java/com/fr/grid/selection/CellSelection.java index efd7d344d..6ec869e5c 100644 --- a/designer-realize/src/main/java/com/fr/grid/selection/CellSelection.java +++ b/designer-realize/src/main/java/com/fr/grid/selection/CellSelection.java @@ -385,7 +385,7 @@ public class CellSelection extends Selection { TemplateElementCase ec = ePane.getEditingElementCase(); Iterator cells = ec.intersect(column, row, columnSpan, rowSpan); if (cells.hasNext()) { // alex:有两个以上的格子在这个区域内 - int returnValue = JOptionPane.showConfirmDialog(SwingUtilities.getWindowAncestor(ePane), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Des_Merger_Cell"), com.fr.design.i18n.Toolkit.i18nText("Utils-Merge_Cell"), + int returnValue = JOptionPane.showConfirmDialog(SwingUtilities.getWindowAncestor(ePane), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Des_Merger_Cell"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Utils_Merge_Cell"), JOptionPane.OK_CANCEL_OPTION); if (returnValue != JOptionPane.OK_OPTION) { return false; From d2a54a881f8969b251c34b342707ef7cc24d14a9 Mon Sep 17 00:00:00 2001 From: Jinbokai Date: Fri, 10 Aug 2018 15:00:32 +0800 Subject: [PATCH 12/18] =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E5=8C=96=20Signed-off-?= =?UTF-8?q?by:=20Jinbokai=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 Date: Fri, 10 Aug 2018 15:05:46 +0800 Subject: [PATCH 13/18] =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E5=8C=96=20Signed-off-?= =?UTF-8?q?by:=20Jinbokai=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jinbokai --- .../main/java/com/fr/design/mainframe/AuthorityToolBarPane.java | 1 - .../src/main/java/com/fr/design/webattr/WriteWebSettingPane.java | 1 - 2 files changed, 2 deletions(-) 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 25db827d5..9041a44e3 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 @@ -272,7 +272,6 @@ public class AuthorityToolBarPane extends BasicBeanPane { unloadCheck = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Unload_Check")); unloadCheck.setSelected(true); -// showWidgets = new UICheckBox(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"FR-Engine_Event_showWidgets"})); showWidgets = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Event_Show_Widgets")); showWidgets.setSelected(false); isAutoStash = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Write_Auto_Stash")); From 836eb7b463a7fd0d9f0dd6c8c35aba844eba7061 Mon Sep 17 00:00:00 2001 From: Jinbokai Date: Fri, 10 Aug 2018 15:10:21 +0800 Subject: [PATCH 14/18] =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E5=8C=96=20Signed-off-?= =?UTF-8?q?by:=20Jinbokai=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jinbokai --- .../java/com/fr/design/dscolumn/SpecifiedGroupAttrPane.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/designer-realize/src/main/java/com/fr/design/dscolumn/SpecifiedGroupAttrPane.java b/designer-realize/src/main/java/com/fr/design/dscolumn/SpecifiedGroupAttrPane.java index 62b42ac34..ef493c022 100644 --- a/designer-realize/src/main/java/com/fr/design/dscolumn/SpecifiedGroupAttrPane.java +++ b/designer-realize/src/main/java/com/fr/design/dscolumn/SpecifiedGroupAttrPane.java @@ -321,8 +321,8 @@ public class SpecifiedGroupAttrPane extends BasicPane { contentPane.add(northPane); modeComboBox = new UIComboBox(displayModeNames); - northPane.add(GUICoreUtils.createFlowPane(new JComponent[]{new UILabel(InsertText), new UILabel(com.fr.design.i18n.Toolkit.i18nText("Display_Modes") + ": "), - modeComboBox}, FlowLayout.LEFT), BorderLayout.WEST); + northPane.add(GUICoreUtils.createFlowPane(new JComponent[] { new UILabel(InsertText), new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Display_Modes") + ": "), + modeComboBox }, FlowLayout.LEFT), BorderLayout.WEST); UILabel label = new UILabel("="); label.setFont(new Font("Dialog", Font.BOLD, 12)); From 87454555966b81d10414db17e568da60169ee683 Mon Sep 17 00:00:00 2001 From: Jinbokai Date: Fri, 10 Aug 2018 15:37:32 +0800 Subject: [PATCH 15/18] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=8B=BC=E6=8E=A5?= =?UTF-8?q?=E5=AD=97=E7=AC=A6=20Signed-off-by:=20Jinbokai=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jinbokai --- .../java/com/fr/design/dscolumn/SpecifiedGroupAttrPane.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/designer-realize/src/main/java/com/fr/design/dscolumn/SpecifiedGroupAttrPane.java b/designer-realize/src/main/java/com/fr/design/dscolumn/SpecifiedGroupAttrPane.java index 160ce61c0..2eb13fc66 100644 --- a/designer-realize/src/main/java/com/fr/design/dscolumn/SpecifiedGroupAttrPane.java +++ b/designer-realize/src/main/java/com/fr/design/dscolumn/SpecifiedGroupAttrPane.java @@ -88,7 +88,7 @@ public class SpecifiedGroupAttrPane extends BasicPane { protected void initComponents() { this.setLayout(FRGUIPaneFactory.createBorderLayout()); specifiedComboBox = new UIComboBox(new String[] { - com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Condition", "Group"}), com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Formula", "Group"}) + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Condition_Group"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Formula_Group") }); specifiedComboBox.addItemListener(new ItemListener() { @@ -359,7 +359,7 @@ public class SpecifiedGroupAttrPane extends BasicPane { }); southPane = GUICoreUtils.createFlowPane(new JComponent[] {new UILabel(InsertText), //new UILabel(com.fr.design.i18n.Toolkit.i18nText("I-Message_FunctionGrouper_2")), - new UILabel(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Custom", "Value"}) + ": "), label, valueField, formulaButton}, FlowLayout.LEFT); + new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Custom_Value") + ": "), label, valueField, formulaButton}, FlowLayout.LEFT); contentPane.add(southPane); } From cabdf27ef9d0d53001e6e86d392c7ea739fd54b6 Mon Sep 17 00:00:00 2001 From: Harrison Date: Fri, 10 Aug 2018 15:46:45 +0800 Subject: [PATCH 16/18] =?UTF-8?q?REPORT-10025=2010.0=20&=205.0=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E4=BE=9D=E6=8D=AE=E5=9B=BD=E9=99=85=E5=8C=96=E8=A7=84?= =?UTF-8?q?=E8=8C=83=E8=B0=83=E6=95=B4=E5=9B=BD=E9=99=85=E5=8C=96=E5=86=85?= =?UTF-8?q?=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../design/actions/community/BBSAction.java | 2 +- .../design/actions/community/BugAction.java | 2 +- .../design/actions/community/NeedAction.java | 2 +- .../actions/community/QuestionAction.java | 2 +- .../design/actions/community/SignAction.java | 2 +- .../fr/design/actions/community/UpAction.java | 2 +- .../fr/design/actions/file/LocalePane.java | 6 +-- .../fr/design/actions/help/AboutDialog.java | 2 +- .../fr/design/actions/help/ForumAction.java | 4 +- .../design/actions/help/SupportQQAction.java | 6 +-- .../design/condition/LiteConditionPane.java | 8 ++-- .../data/datapane/TableDataTreePane.java | 2 +- .../data/datapane/connect/JDBCDefPane.java | 2 +- .../EmbeddedTableDataDefinedPane.java | 2 +- .../tabledatapane/EmbeddedTableDataPane.java | 4 +- .../tabledatapane/FileTableDataPane.java | 2 +- .../StoreProcedureTableModel.java | 4 +- .../fr/design/file/SaveSomeTemplatePane.java | 2 +- .../com/fr/design/formula/JavaEditorPane.java | 4 +- .../fr/design/gui/HyperlinkFilterHelper.java | 2 +- .../gui/controlpane/JListControlPane.java | 4 +- .../gui/controlpane/UIListControlPane.java | 4 +- .../controlpane/UISimpleListControlPane.java | 4 +- .../fr/design/gui/core/WidgetConstants.java | 8 ++-- .../fr/design/gui/date/UICalendarPanel.java | 10 ++--- .../gui/frpane/EditingStringListPane.java | 38 +++++++++---------- .../fr/design/gui/frpane/ImgChoosePane.java | 4 +- .../design/gui/frpane/JTreeAutoBuildPane.java | 4 +- .../design/gui/frpane/JTreeControlPane.java | 4 +- .../gui/frpane/UICorrelationComboBoxPane.java | 4 +- .../design/gui/frpane/UINumberDragPane.java | 4 +- .../fr/design/gui/frpane/UITabbedPane.java | 4 +- .../layer/config/LayerDataControlPane.java | 2 +- .../gui/icombobox/AlignmentComboBox.java | 10 ++--- .../gui/icombobox/DictionaryConstants.java | 8 ++-- .../gui/icombobox/SortOrderComboBox.java | 13 +++---- .../fr/design/gui/imenutable/UIMenuTable.java | 4 +- .../design/gui/imenutable/UIMenuTableUI.java | 4 +- .../com/fr/design/gui/itable/UITableUI.java | 4 +- .../itableeditorpane/UITableEditorPane.java | 4 +- .../itableeditorpane/UITableModelAdapter.java | 8 ++-- .../itree/refreshabletree/TreeRootPane.java | 21 +++++----- .../hyperlink/ReportletHyperlinkPane.java | 2 +- .../fr/design/hyperlink/WebHyperlinkPane.java | 6 +-- .../com/fr/design/javascript/EmailPane.java | 6 +-- .../javascript/FormSubmitJavaScriptPane.java | 31 +++++++-------- .../javascript/ParameterJavaScriptPane.java | 4 +- .../GradientBackgroundQuickPane.java | 6 +-- .../ImageBackgroundQuickPane.java | 2 +- .../mainframe/loghandler/LogHandlerBarUI.java | 4 +- .../widget/wrappers/BackgroundWrapper.java | 6 +-- .../roleAuthority/ReportAndFSManagePane.java | 2 +- .../fr/design/roleAuthority/RoleSourceOP.java | 2 +- .../com/fr/design/style/AlignmentPane.java | 24 ++++++------ .../java/com/fr/design/style/FRFontPane.java | 4 +- .../java/com/fr/design/style/FormatBox.java | 4 +- .../java/com/fr/design/style/FormatPane.java | 4 +- .../background/BackgroundUIComboBoxPane.java | 4 +- .../gradient/GradientFromToPixPane.java | 2 +- .../gradient/GradientSelectBox.java | 4 +- .../background/image/ImageSelectPane.java | 8 ++-- .../com/fr/design/utils/gui/GUICoreUtils.java | 4 +- .../fr/design/widget/btn/ButtonConstants.java | 4 +- .../widget/component/CheckBoxDictPane.java | 6 +-- .../write/submit/DBManipulationPane.java | 2 +- .../write/submit/SubmitJobListPane.java | 2 +- .../java/com/fr/env/RemoteSignInPane.java | 4 +- .../java/com/fr/file/FILEChooserPane.java | 2 +- .../fr/start/server/ServerManageFrame.java | 6 +-- .../chart/javascript/ChartEmailPane.java | 10 ++--- .../SeriesCondition/dlp/DataLabelPane.java | 10 ++--- .../dlp/RangeDataLabelPane.java | 6 +-- .../impl/FormHyperlinkNorthPane.java | 4 +- .../impl/FormHyperlinkPane.java | 4 +- .../mainframe/chart/PaneTitleConstants.java | 6 +-- .../GanttPlotReportDataContentPane.java | 4 +- .../other/ChartDesignerInteractivePane.java | 4 +- .../chart/gui/other/TimeSwitchPane.java | 6 +-- .../chart/gui/style/ChartAxisLabelPane.java | 6 +-- .../gui/style/ChartAxisLineStylePane.java | 2 +- .../chart/gui/style/ChartBeautyPane.java | 2 +- .../chart/gui/style/DateAxisValuePane.java | 6 +-- .../gui/style/area/DefaultAxisAreaPane.java | 10 ++--- .../style/datalabel/ChartDataLabelPane.java | 4 +- .../gui/style/legend/ChartLegendPane.java | 4 +- .../gui/style/series/MeterSeriesPane.java | 2 +- .../chart/gui/type/XYScatterPlotPane.java | 6 +-- .../background/VanChartGradientPane.java | 4 +- .../design/designer/creator/XTreeEditor.java | 8 ++-- .../creator/XWriteAbleRepeatEditor.java | 4 +- .../properties/FRBorderLayoutConstraints.java | 2 +- .../FRBorderLayoutPropertiesGroupModel.java | 21 +++++----- .../FormWidgetAuthorityEditPane.java | 2 +- .../HorizontalLayoutPropertiesGroupModel.java | 4 +- .../properties/VerticalBoxProperties.java | 17 ++++----- .../properties/VerticalSplitProperties.java | 4 +- .../properties/items/UnderlineItems.java | 6 +-- .../items/WidgetDisplayPositionItems.java | 6 +-- .../design/form/javascript/FormEmailPane.java | 6 +-- .../design/gui/xpane/JTreeAutoBuildPane.java | 4 +- .../fr/design/mainframe/FormEditToolBar.java | 4 +- .../com/fr/design/mainframe/FormParaPane.java | 4 +- .../mainframe/WLayoutSelectionPane.java | 2 +- .../widget/accessibles/ColorPalette.java | 2 +- .../widget/wrappers/ParameterWrapper.java | 4 +- .../ui/designer/DateEditorDefinePane.java | 10 ++--- .../ui/designer/TreeEditorDefinePane.java | 4 +- .../actions/cell/style/AlignmentAction.java | 5 +-- .../actions/columnrow/ColumnHideAction.java | 4 +- .../actions/columnrow/RowHideAction.java | 4 +- .../utils/DeprecatedActionManager.java | 2 +- .../fr/design/condition/HyperlinkPane.java | 2 +- .../design/dscolumn/DSColumnAdvancedPane.java | 6 +-- .../dscolumn/SelectedDataColumnPane.java | 2 +- .../fr/design/expand/ConditionParentPane.java | 2 +- .../fr/design/expand/ExpandDirectionPane.java | 23 +++++------ .../fr/design/expand/SortExpandAttrPane.java | 19 +++++----- .../headerfooter/HFAttributesEditDialog.java | 2 +- .../fr/design/headerfooter/HFComponent.java | 4 +- .../com/fr/design/headerfooter/ImagePane.java | 5 +-- .../fr/design/mainframe/ElementCasePane.java | 9 ++--- .../mainframe/SheetAuthorityEditPane.java | 2 +- .../fr/design/mainframe/SheetNameTabPane.java | 2 +- .../cell/settingpane/CellExpandAttrPane.java | 2 +- .../com/fr/design/present/BarCodePane.java | 2 +- .../fr/design/present/CurrencyLinePane.java | 6 +-- .../com/fr/design/report/PageSetupPane.java | 2 +- .../com/fr/design/report/SelectImagePane.java | 6 +-- .../com/fr/design/report/SubReportPane.java | 2 +- .../design/report/freeze/FreezePagePane.java | 4 +- .../report/freeze/FreezeWriteRowPane.java | 4 +- .../design/report/freeze/RepeatRowPane.java | 4 +- .../java/com/fr/design/style/StylePane.java | 4 +- .../com/fr/design/webattr/CommonPane.java | 4 +- .../com/fr/design/webattr/EditToolBar.java | 6 +-- .../fr/design/webattr/ErrorTemplatePane.java | 17 ++++----- .../webattr/ReportWebWidgetConstants.java | 6 +-- .../design/webattr/ReportWriteAttrPane.java | 2 +- .../fr/design/webattr/ServerPrinterPane.java | 4 +- .../printsettings/PageMarginSettingPane.java | 2 +- .../widget/ui/DateEditorDefinePane.java | 10 ++--- .../design/widget/ui/MultiFileEditorPane.java | 2 +- .../ui/btn/AppendRowButtonDefinePane.java | 4 +- .../ui/btn/DeleteRowButtonDefinePane.java | 4 +- .../com/fr/quickeditor/CellQuickEditor.java | 2 +- .../cellquick/CellDSColumnEditor.java | 6 +-- .../fr/start/module/DesignerActivator.java | 6 +-- 147 files changed, 393 insertions(+), 412 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/actions/community/BBSAction.java b/designer-base/src/main/java/com/fr/design/actions/community/BBSAction.java index 778ecc2a7..9b689bc97 100644 --- a/designer-base/src/main/java/com/fr/design/actions/community/BBSAction.java +++ b/designer-base/src/main/java/com/fr/design/actions/community/BBSAction.java @@ -44,7 +44,7 @@ public class BBSAction extends UpdateAction try { Desktop.getDesktop().browse(new URI(url)); } catch (IOException exp) { - JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("Set_default_browser")); + JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Set_Default_Browser")); FineLoggerFactory.getLogger().error(exp.getMessage(), exp); } catch (URISyntaxException exp) { FineLoggerFactory.getLogger().error(exp.getMessage(), exp); diff --git a/designer-base/src/main/java/com/fr/design/actions/community/BugAction.java b/designer-base/src/main/java/com/fr/design/actions/community/BugAction.java index e7c08b3fa..b22093060 100644 --- a/designer-base/src/main/java/com/fr/design/actions/community/BugAction.java +++ b/designer-base/src/main/java/com/fr/design/actions/community/BugAction.java @@ -38,7 +38,7 @@ public void actionPerformed(ActionEvent arg0) try { Desktop.getDesktop().browse(new URI(url)); } catch (IOException exp) { - JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("Set_default_browser")); + JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Set_Default_Browser")); FineLoggerFactory.getLogger().error(exp.getMessage(), exp); } catch (URISyntaxException exp) { FineLoggerFactory.getLogger().error(exp.getMessage(), exp); diff --git a/designer-base/src/main/java/com/fr/design/actions/community/NeedAction.java b/designer-base/src/main/java/com/fr/design/actions/community/NeedAction.java index 8dd07ea27..c49a484f7 100644 --- a/designer-base/src/main/java/com/fr/design/actions/community/NeedAction.java +++ b/designer-base/src/main/java/com/fr/design/actions/community/NeedAction.java @@ -39,7 +39,7 @@ public class NeedAction extends UpdateAction try { Desktop.getDesktop().browse(new URI(url)); } catch (IOException exp) { - JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("Set_default_browser")); + JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Set_Default_Browser")); FineLoggerFactory.getLogger().error(exp.getMessage(), exp); } catch (URISyntaxException exp) { FineLoggerFactory.getLogger().error(exp.getMessage(), exp); diff --git a/designer-base/src/main/java/com/fr/design/actions/community/QuestionAction.java b/designer-base/src/main/java/com/fr/design/actions/community/QuestionAction.java index 2589d0872..390827f16 100644 --- a/designer-base/src/main/java/com/fr/design/actions/community/QuestionAction.java +++ b/designer-base/src/main/java/com/fr/design/actions/community/QuestionAction.java @@ -38,7 +38,7 @@ public void actionPerformed(ActionEvent arg0) try { Desktop.getDesktop().browse(new URI(url)); } catch (IOException exp) { - JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("Set_default_browser")); + JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Set_Default_Browser")); FineLoggerFactory.getLogger().error(exp.getMessage(), exp); } catch (URISyntaxException exp) { FineLoggerFactory.getLogger().error(exp.getMessage(), exp); diff --git a/designer-base/src/main/java/com/fr/design/actions/community/SignAction.java b/designer-base/src/main/java/com/fr/design/actions/community/SignAction.java index b3ce597a4..fe59c01f5 100644 --- a/designer-base/src/main/java/com/fr/design/actions/community/SignAction.java +++ b/designer-base/src/main/java/com/fr/design/actions/community/SignAction.java @@ -39,7 +39,7 @@ public class SignAction extends UpdateAction try { Desktop.getDesktop().browse(new URI(url)); } catch (IOException exp) { - JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("Set_default_browser")); + JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Set_Default_Browser")); FineLoggerFactory.getLogger().error(exp.getMessage(), exp); } catch (URISyntaxException exp) { FineLoggerFactory.getLogger().error(exp.getMessage(), exp); diff --git a/designer-base/src/main/java/com/fr/design/actions/community/UpAction.java b/designer-base/src/main/java/com/fr/design/actions/community/UpAction.java index 402afc304..d1baef84f 100644 --- a/designer-base/src/main/java/com/fr/design/actions/community/UpAction.java +++ b/designer-base/src/main/java/com/fr/design/actions/community/UpAction.java @@ -39,7 +39,7 @@ public class UpAction extends UpdateAction try { Desktop.getDesktop().browse(new URI(url)); } catch (IOException exp) { - JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("Set_default_browser")); + JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Set_Default_Browser")); FineLoggerFactory.getLogger().error(exp.getMessage(), exp); } catch (URISyntaxException exp) { FineLoggerFactory.getLogger().error(exp.getMessage(), exp); diff --git a/designer-base/src/main/java/com/fr/design/actions/file/LocalePane.java b/designer-base/src/main/java/com/fr/design/actions/file/LocalePane.java index ee1592486..634af28b9 100644 --- a/designer-base/src/main/java/com/fr/design/actions/file/LocalePane.java +++ b/designer-base/src/main/java/com/fr/design/actions/file/LocalePane.java @@ -146,7 +146,7 @@ public class LocalePane extends BasicPane { keyVector.addAll(sortKeys); - predefineTableModel.addColumn(com.fr.design.i18n.Toolkit.i18nText("Key"), keyVector); + predefineTableModel.addColumn(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Key"), keyVector); for (Map.Entry> entry : data.entrySet()) { predefineTableModel.addColumn(entry.getKey().getDisplayName(), entry.getValue()); } @@ -161,7 +161,7 @@ public class LocalePane extends BasicPane { List list = new ArrayList(); Set keys = new HashSet(); - customTableModel.addColumn(com.fr.design.i18n.Toolkit.i18nText("Key")); + customTableModel.addColumn(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Key")); for (FileNode fileNode : fileNodes) { String fileName = fileNode.getName(); if (fileName.endsWith(".properties")) { @@ -220,4 +220,4 @@ public class LocalePane extends BasicPane { protected String title4PopupWindow() { return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Preference_Locale"); } -} \ 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 af62e25fc..b4b6d53c6 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 @@ -47,7 +47,7 @@ public class AboutDialog extends JDialog implements ActionListener { sysPane = new SystemInfoPane(); tabbedPane.addTab(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_About"), aboutPanel); - tabbedPane.addTab(com.fr.design.i18n.Toolkit.i18nText("System"), sysPane); + tabbedPane.addTab(com.fr.design.i18n.Toolkit.i18nText("FIne-Design_Basic_System"), sysPane); buttonPanel = FRGUIPaneFactory.createRightFlowInnerContainer_S_Pane(); buttonPanel.add(okButton); diff --git a/designer-base/src/main/java/com/fr/design/actions/help/ForumAction.java b/designer-base/src/main/java/com/fr/design/actions/help/ForumAction.java index ebfb10083..621e05578 100644 --- a/designer-base/src/main/java/com/fr/design/actions/help/ForumAction.java +++ b/designer-base/src/main/java/com/fr/design/actions/help/ForumAction.java @@ -48,7 +48,7 @@ public class ForumAction extends UpdateAction { try { Desktop.getDesktop().browse(new URI(url)); } catch (IOException exp) { - JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("Set_default_browser")); + JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Set_Default_Browser")); FineLoggerFactory.getLogger().error(exp.getMessage(), exp); } catch (URISyntaxException exp) { FineLoggerFactory.getLogger().error(exp.getMessage(), exp); @@ -74,4 +74,4 @@ public class ForumAction extends UpdateAction { return null; } }; -} \ No newline at end of file +} diff --git a/designer-base/src/main/java/com/fr/design/actions/help/SupportQQAction.java b/designer-base/src/main/java/com/fr/design/actions/help/SupportQQAction.java index 6e08a7258..a118f9d87 100644 --- a/designer-base/src/main/java/com/fr/design/actions/help/SupportQQAction.java +++ b/designer-base/src/main/java/com/fr/design/actions/help/SupportQQAction.java @@ -37,7 +37,7 @@ public class SupportQQAction extends UpdateAction { try { Desktop.getDesktop().browse(new URI(ProductConstants.SUPPORT_QQ)); } catch (IOException exp) { - JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("Set_default_browser")); + JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Set_Default_Browser")); FineLoggerFactory.getLogger().error(exp.getMessage(), exp); } catch (URISyntaxException exp) { FineLoggerFactory.getLogger().error(exp.getMessage(), exp); @@ -52,7 +52,7 @@ public class SupportQQAction extends UpdateAction { @Override public String getMenuName() { - return com.fr.design.i18n.Toolkit.i18nText("Support_QQ"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Support_QQ"); } @Override @@ -60,4 +60,4 @@ public class SupportQQAction extends UpdateAction { return null; } }; -} \ No newline at end of file +} diff --git a/designer-base/src/main/java/com/fr/design/condition/LiteConditionPane.java b/designer-base/src/main/java/com/fr/design/condition/LiteConditionPane.java index 29a030870..5d8c13a84 100644 --- a/designer-base/src/main/java/com/fr/design/condition/LiteConditionPane.java +++ b/designer-base/src/main/java/com/fr/design/condition/LiteConditionPane.java @@ -223,7 +223,7 @@ public abstract class LiteConditionPane extends BasicBeanPa } int returnVal = JOptionPane.showConfirmDialog(SwingUtilities.getWindowAncestor(LiteConditionPane.this), - com.fr.design.i18n.Toolkit.i18nText("Utils-Are_you_sure_to_remove_the_selected_item") + "?", com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Remove"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Utils_Are_You_Sure_To_Remove_The_Selected_Item") + "?", com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Remove"), JOptionPane.OK_CANCEL_OPTION); if (returnVal == JOptionPane.OK_OPTION) { DefaultTreeModel treeModel = (DefaultTreeModel) conditionsTree.getModel(); @@ -453,12 +453,12 @@ public abstract class LiteConditionPane extends BasicBeanPa removeButton.setEnabled(false); removeButton.addActionListener(actionListener3); - moveUpButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Utils-Move_Up")); + moveUpButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Utils_Move_Up")); buttonPane.add(moveUpButton); moveUpButton.setIcon(BaseUtils.readIcon("com/fr/design/images/control/up.png")); moveUpButton.addActionListener(actionListener4); - moveDownButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Utils-Move_Down")); + moveDownButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Utils_Move_Down")); buttonPane.add(moveDownButton); moveDownButton.setIcon(BaseUtils.readIcon("com/fr/design/images/control/down.png")); moveDownButton.addActionListener(actionListener5); @@ -971,4 +971,4 @@ public abstract class LiteConditionPane extends BasicBeanPa return newCondition; } } -} \ No newline at end of file +} diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/TableDataTreePane.java b/designer-base/src/main/java/com/fr/design/data/datapane/TableDataTreePane.java index 607510aeb..74ef5b992 100644 --- a/designer-base/src/main/java/com/fr/design/data/datapane/TableDataTreePane.java +++ b/designer-base/src/main/java/com/fr/design/data/datapane/TableDataTreePane.java @@ -263,7 +263,7 @@ public class TableDataTreePane extends BasicTableDataTreePane { return; } - int returnVal = JOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Utils-Are_you_sure_to_remove_the_selected_item") + ":" + selectedNO.getName() + "?", + int returnVal = JOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Utils_Are_You_Sure_To_Remove_The_Selected_Item") + ":" + selectedNO.getName() + "?", com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Remove"), JOptionPane.OK_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE); if (returnVal == JOptionPane.OK_OPTION) { // richer:这个地方为什么要在DataSourceTree里面去remove呢？多此一举吧 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 f0ffd8af2..5db872530 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 @@ -129,7 +129,7 @@ public class JDBCDefPane extends JPanel { urlComPane = TableLayoutHelper.createCommonTableLayoutPane(urlComComponents, urlRowSize, urlColumnSize, 4); JPanel userPane = FRGUIPaneFactory.createRightFlowInnerContainer_S_Pane(); - userPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Username") + ":")); + userPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_UserName") + ":")); JPanel userComPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane(); Component[][] userComComponents = {{userNameTextField, new UILabel(com.fr.design.i18n.Toolkit.i18nText("Password") + ":"), passwordTextField}}; double[] userRowSize = {p}; diff --git a/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/EmbeddedTableDataDefinedPane.java b/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/EmbeddedTableDataDefinedPane.java index de0d6974c..0a94d80ff 100644 --- a/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/EmbeddedTableDataDefinedPane.java +++ b/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/EmbeddedTableDataDefinedPane.java @@ -214,7 +214,7 @@ public class EmbeddedTableDataDefinedPane extends BasicPane{ private String[] COLUMN_NAME = { "", com.fr.design.i18n.Toolkit.i18nText("ColumnName"), - com.fr.design.i18n.Toolkit.i18nText("Type") + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Type") }; private int sum = 0; diff --git a/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/EmbeddedTableDataPane.java b/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/EmbeddedTableDataPane.java index 5113b5ac5..1e1e7f453 100644 --- a/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/EmbeddedTableDataPane.java +++ b/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/EmbeddedTableDataPane.java @@ -134,7 +134,7 @@ public class EmbeddedTableDataPane extends AbstractTableDataPane { this.setLayout(new BorderLayout(gap,0)); JPanel northPanel = new JPanel(new BorderLayout()); JPanel type = new JPanel(); - type.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Utils-File_type") + ":")); + type.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Utils_File_Type") + ":")); String[] item = {"TXT", "Excel", "XML"}; fileTypeComboBox = new UIComboBox(item); fileTypeComboBox.setPreferredSize(new Dimension(100, 20)); diff --git a/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/StoreProcedureTableModel.java b/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/StoreProcedureTableModel.java index b9276310f..6fce66b48 100644 --- a/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/StoreProcedureTableModel.java +++ b/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/StoreProcedureTableModel.java @@ -18,7 +18,7 @@ import com.fr.design.dialog.DialogActionAdapter; public class StoreProcedureTableModel extends UITableModelAdapter { public StoreProcedureTableModel() { - super(new String[] { com.fr.design.i18n.Toolkit.i18nText("Parameter"), com.fr.design.i18n.Toolkit.i18nText("Type"), com.fr.design.i18n.Toolkit.i18nText("Model"), com.fr.design.i18n.Toolkit.i18nText("Value") }); + super(new String[] { com.fr.design.i18n.Toolkit.i18nText("Parameter"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Type"), com.fr.design.i18n.Toolkit.i18nText("Model"), com.fr.design.i18n.Toolkit.i18nText("Value") }); if (shouldResponseDoubleClickAction()) { table.addMouseListener(new MouseAdapter() { @@ -136,4 +136,4 @@ public class StoreProcedureTableModel extends UITableModelAdapter> unSavedTemplate = new ArrayList>(); private boolean isAllSaved = false; //该变量用来判断是在关闭其他模板或是关闭设计器的时候，是否需要判断当前模板有没有保存 private boolean isJudgeCurrentEditingTemplate = true; public SaveSomeTemplatePane(boolean isNeedTojudgeCurrent) { this.setLayout(FRGUIPaneFactory.createBorderLayout()); if (this.dialog == null) { this.dialog = this.showSmallWindow(DesignerContext.getDesignerFrame(), new DialogActionAdapter() { @Override public void doOk() { for (int i = 0; i < templateCheckBoxes.length; i++) { if (templateCheckBoxes[i].isSelected()) { saveSelectedTemplate(unSavedTemplate.get(i)); } } isAllSaved = true; } public void doCancel() { isAllSaved = false; } }); } UILabel tip = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Select_The_Source_To_Save")); this.add(tip, BorderLayout.NORTH); templatesChoosePane = FRGUIPaneFactory.createBorderLayout_S_Pane(); UIScrollPane scrollPane = new UIScrollPane(templatesChoosePane); this.add(scrollPane, BorderLayout.CENTER); this.isJudgeCurrentEditingTemplate = isNeedTojudgeCurrent; } private void initTemplatesChoosePane() { templatesChoosePane.setBorder(BorderFactory.createTitledBorder("")); for (int i = 0; i < unSavedTemplate.size(); i++) { templateCheckBoxes[i] = new UICheckBox(unSavedTemplate.get(i).getEditingFILE().getName()); templateCheckBoxes[i].setSelected(true); } final UIList templatesList = new UIList(templateCheckBoxes); templatesList.setModel(new UnSeletedTemplateListDataMode()); templatesList.setCellRenderer(new UnSelectedListCellRender()); templatesList.addMouseListener(new MouseAdapter() { public void mousePressed(MouseEvent e) { super.mousePressed(e); int index = templatesList.getSelectedIndex(); if (index < 0) { return; } UICheckBox checkBox = (UICheckBox) templatesList.getModel().getElementAt(index); checkBox.setSelected(!checkBox.isSelected()); templatesList.repaint(); } }); final UICheckBox filenameCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Choose_All")); filenameCheckBox.setSelected(true); filenameCheckBox.addItemListener(new ItemListener() { public void itemStateChanged(ItemEvent e) { boolean isSelected = filenameCheckBox.isSelected(); for (int i = 0; i < templatesList.getModel().getSize(); i++) { UICheckBox checkBox = (UICheckBox) templatesList.getModel().getElementAt(i); checkBox.setSelected(isSelected); } templatesList.repaint(); } }); templatesChoosePane.add(filenameCheckBox, BorderLayout.NORTH); templatesChoosePane.add(templatesList, BorderLayout.CENTER); } public boolean showSavePane() { populate(); //如果有未保存的文件 ，则跳出保存对话框，选择要存储的项目 if (!unSavedTemplate.isEmpty()) { dialog.setVisible(true); } else { isAllSaved = true; } return isAllSaved; } public void populate() { java.util.List> opendedTemplate = HistoryTemplateListPane.getInstance().getHistoryList(); JTemplate currentTemplate = HistoryTemplateListPane.getInstance().getCurrentEditingTemplate(); for (int i = 0; i < opendedTemplate.size(); i++) { if (isneedToAdd(opendedTemplate.get(i), currentTemplate)) { unSavedTemplate.add(opendedTemplate.get(i)); } } templateCheckBoxes = new UICheckBox[unSavedTemplate.size()]; initTemplatesChoosePane(); } private boolean isneedToAdd(JTemplate template, JTemplate currentTemplate) { //所有模板都判断是不是保存 if (isJudgeCurrentEditingTemplate) { return !template.isALLSaved(); } //当前编辑的模板不判断是否已经保存 if (ComparatorUtils.equals(template, currentTemplate)) { return false; } else { return !template.isALLSaved(); } } private void saveSelectedTemplate(JTemplate specifiedTemplate) { if (!specifiedTemplate.isSaved()) { specifiedTemplate.stopEditing(); specifiedTemplate.saveTemplate(); } FineLoggerFactory.getLogger().info( com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Template_Already_Saved", specifiedTemplate.getEditingFILE().getName())); } public int saveLastOneTemplate() { JTemplate specifiedTemplate = HistoryTemplateListPane.getInstance().getCurrentEditingTemplate(); if (!specifiedTemplate.isALLSaved()) { specifiedTemplate.stopEditing(); int returnVal = JOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Utils_Would_You_Like_To_Save") + " \"" + specifiedTemplate.getEditingFILE() + "\" ?", ProductConstants.PRODUCT_NAME, JOptionPane.YES_NO_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE); if (returnVal == JOptionPane.YES_OPTION && specifiedTemplate.saveTemplate()) { specifiedTemplate.saveTemplate(); FineLoggerFactory.getLogger().info(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Template_Already_Saved", specifiedTemplate.getEditingFILE().getName())); } return returnVal; } return JOptionPane.YES_OPTION; } protected String title4PopupWindow() { return com.fr.design.i18n.Toolkit.i18nText("Save"); } private class UnSelectedListCellRender extends DefaultListCellRenderer { @Override public Component getListCellRendererComponent(JList list, Object value, int index, final boolean isSelected, boolean cellHasFocus) { super.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus); templateCheckBoxes[index] = (UICheckBox) value; templateCheckBoxes[index].setBackground(list.getBackground()); return templateCheckBoxes[index]; } } private class UnSeletedTemplateListDataMode extends AbstractListModel { @Override public int getSize() { return templateCheckBoxes.length; } @Override public UICheckBox getElementAt(int index) { if (index > getSize() - 1 || index < 0) { return null; } return templateCheckBoxes[index]; } } } \ No newline at end of file +package com.fr.design.file; import com.fr.design.dialog.BasicDialog; import com.fr.design.dialog.BasicPane; import com.fr.design.dialog.DialogActionAdapter; import com.fr.design.gui.icheckbox.UICheckBox; import com.fr.design.gui.icontainer.UIScrollPane; import com.fr.design.gui.ilable.UILabel; import com.fr.design.gui.ilist.UIList; import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.mainframe.DesignerContext; import com.fr.design.mainframe.JTemplate; import com.fr.general.ComparatorUtils; import com.fr.log.FineLoggerFactory; import com.fr.stable.ProductConstants; import javax.swing.*; import java.awt.*; import java.awt.event.ItemEvent; import java.awt.event.ItemListener; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.util.ArrayList; /** * Author : daisy * Date: 13-8-9 * Time: 下午3:41 */ public class SaveSomeTemplatePane extends BasicPane { private UICheckBox[] templateCheckBoxes = null; private BasicDialog dialog; private JPanel templatesChoosePane; private UIScrollPane scrollPane; private java.util.List> unSavedTemplate = new ArrayList>(); private boolean isAllSaved = false; //该变量用来判断是在关闭其他模板或是关闭设计器的时候，是否需要判断当前模板有没有保存 private boolean isJudgeCurrentEditingTemplate = true; public SaveSomeTemplatePane(boolean isNeedTojudgeCurrent) { this.setLayout(FRGUIPaneFactory.createBorderLayout()); if (this.dialog == null) { this.dialog = this.showSmallWindow(DesignerContext.getDesignerFrame(), new DialogActionAdapter() { @Override public void doOk() { for (int i = 0; i < templateCheckBoxes.length; i++) { if (templateCheckBoxes[i].isSelected()) { saveSelectedTemplate(unSavedTemplate.get(i)); } } isAllSaved = true; } public void doCancel() { isAllSaved = false; } }); } UILabel tip = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Select_The_Source_To_Save")); this.add(tip, BorderLayout.NORTH); templatesChoosePane = FRGUIPaneFactory.createBorderLayout_S_Pane(); UIScrollPane scrollPane = new UIScrollPane(templatesChoosePane); this.add(scrollPane, BorderLayout.CENTER); this.isJudgeCurrentEditingTemplate = isNeedTojudgeCurrent; } private void initTemplatesChoosePane() { templatesChoosePane.setBorder(BorderFactory.createTitledBorder("")); for (int i = 0; i < unSavedTemplate.size(); i++) { templateCheckBoxes[i] = new UICheckBox(unSavedTemplate.get(i).getEditingFILE().getName()); templateCheckBoxes[i].setSelected(true); } final UIList templatesList = new UIList(templateCheckBoxes); templatesList.setModel(new UnSeletedTemplateListDataMode()); templatesList.setCellRenderer(new UnSelectedListCellRender()); templatesList.addMouseListener(new MouseAdapter() { public void mousePressed(MouseEvent e) { super.mousePressed(e); int index = templatesList.getSelectedIndex(); if (index < 0) { return; } UICheckBox checkBox = (UICheckBox) templatesList.getModel().getElementAt(index); checkBox.setSelected(!checkBox.isSelected()); templatesList.repaint(); } }); final UICheckBox filenameCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Choose_All")); filenameCheckBox.setSelected(true); filenameCheckBox.addItemListener(new ItemListener() { public void itemStateChanged(ItemEvent e) { boolean isSelected = filenameCheckBox.isSelected(); for (int i = 0; i < templatesList.getModel().getSize(); i++) { UICheckBox checkBox = (UICheckBox) templatesList.getModel().getElementAt(i); checkBox.setSelected(isSelected); } templatesList.repaint(); } }); templatesChoosePane.add(filenameCheckBox, BorderLayout.NORTH); templatesChoosePane.add(templatesList, BorderLayout.CENTER); } public boolean showSavePane() { populate(); //如果有未保存的文件 ，则跳出保存对话框，选择要存储的项目 if (!unSavedTemplate.isEmpty()) { dialog.setVisible(true); } else { isAllSaved = true; } return isAllSaved; } public void populate() { java.util.List> opendedTemplate = HistoryTemplateListPane.getInstance().getHistoryList(); JTemplate currentTemplate = HistoryTemplateListPane.getInstance().getCurrentEditingTemplate(); for (int i = 0; i < opendedTemplate.size(); i++) { if (isneedToAdd(opendedTemplate.get(i), currentTemplate)) { unSavedTemplate.add(opendedTemplate.get(i)); } } templateCheckBoxes = new UICheckBox[unSavedTemplate.size()]; initTemplatesChoosePane(); } private boolean isneedToAdd(JTemplate template, JTemplate currentTemplate) { //所有模板都判断是不是保存 if (isJudgeCurrentEditingTemplate) { return !template.isALLSaved(); } //当前编辑的模板不判断是否已经保存 if (ComparatorUtils.equals(template, currentTemplate)) { return false; } else { return !template.isALLSaved(); } } private void saveSelectedTemplate(JTemplate specifiedTemplate) { if (!specifiedTemplate.isSaved()) { specifiedTemplate.stopEditing(); specifiedTemplate.saveTemplate(); } FineLoggerFactory.getLogger().info( com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Template_Already_Saved", specifiedTemplate.getEditingFILE().getName())); } public int saveLastOneTemplate() { JTemplate specifiedTemplate = HistoryTemplateListPane.getInstance().getCurrentEditingTemplate(); if (!specifiedTemplate.isALLSaved()) { specifiedTemplate.stopEditing(); int returnVal = JOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Utils_Would_You_Like_To_Save") + " \"" + specifiedTemplate.getEditingFILE() + "\" ?", ProductConstants.PRODUCT_NAME, JOptionPane.YES_NO_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE); if (returnVal == JOptionPane.YES_OPTION && specifiedTemplate.saveTemplate()) { specifiedTemplate.saveTemplate(); FineLoggerFactory.getLogger().info(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Template_Already_Saved", specifiedTemplate.getEditingFILE().getName())); } return returnVal; } return JOptionPane.YES_OPTION; } protected String title4PopupWindow() { return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Save"); } private class UnSelectedListCellRender extends DefaultListCellRenderer { @Override public Component getListCellRendererComponent(JList list, Object value, int index, final boolean isSelected, boolean cellHasFocus) { super.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus); templateCheckBoxes[index] = (UICheckBox) value; templateCheckBoxes[index].setBackground(list.getBackground()); return templateCheckBoxes[index]; } } private class UnSeletedTemplateListDataMode extends AbstractListModel { @Override public int getSize() { return templateCheckBoxes.length; } @Override public UICheckBox getElementAt(int index) { if (index > getSize() - 1 || index < 0) { return null; } return templateCheckBoxes[index]; } } } \ 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 1e075ecf2..313f459b2 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 @@ -79,7 +79,7 @@ public class JavaEditorPane extends BasicPane { UIScrollPane jt = new UIScrollPane(javaText); JPanel toolbarPane = new JPanel(new FlowLayout(FlowLayout.LEFT)); - UIButton saveButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Save")); + UIButton saveButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Save")); saveButton.setAction(new SaveAction()); UIButton compileButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Compile")); compileButton.setAction(new CompilerAction()); @@ -141,7 +141,7 @@ public class JavaEditorPane extends BasicPane { private class SaveAction extends AbstractAction { //新建文件命令 public SaveAction() { - super(com.fr.design.i18n.Toolkit.i18nText("Save")); + super(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Save")); } public void actionPerformed(ActionEvent e) { saveTextToFile(javaText.getText()); diff --git a/designer-base/src/main/java/com/fr/design/gui/HyperlinkFilterHelper.java b/designer-base/src/main/java/com/fr/design/gui/HyperlinkFilterHelper.java index 122fc19e3..bc2cbdbf9 100644 --- a/designer-base/src/main/java/com/fr/design/gui/HyperlinkFilterHelper.java +++ b/designer-base/src/main/java/com/fr/design/gui/HyperlinkFilterHelper.java @@ -53,7 +53,7 @@ public class HyperlinkFilterHelper { } private static boolean whetherAddFormLink(JTemplate jTemplate, String itemName) { - String formName = com.fr.design.i18n.Toolkit.i18nText("Hyperlink-Form_link"); + String formName = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Hyperlink_Form_Link"); return !(jTemplate.isJWorkBook() && ComparatorUtils.equals(itemName, formName)); } } diff --git a/designer-base/src/main/java/com/fr/design/gui/controlpane/JListControlPane.java b/designer-base/src/main/java/com/fr/design/gui/controlpane/JListControlPane.java index efaf27a76..badb658c9 100644 --- a/designer-base/src/main/java/com/fr/design/gui/controlpane/JListControlPane.java +++ b/designer-base/src/main/java/com/fr/design/gui/controlpane/JListControlPane.java @@ -481,7 +481,7 @@ public abstract class JListControlPane extends JControlPane { */ private class MoveUpItemAction extends UpdateAction { public MoveUpItemAction() { - this.setName(com.fr.design.i18n.Toolkit.i18nText("Utils-Move_Up")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Utils_Move_Up")); this.setMnemonic('U'); this.setSmallIcon(BaseUtils .readIcon("/com/fr/design/images/control/up.png")); @@ -514,7 +514,7 @@ public abstract class JListControlPane extends JControlPane { */ private class MoveDownItemAction extends UpdateAction { public MoveDownItemAction() { - this.setName(com.fr.design.i18n.Toolkit.i18nText("Utils-Move_Down")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Utils_Move_Down")); this.setMnemonic('D'); this.setSmallIcon(BaseUtils .readIcon("/com/fr/design/images/control/down.png")); diff --git a/designer-base/src/main/java/com/fr/design/gui/controlpane/UIListControlPane.java b/designer-base/src/main/java/com/fr/design/gui/controlpane/UIListControlPane.java index 1c938b362..53afbbe70 100644 --- a/designer-base/src/main/java/com/fr/design/gui/controlpane/UIListControlPane.java +++ b/designer-base/src/main/java/com/fr/design/gui/controlpane/UIListControlPane.java @@ -569,7 +569,7 @@ public abstract class UIListControlPane extends UIControlPane { */ private class MoveUpItemAction extends UpdateAction { public MoveUpItemAction() { - this.setName(com.fr.design.i18n.Toolkit.i18nText("Utils-Move_Up")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Utils_Move_Up")); this.setMnemonic('U'); this.setSmallIcon(BaseUtils .readIcon("/com/fr/design/images/control/up.png")); @@ -602,7 +602,7 @@ public abstract class UIListControlPane extends UIControlPane { */ private class MoveDownItemAction extends UpdateAction { public MoveDownItemAction() { - this.setName(com.fr.design.i18n.Toolkit.i18nText("Utils-Move_Down")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Utils_Move_Down")); this.setMnemonic('D'); this.setSmallIcon(BaseUtils .readIcon("/com/fr/design/images/control/down.png")); diff --git a/designer-base/src/main/java/com/fr/design/gui/controlpane/UISimpleListControlPane.java b/designer-base/src/main/java/com/fr/design/gui/controlpane/UISimpleListControlPane.java index f5da7e2f8..29c8c0602 100644 --- a/designer-base/src/main/java/com/fr/design/gui/controlpane/UISimpleListControlPane.java +++ b/designer-base/src/main/java/com/fr/design/gui/controlpane/UISimpleListControlPane.java @@ -228,7 +228,7 @@ public class UISimpleListControlPane extends BasicPane { */ private class MoveUpItemAction extends UpdateAction { public MoveUpItemAction() { - this.setName(com.fr.design.i18n.Toolkit.i18nText("Utils-Move_Up")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Utils_Move_Up")); this.setMnemonic('U'); this.setSmallIcon(BaseUtils .readIcon("/com/fr/design/images/control/up.png")); @@ -261,7 +261,7 @@ public class UISimpleListControlPane extends BasicPane { */ private class MoveDownItemAction extends UpdateAction { public MoveDownItemAction() { - this.setName(com.fr.design.i18n.Toolkit.i18nText("Utils-Move_Down")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Utils_Move_Down")); this.setMnemonic('D'); this.setSmallIcon(BaseUtils .readIcon("/com/fr/design/images/control/down.png")); diff --git a/designer-base/src/main/java/com/fr/design/gui/core/WidgetConstants.java b/designer-base/src/main/java/com/fr/design/gui/core/WidgetConstants.java index aa26204b1..02f6a3786 100644 --- a/designer-base/src/main/java/com/fr/design/gui/core/WidgetConstants.java +++ b/designer-base/src/main/java/com/fr/design/gui/core/WidgetConstants.java @@ -55,7 +55,7 @@ public class WidgetConstants { public static final int MULTI_FILE = 19; // 默认控件 - public static final String DEFAULT_WIDGETCONFIG = com.fr.design.i18n.Toolkit.i18nText("Widget-Form_Widget_Config"); + public static final String DEFAULT_WIDGETCONFIG = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Form_Widget_Config"); // 报表控件，与默认控件不同，比如label，table,SEARCH等，这里是不需要的 public static final String REPORT_WIDGETCONFIG = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Default_Widget_Config"); @@ -63,11 +63,11 @@ public class WidgetConstants { public static final String FORM_CHARTWIDGET = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Chart_Widget_Config"); // 表单容器控件 - public static final String FORM_WIDGETCONTAINER = com.fr.design.i18n.Toolkit.i18nText("Widget-Form_Widget_Container"); + public static final String FORM_WIDGETCONTAINER = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Form_Widget_Container"); public static final String POLY_REPORT_WIDGET = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Poly_Report_Component"); // 服务器预定义控件 - public static final String USER_DEFINED_WIDGETCONFIG = com.fr.design.i18n.Toolkit.i18nText("Widget-User_Defined_Widget_Config"); + public static final String USER_DEFINED_WIDGETCONFIG = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_User_Defined_Widget_Config"); // 服务器组合控件 public static final String COMB_WIDGETCONFIG = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Comb_Widget_Config"); @@ -75,4 +75,4 @@ public class WidgetConstants { // 服务器自定义控件 public static final String CUSTOM_WIDGETCONFIG = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Custom_Widget_Config"); -} \ No newline at end of file +} diff --git a/designer-base/src/main/java/com/fr/design/gui/date/UICalendarPanel.java b/designer-base/src/main/java/com/fr/design/gui/date/UICalendarPanel.java index 9a8f1c011..d48883491 100644 --- a/designer-base/src/main/java/com/fr/design/gui/date/UICalendarPanel.java +++ b/designer-base/src/main/java/com/fr/design/gui/date/UICalendarPanel.java @@ -161,9 +161,9 @@ public class UICalendarPanel extends JPanel { pWeeks.setPreferredSize(new Dimension(216, 22)); pWeeks.setBackground(new Color(0xFFFFFF)); pWeeks.setOpaque(true); - String[] strWeeks = new String[] {StringUtils.EMPTY, com.fr.design.i18n.Toolkit.i18nText("Sun"), com.fr.design.i18n.Toolkit.i18nText("Mon"), - com.fr.design.i18n.Toolkit.i18nText("Tue"),com.fr.design.i18n.Toolkit.i18nText("Wed"),com.fr.design.i18n.Toolkit.i18nText("Thu"), - com.fr.design.i18n.Toolkit.i18nText("Fri"),com.fr.design.i18n.Toolkit.i18nText("Sat") + String[] strWeeks = new String[] {StringUtils.EMPTY, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Sun"), com.fr.design.i18n.Toolkit.i18nText("Mon"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tue"),com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Wed"),com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Thu"), + com.fr.design.i18n.Toolkit.i18nText("Fri"),com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Sat") }; for (int i = 1; i <= WEEKDAY_COUNT; i++) { UILabel label = new UILabel(); @@ -202,7 +202,7 @@ public class UICalendarPanel extends JPanel { sPane.setPreferredSize(new Dimension(216, 30)); sPane.setBackground(Color.WHITE); sPane.setLayout(new FlowLayout(FlowLayout.LEFT, 0, 6)); - UILabel timeLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Time") + ":"); + UILabel timeLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Time") + ":"); timeLabel.setBorder(BorderFactory.createEmptyBorder(0,9,0,5)); timeLabel.setFont(FONT_SONG); sPane.add(timeLabel); @@ -769,4 +769,4 @@ public class UICalendarPanel extends JPanel { frame.getContentPane().add(calendarPanel); frame.setVisible(true); } -} \ No newline at end of file +} diff --git a/designer-base/src/main/java/com/fr/design/gui/frpane/EditingStringListPane.java b/designer-base/src/main/java/com/fr/design/gui/frpane/EditingStringListPane.java index 4b326dd95..345cdc857 100644 --- a/designer-base/src/main/java/com/fr/design/gui/frpane/EditingStringListPane.java +++ b/designer-base/src/main/java/com/fr/design/gui/frpane/EditingStringListPane.java @@ -1,13 +1,11 @@ package com.fr.design.gui.frpane; -import java.awt.BorderLayout; -import java.awt.Component; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; -import java.awt.event.MouseAdapter; -import java.awt.event.MouseEvent; -import java.util.ArrayList; -import java.util.List; +import com.fr.design.beans.BasicBeanPane; +import com.fr.design.gui.ibutton.UIButton; +import com.fr.design.layout.FRGUIPaneFactory; +import com.fr.design.utils.gui.GUICoreUtils; +import com.fr.design.utils.gui.JListUtils; +import com.fr.stable.StringUtils; import javax.swing.BorderFactory; import javax.swing.DefaultListCellRenderer; @@ -20,14 +18,14 @@ import javax.swing.ListSelectionModel; import javax.swing.SwingUtilities; import javax.swing.event.ListSelectionEvent; import javax.swing.event.ListSelectionListener; - -import com.fr.design.beans.BasicBeanPane; -import com.fr.design.gui.ibutton.UIButton; -import com.fr.design.layout.FRGUIPaneFactory; - -import com.fr.stable.StringUtils; -import com.fr.design.utils.gui.GUICoreUtils; -import com.fr.design.utils.gui.JListUtils; +import java.awt.BorderLayout; +import java.awt.Component; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.awt.event.MouseAdapter; +import java.awt.event.MouseEvent; +import java.util.ArrayList; +import java.util.List; public abstract class EditingStringListPane extends BasicBeanPane> { @@ -60,8 +58,8 @@ public abstract class EditingStringListPane extends BasicBeanPane> addButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Add")); editButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Modify")); removeButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Remove")); - moveUpButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Utils-Move_Up")); - moveDownButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Utils-Move_Down")); + moveUpButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Utils_Move_Up")); + moveDownButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Utils_Move_Down")); JPanel eastPane = FRGUIPaneFactory.createNColumnGridInnerContainer_S_Pane(1); eastPane.add(editButton); @@ -151,7 +149,7 @@ public abstract class EditingStringListPane extends BasicBeanPane> public void actionPerformed(ActionEvent e) { Object selected = jlist.getSelectedValue(); if (selected != null) { - int re = JOptionPane.showConfirmDialog(SwingUtilities.getWindowAncestor(EditingStringListPane.this), com.fr.design.i18n.Toolkit.i18nText("sure_to_delete") + selected.toString() + "?"); + int re = JOptionPane.showConfirmDialog(SwingUtilities.getWindowAncestor(EditingStringListPane.this), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Sure_To_Delete") + selected.toString() + "?"); if (re == JOptionPane.OK_OPTION) { JListUtils.removeSelectedListItems(jlist); } @@ -205,4 +203,4 @@ public abstract class EditingStringListPane extends BasicBeanPane> } return lists; } -} \ No newline at end of file +} diff --git a/designer-base/src/main/java/com/fr/design/gui/frpane/ImgChoosePane.java b/designer-base/src/main/java/com/fr/design/gui/frpane/ImgChoosePane.java index 225d5bcdf..c6f0e5836 100644 --- a/designer-base/src/main/java/com/fr/design/gui/frpane/ImgChoosePane.java +++ b/designer-base/src/main/java/com/fr/design/gui/frpane/ImgChoosePane.java @@ -73,7 +73,7 @@ public class ImgChoosePane extends BasicPane { } private void initButton() { - chooseButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Image-Select_Picture")); + chooseButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Image_Select_Picture")); chooseButton.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { @@ -115,6 +115,6 @@ public class ImgChoosePane extends BasicPane { @Override protected String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("Image"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Image"); } } diff --git a/designer-base/src/main/java/com/fr/design/gui/frpane/JTreeAutoBuildPane.java b/designer-base/src/main/java/com/fr/design/gui/frpane/JTreeAutoBuildPane.java index 49402b950..73d66cc86 100644 --- a/designer-base/src/main/java/com/fr/design/gui/frpane/JTreeAutoBuildPane.java +++ b/designer-base/src/main/java/com/fr/design/gui/frpane/JTreeAutoBuildPane.java @@ -51,7 +51,7 @@ public class JTreeAutoBuildPane extends BasicPane implements PreviewLabel.Previe */ public void initComponent() { this.setLayout(FRGUIPaneFactory.createM_BorderLayout()); - UILabel selectTreeDataLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Select_A_Tree_DataSource_To_Build") + ": "); + UILabel selectTreeDataLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Select_A_Tree_DataSource_To_Build") + ": "); treeTableDataComboBox = new TreeTableDataComboBox(DesignTableDataManager.getEditingTableDataSource()); treeTableDataComboBox.setPreferredSize(new Dimension(180, 20)); selectTreeDataPanel = FRGUIPaneFactory.createBoxFlowInnerContainer_S_Pane(); @@ -230,4 +230,4 @@ public class JTreeAutoBuildPane extends BasicPane implements PreviewLabel.Previe valuePane.populate(1); } -} \ No newline at end of file +} diff --git a/designer-base/src/main/java/com/fr/design/gui/frpane/JTreeControlPane.java b/designer-base/src/main/java/com/fr/design/gui/frpane/JTreeControlPane.java index 6627f8de7..cf967cfc2 100644 --- a/designer-base/src/main/java/com/fr/design/gui/frpane/JTreeControlPane.java +++ b/designer-base/src/main/java/com/fr/design/gui/frpane/JTreeControlPane.java @@ -231,7 +231,7 @@ public class JTreeControlPane extends ControlPane { public void actionPerformed(ActionEvent e) { // TODO remove tree node - int val = JOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Utils-Are_you_sure_to_remove_the_selected_item") + "?", + int val = JOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Utils_Are_You_Sure_To_Remove_The_Selected_Item") + "?", com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Remove"), JOptionPane.OK_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE); if (val != JOptionPane.OK_OPTION) { return; @@ -267,4 +267,4 @@ public class JTreeControlPane extends ControlPane { return this; } }; -} \ No newline at end of file +} diff --git a/designer-base/src/main/java/com/fr/design/gui/frpane/UICorrelationComboBoxPane.java b/designer-base/src/main/java/com/fr/design/gui/frpane/UICorrelationComboBoxPane.java index 79ed96309..1d7881d2f 100644 --- a/designer-base/src/main/java/com/fr/design/gui/frpane/UICorrelationComboBoxPane.java +++ b/designer-base/src/main/java/com/fr/design/gui/frpane/UICorrelationComboBoxPane.java @@ -383,7 +383,7 @@ public class UICorrelationComboBoxPane extends JPanel implements UIObserver { UIMenuNameableCreator email = new UIMenuNameableCreator(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Email"), new EmailJavaScript(), EmailPane.class); - UIMenuNameableCreator web = new UIMenuNameableCreator(com.fr.design.i18n.Toolkit.i18nText("Hyperlink-Web_link"), + UIMenuNameableCreator web = new UIMenuNameableCreator(com.fr.design.i18n.Toolkit.i18nText("Fine_Design_Basic_Hyperlink_Web_Link"), new WebHyperlink(), WebHyperlinkPane.class); data.add(reportlet); data.add(email); @@ -411,4 +411,4 @@ public class UICorrelationComboBoxPane extends JPanel implements UIObserver { public boolean shouldResponseChangeListener() { return true; } -} \ No newline at end of file +} diff --git a/designer-base/src/main/java/com/fr/design/gui/frpane/UINumberDragPane.java b/designer-base/src/main/java/com/fr/design/gui/frpane/UINumberDragPane.java index eb63c0b64..b1958a8c1 100644 --- a/designer-base/src/main/java/com/fr/design/gui/frpane/UINumberDragPane.java +++ b/designer-base/src/main/java/com/fr/design/gui/frpane/UINumberDragPane.java @@ -36,7 +36,7 @@ public class UINumberDragPane extends BasicBeanPane implements GlobalNam public UINumberDragPane(double minValue, double maxValue, double dierta) { dragBar = new NumberDragBar((int) minValue, (int) maxValue); spinner = new UISpinner(minValue, maxValue, dierta, minValue); - spinner.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("StyleAlignment-Text_Rotation")); + spinner.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_StyleAlignment_Text_Rotation")); this.setLayout(new BorderLayout(4, 0)); this.add(spinner, BorderLayout.EAST); this.add(dragBar, BorderLayout.CENTER); @@ -137,4 +137,4 @@ public class UINumberDragPane extends BasicBeanPane implements GlobalNam public boolean shouldResponseNameListener() { return true; } -} \ No newline at end of file +} diff --git a/designer-base/src/main/java/com/fr/design/gui/frpane/UITabbedPane.java b/designer-base/src/main/java/com/fr/design/gui/frpane/UITabbedPane.java index 288396c29..ee8661a83 100644 --- a/designer-base/src/main/java/com/fr/design/gui/frpane/UITabbedPane.java +++ b/designer-base/src/main/java/com/fr/design/gui/frpane/UITabbedPane.java @@ -113,10 +113,10 @@ public class UITabbedPane extends JTabbedPane{ * @param i tab索引 */ public void doRemoveTab(int i){ - int re = JOptionPane.showConfirmDialog(SwingUtilities.getWindowAncestor(UITabbedPane.this), com.fr.design.i18n.Toolkit.i18nText("sure_to_delete")+ "?", com.fr.design.i18n.Toolkit.i18nText("Remove") + int re = JOptionPane.showConfirmDialog(SwingUtilities.getWindowAncestor(UITabbedPane.this), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Sure_To_Delete")+ "?", com.fr.design.i18n.Toolkit.i18nText("Remove") , JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE); if (re == JOptionPane.OK_OPTION) { super.removeTabAt(i); } } -} \ No newline at end of file +} diff --git a/designer-base/src/main/java/com/fr/design/gui/frpane/tree/layer/config/LayerDataControlPane.java b/designer-base/src/main/java/com/fr/design/gui/frpane/tree/layer/config/LayerDataControlPane.java index 22ba5b344..ac35a01fb 100644 --- a/designer-base/src/main/java/com/fr/design/gui/frpane/tree/layer/config/LayerDataControlPane.java +++ b/designer-base/src/main/java/com/fr/design/gui/frpane/tree/layer/config/LayerDataControlPane.java @@ -177,7 +177,7 @@ public class LayerDataControlPane extends ControlPane { public void actionPerformed(ActionEvent e) { // TODO remove tree node - int val = JOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Utils-Are_you_sure_to_remove_the_selected_item") + "?", + int val = JOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Utils_Are_You_Sure_To_Remove_The_Selected_Item") + "?", com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Remove"), JOptionPane.OK_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE); if (val != JOptionPane.OK_OPTION) { return; diff --git a/designer-base/src/main/java/com/fr/design/gui/icombobox/AlignmentComboBox.java b/designer-base/src/main/java/com/fr/design/gui/icombobox/AlignmentComboBox.java index 0afbd3176..39bc21440 100644 --- a/designer-base/src/main/java/com/fr/design/gui/icombobox/AlignmentComboBox.java +++ b/designer-base/src/main/java/com/fr/design/gui/icombobox/AlignmentComboBox.java @@ -49,13 +49,13 @@ public class AlignmentComboBox extends UIComboBox { if (alignment == Constants.CENTER) {//0 return com.fr.design.i18n.Toolkit.i18nText("Center"); } else if (alignment == Constants.TOP) {//1 - return com.fr.design.i18n.Toolkit.i18nText("StyleAlignment-Top"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_StyleAlignment_Top"); } else if (alignment == Constants.LEFT) {//2 - return com.fr.design.i18n.Toolkit.i18nText("StyleAlignment-Left"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_StyleAlignment_Left"); } else if (alignment == Constants.BOTTOM) {//3 - return com.fr.design.i18n.Toolkit.i18nText("StyleAlignment-Bottom"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_StyleAlignment_Bottom"); } else if (alignment == Constants.RIGHT) { //4 - return com.fr.design.i18n.Toolkit.i18nText("StyleAlignment-Right"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_StyleAlignment_Right"); } else if (alignment == Constants.DISTRIBUTED) { //added by Kevin Wang 6 return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Alignment_Distibuted"); } else { @@ -77,4 +77,4 @@ public class AlignmentComboBox extends UIComboBox { return this; } } -} \ No newline at end of file +} diff --git a/designer-base/src/main/java/com/fr/design/gui/icombobox/DictionaryConstants.java b/designer-base/src/main/java/com/fr/design/gui/icombobox/DictionaryConstants.java index 10ec2ff15..d6d6ba9e7 100644 --- a/designer-base/src/main/java/com/fr/design/gui/icombobox/DictionaryConstants.java +++ b/designer-base/src/main/java/com/fr/design/gui/icombobox/DictionaryConstants.java @@ -18,13 +18,13 @@ public class DictionaryConstants { public final static String[] regexpsDisplays = new String[] { com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_None"), - com.fr.design.i18n.Toolkit.i18nText("Required"), - com.fr.design.i18n.Toolkit.i18nText("Length"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Required"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Length"), com.fr.design.i18n.Toolkit.i18nText("Float"), com.fr.design.i18n.Toolkit.i18nText("Email"), com.fr.design.i18n.Toolkit.i18nText("Phone"), com.fr.design.i18n.Toolkit.i18nText("MobilePhone"), - com.fr.design.i18n.Toolkit.i18nText("IDCard"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_IDCard"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_PostCode"), com.fr.design.i18n.Toolkit.i18nText("Custom")}; @@ -83,4 +83,4 @@ public class DictionaryConstants { "jpg,png,gif", "doc,xls,ppt" }; -} \ No newline at end of file +} diff --git a/designer-base/src/main/java/com/fr/design/gui/icombobox/SortOrderComboBox.java b/designer-base/src/main/java/com/fr/design/gui/icombobox/SortOrderComboBox.java index e4c25470a..75dabb56d 100644 --- a/designer-base/src/main/java/com/fr/design/gui/icombobox/SortOrderComboBox.java +++ b/designer-base/src/main/java/com/fr/design/gui/icombobox/SortOrderComboBox.java @@ -3,12 +3,11 @@ */ package com.fr.design.gui.icombobox; -import java.awt.Component; +import com.fr.data.util.SortOrder; import javax.swing.DefaultComboBoxModel; import javax.swing.JList; - -import com.fr.data.util.SortOrder; +import java.awt.Component; /** @@ -53,11 +52,11 @@ public class SortOrderComboBox extends UIComboBox { SortOrder sortOrder = (SortOrder) value; if (sortOrder.getOrder() == SortOrder.ASC) { - this.setText(com.fr.design.i18n.Toolkit.i18nText("Sort-Ascending")); + this.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Sort_Ascending")); } else if (sortOrder.getOrder() == SortOrder.DESC) { - this.setText(com.fr.design.i18n.Toolkit.i18nText("Sort-Descending")); + this.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Sort_Descending")); } else if (sortOrder.getOrder() == SortOrder.ORIGINAL) { - this.setText(com.fr.design.i18n.Toolkit.i18nText("Sort-Original")); + this.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Sort_Original")); } } @@ -70,4 +69,4 @@ public class SortOrderComboBox extends UIComboBox { new SortOrder(SortOrder.DESC), new SortOrder(SortOrder.ORIGINAL) }; -} \ No newline at end of file +} diff --git a/designer-base/src/main/java/com/fr/design/gui/imenutable/UIMenuTable.java b/designer-base/src/main/java/com/fr/design/gui/imenutable/UIMenuTable.java index 4bcba9796..dfc6e453c 100644 --- a/designer-base/src/main/java/com/fr/design/gui/imenutable/UIMenuTable.java +++ b/designer-base/src/main/java/com/fr/design/gui/imenutable/UIMenuTable.java @@ -217,7 +217,7 @@ public class UIMenuTable extends JTable { UIMenuNameableCreator email = new UIMenuNameableCreator(com.fr.design.i18n.Toolkit.i18nText("Email"), new EmailJavaScript(), EmailPane.class); - UIMenuNameableCreator web = new UIMenuNameableCreator(com.fr.design.i18n.Toolkit.i18nText("Hyperlink-Web_link"), + UIMenuNameableCreator web = new UIMenuNameableCreator(com.fr.design.i18n.Toolkit.i18nText("Fine_Design_Basic_Hyperlink_Web_Link"), new WebHyperlink(), WebHyperlinkPane.class ); data.add(reportlet); data.add(email); @@ -229,4 +229,4 @@ public class UIMenuTable extends JTable { jf.setSize(400, 400); jf.setVisible(true); } -} \ No newline at end of file +} diff --git a/designer-base/src/main/java/com/fr/design/gui/imenutable/UIMenuTableUI.java b/designer-base/src/main/java/com/fr/design/gui/imenutable/UIMenuTableUI.java index 61633fa6a..b00971474 100644 --- a/designer-base/src/main/java/com/fr/design/gui/imenutable/UIMenuTableUI.java +++ b/designer-base/src/main/java/com/fr/design/gui/imenutable/UIMenuTableUI.java @@ -74,7 +74,7 @@ public class UIMenuTableUI extends UITableUI{ @Override public void mousePressed(MouseEvent e) { if (e.getX() >= table.getWidth() - 20) { - int val = JOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Utils-Are_you_sure_to_remove_the_selected_item") + "?", + int val = JOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Utils_Are_You_Sure_To_Remove_The_Selected_Item") + "?", com.fr.design.i18n.Toolkit.i18nText("Remove"), JOptionPane.OK_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE); if (val == JOptionPane.OK_OPTION) { uiTable.removeLine(table.rowAtPoint(e.getPoint())); @@ -121,4 +121,4 @@ public class UIMenuTableUI extends UITableUI{ } }; } -} \ No newline at end of file +} diff --git a/designer-base/src/main/java/com/fr/design/gui/itable/UITableUI.java b/designer-base/src/main/java/com/fr/design/gui/itable/UITableUI.java index 531a58cd4..f04b64441 100644 --- a/designer-base/src/main/java/com/fr/design/gui/itable/UITableUI.java +++ b/designer-base/src/main/java/com/fr/design/gui/itable/UITableUI.java @@ -132,7 +132,7 @@ public class UITableUI extends BasicTableUI { return; } if (!table.isEditing()) { - int val = JOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Utils-Are_you_sure_to_remove_the_selected_item") + "?", + int val = JOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Utils_Are_You_Sure_To_Remove_The_Selected_Item") + "?", com.fr.design.i18n.Toolkit.i18nText("Remove"), JOptionPane.OK_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE); if (val == JOptionPane.OK_OPTION) { ((UITable) table).removeLine(table.rowAtPoint(e.getPoint())); @@ -222,4 +222,4 @@ public class UITableUI extends BasicTableUI { installKeyboardActions(); } -} \ No newline at end of file +} diff --git a/designer-base/src/main/java/com/fr/design/gui/itableeditorpane/UITableEditorPane.java b/designer-base/src/main/java/com/fr/design/gui/itableeditorpane/UITableEditorPane.java index fcc976c53..d6973f6bb 100644 --- a/designer-base/src/main/java/com/fr/design/gui/itableeditorpane/UITableEditorPane.java +++ b/designer-base/src/main/java/com/fr/design/gui/itableeditorpane/UITableEditorPane.java @@ -106,7 +106,7 @@ public class UITableEditorPane extends BasicPane { @Override protected String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("TableData_Dynamic_Parameter_Setting"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_TableData_Dynamic_Parameter_Setting"); } public void populate(T[] objs) { @@ -153,4 +153,4 @@ public class UITableEditorPane extends BasicPane { tableModel.stopCellEditing(); } -} \ 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 ab0c3e841..bd621517d 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 @@ -182,7 +182,7 @@ public abstract class UITableModelAdapter extends AbstractTabl protected abstract class AddTableRowAction extends UITableEditAction { public AddTableRowAction() { - this.setName(com.fr.design.i18n.Toolkit.i18nText("Insert")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Insert")); this.setSmallIcon(BaseUtils.readIcon("/com/fr/base/images/cell/control/add.png")); } @@ -252,7 +252,7 @@ public abstract class UITableModelAdapter extends AbstractTabl component = DesignerContext.getDesignerFrame(); } int val = JOptionPane.showConfirmDialog(component, - com.fr.design.i18n.Toolkit.i18nText("Utils-Are_you_sure_to_remove_the_selected_item") + "?", com.fr.design.i18n.Toolkit.i18nText("Remove"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Utils_Are_You_Sure_To_Remove_The_Selected_Item") + "?", com.fr.design.i18n.Toolkit.i18nText("Remove"), JOptionPane.OK_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE); if (val != JOptionPane.OK_OPTION) { return; @@ -281,7 +281,7 @@ public abstract class UITableModelAdapter extends AbstractTabl protected class MoveUpAction extends UITableEditAction { public MoveUpAction() { - this.setName(com.fr.design.i18n.Toolkit.i18nText("Utils-Move_Up")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Utils_Move_Up")); this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/control/up.png")); } @@ -305,7 +305,7 @@ public abstract class UITableModelAdapter extends AbstractTabl protected class MoveDownAction extends UITableEditAction { public MoveDownAction() { - this.setName(com.fr.design.i18n.Toolkit.i18nText("Utils-Move_Down")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Utils_Move_Down")); this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/control/down.png")); } diff --git a/designer-base/src/main/java/com/fr/design/gui/itree/refreshabletree/TreeRootPane.java b/designer-base/src/main/java/com/fr/design/gui/itree/refreshabletree/TreeRootPane.java index c55a69a79..bb754716f 100644 --- a/designer-base/src/main/java/com/fr/design/gui/itree/refreshabletree/TreeRootPane.java +++ b/designer-base/src/main/java/com/fr/design/gui/itree/refreshabletree/TreeRootPane.java @@ -1,17 +1,14 @@ package com.fr.design.gui.itree.refreshabletree; -import java.awt.Color; +import com.fr.data.impl.TreeAttr; +import com.fr.design.dialog.BasicPane; +import com.fr.design.gui.icheckbox.UICheckBox; +import com.fr.design.layout.FRGUIPaneFactory; import javax.swing.BorderFactory; import javax.swing.BoxLayout; -import com.fr.design.gui.ilable.UILabel; import javax.swing.JPanel; -import com.fr.data.impl.TreeAttr; -import com.fr.design.gui.icheckbox.UICheckBox; -import com.fr.design.layout.FRGUIPaneFactory; -import com.fr.design.dialog.BasicPane; - public class TreeRootPane extends BasicPane { @@ -31,7 +28,7 @@ public class TreeRootPane extends BasicPane { JPanel checkTypePane = FRGUIPaneFactory.createBoxFlowInnerContainer_S_Pane_First0(); checkTypePane.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0)); - checkTypeCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Tree-Mutiple_Selection_Or_Not")); + checkTypeCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tree_Mutiple_Selection_Or_Not")); checkTypeCheckBox.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0)); checkTypePane.add(checkTypeCheckBox); @@ -39,7 +36,7 @@ public class TreeRootPane extends BasicPane { JPanel loadTypePane = FRGUIPaneFactory.createBoxFlowInnerContainer_S_Pane_First0(); checkTypePane.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0)); - loadTypeCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Widget-Load_By_Async")); + loadTypeCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Load_By_Async")); loadTypeCheckBox.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0)); loadTypePane.add(loadTypeCheckBox); @@ -47,14 +44,14 @@ public class TreeRootPane extends BasicPane { JPanel leafSelectPane = FRGUIPaneFactory.createBoxFlowInnerContainer_S_Pane_First0(); checkTypePane.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0)); - leafSelectPane.add(layerTypeCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Tree-Select_Leaf_Only"))); + leafSelectPane.add(layerTypeCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tree_Select_Leaf_Only"))); layerTypeCheckBox.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0)); this.add(leafSelectPane); JPanel returnFullPathPane = FRGUIPaneFactory.createBoxFlowInnerContainer_S_Pane_First0(); checkTypePane.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0)); - returnFullPathPane.add(returnFullPathCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Tree-Return_Full_Path"))); + returnFullPathPane.add(returnFullPathCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tree_Return_Full_Path"))); returnFullPathCheckBox.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0)); this.add(returnFullPathPane); @@ -82,4 +79,4 @@ public class TreeRootPane extends BasicPane { return treeAttr; } -} \ No newline at end of file +} diff --git a/designer-base/src/main/java/com/fr/design/hyperlink/ReportletHyperlinkPane.java b/designer-base/src/main/java/com/fr/design/hyperlink/ReportletHyperlinkPane.java index 7575f7221..d7d5cc674 100644 --- a/designer-base/src/main/java/com/fr/design/hyperlink/ReportletHyperlinkPane.java +++ b/designer-base/src/main/java/com/fr/design/hyperlink/ReportletHyperlinkPane.java @@ -47,7 +47,7 @@ public class ReportletHyperlinkPane extends AbstractHyperLinkPane { parameterViewPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Parameters"), null)); useCJKCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Hyperlink_Use_CJK_To_Encode_Parameter")); - extendParametersCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Hyperlink-Extends_Report_Parameters")); + extendParametersCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Find-Design_Basic_Hyperlink_Extends_Report_Parameters")); this.add(GUICoreUtils.createFlowPane(new Component[]{useCJKCheckBox, extendParametersCheckBox}, FlowLayout.LEFT), BorderLayout.SOUTH); } @Override public String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("Hyperlink-Web_link"); + return com.fr.design.i18n.Toolkit.i18nText("Fine_Design_Basic_Hyperlink_Web_Link"); } @Override @@ -125,4 +125,4 @@ public class WebHyperlinkPane extends AbstractHyperLinkPane { public void setExtendParametersCheckBox(UICheckBox extendParametersCheckBox) { this.extendParametersCheckBox = extendParametersCheckBox; } -} \ No newline at end of file +} diff --git a/designer-base/src/main/java/com/fr/design/javascript/EmailPane.java b/designer-base/src/main/java/com/fr/design/javascript/EmailPane.java index 7cb07ebc0..9f2650cf1 100644 --- a/designer-base/src/main/java/com/fr/design/javascript/EmailPane.java +++ b/designer-base/src/main/java/com/fr/design/javascript/EmailPane.java @@ -64,8 +64,8 @@ public class EmailPane extends FurtherBasicBeanPane { showTplContent = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Email_Can_Preview_Report_Content")); centerPane = TableLayoutHelper.createCommonTableLayoutPane(new JComponent[][]{ {new UILabel(), tipsPane1}, - createLinePane(com.fr.design.i18n.Toolkit.i18nText("HJS-Mail_to"), maitoEditor = new UITextField()), - createLinePane(com.fr.design.i18n.Toolkit.i18nText("HJS-CC_to"), ccEditor = new UITextField()), + createLinePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_HJS_Mail_to"), maitoEditor = new UITextField()), + createLinePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_HJS_CC_To"), ccEditor = new UITextField()), createLinePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_EmailPane_Bcc"), bccEditor = new UITextField()), createLinePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_EmailPane_Mail_Subject"), titleEditor = new UITextField()), {mainTextLabel, scrollPane}, @@ -151,4 +151,4 @@ public class EmailPane extends FurtherBasicBeanPane { return ob instanceof EmailJavaScript; } -} \ No newline at end of file +} diff --git a/designer-base/src/main/java/com/fr/design/javascript/FormSubmitJavaScriptPane.java b/designer-base/src/main/java/com/fr/design/javascript/FormSubmitJavaScriptPane.java index 46cb53d73..79489ce8c 100644 --- a/designer-base/src/main/java/com/fr/design/javascript/FormSubmitJavaScriptPane.java +++ b/designer-base/src/main/java/com/fr/design/javascript/FormSubmitJavaScriptPane.java @@ -1,32 +1,29 @@ package com.fr.design.javascript; -import java.awt.BorderLayout; -import java.awt.Dimension; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; -import java.util.List; - -import javax.swing.BorderFactory; - -import com.fr.design.gui.ibutton.UIButton; -import com.fr.design.gui.ilable.UILabel; -import javax.swing.JPanel; - import com.fr.base.Parameter; import com.fr.design.beans.FurtherBasicBeanPane; import com.fr.design.gui.frpane.ReportletParameterViewPane; +import com.fr.design.gui.ibutton.UIButton; import com.fr.design.gui.icombobox.UIComboBox; +import com.fr.design.gui.ilable.UILabel; import com.fr.design.gui.itextfield.UITextField; import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.scrollruler.ModLineBorder; import com.fr.general.ComparatorUtils; - import com.fr.js.FormSubmitJavaScript; import com.fr.stable.ParameterProvider; +import javax.swing.BorderFactory; +import javax.swing.JPanel; +import java.awt.BorderLayout; +import java.awt.Dimension; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.util.List; + public class FormSubmitJavaScriptPane extends FurtherBasicBeanPane { - public static final String ASYNCH = com.fr.design.i18n.Toolkit.i18nText("JavaScrit-Asynch"); - public static final String SYNCH = com.fr.design.i18n.Toolkit.i18nText("JavaScript-Synch"); + public static final String ASYNCH = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_JavaScript_Asynch"); + public static final String SYNCH = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_JavaScript_Synch"); private UITextField urlTextField; private UIComboBox asynComboBox; private ReportletParameterViewPane pViewPane; @@ -58,7 +55,7 @@ public class FormSubmitJavaScriptPane extends FurtherBasicBeanPane(textArray, valueArray); directionPane.setSelectedIndex(0); @@ -116,7 +116,7 @@ public class GradientBackgroundQuickPane extends BackgroundQuickPane { @Override public String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("Gradient-Color"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Gradient_Color"); } @Override @@ -134,4 +134,4 @@ public class GradientBackgroundQuickPane extends BackgroundQuickPane { } } -} \ No newline at end of file +} diff --git a/designer-base/src/main/java/com/fr/design/mainframe/backgroundpane/ImageBackgroundQuickPane.java b/designer-base/src/main/java/com/fr/design/mainframe/backgroundpane/ImageBackgroundQuickPane.java index fcc1f5360..7f794b708 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/backgroundpane/ImageBackgroundQuickPane.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/backgroundpane/ImageBackgroundQuickPane.java @@ -64,7 +64,7 @@ public class ImageBackgroundQuickPane extends BackgroundQuickPane { this.add(contentPane, BorderLayout.CENTER); - UIButton selectPictureButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Image-Select_Picture")); + UIButton selectPictureButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Image_Select_Picture")); selectPictureButton.addActionListener(selectPictureActionListener); if (hasImageLayout) { diff --git a/designer-base/src/main/java/com/fr/design/mainframe/loghandler/LogHandlerBarUI.java b/designer-base/src/main/java/com/fr/design/mainframe/loghandler/LogHandlerBarUI.java index 4c16af933..6c6c6545f 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/loghandler/LogHandlerBarUI.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/loghandler/LogHandlerBarUI.java @@ -102,7 +102,7 @@ public class LogHandlerBarUI extends ComponentUI implements MouseListener, Focus g.drawString(com.fr.design.i18n.Toolkit.i18nText("NNormal") + '(' + button.getInfo() + ')', button.getWidth() - 310, y); g.drawString(com.fr.design.i18n.Toolkit.i18nText("Alert") + '(' + button.getError() + ')', button.getWidth() - 250, y); - g.drawString(com.fr.design.i18n.Toolkit.i18nText("Seriously") + '(' + button.getServer() + ')', button.getWidth() - 190, y); + g.drawString(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Seriously") + '(' + button.getServer() + ')', button.getWidth() - 190, y); } /** @@ -155,4 +155,4 @@ public class LogHandlerBarUI extends ComponentUI implements MouseListener, Focus */ public void focusGained(FocusEvent e) { } -} \ No newline at end of file +} diff --git a/designer-base/src/main/java/com/fr/design/mainframe/widget/wrappers/BackgroundWrapper.java b/designer-base/src/main/java/com/fr/design/mainframe/widget/wrappers/BackgroundWrapper.java index 1f88ee7d9..3b03de1f5 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/widget/wrappers/BackgroundWrapper.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/widget/wrappers/BackgroundWrapper.java @@ -31,9 +31,9 @@ public class BackgroundWrapper implements Encoder, Decoder { } else if (v instanceof PatternBackground) { return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Pattern"); } else if (v instanceof ImageFileBackground) { - return com.fr.design.i18n.Toolkit.i18nText("Image"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Image"); } else if (v instanceof GradientBackground) { - return com.fr.design.i18n.Toolkit.i18nText("Gradient-Color"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Gradient_Color"); } else { return com.fr.design.i18n.Toolkit.i18nText("None"); } @@ -47,4 +47,4 @@ public class BackgroundWrapper implements Encoder, Decoder { @Override public void validate(String txt) throws ValidationException { } -} \ No newline at end of file +} diff --git a/designer-base/src/main/java/com/fr/design/roleAuthority/ReportAndFSManagePane.java b/designer-base/src/main/java/com/fr/design/roleAuthority/ReportAndFSManagePane.java index 8509043ce..cc16ab2be 100644 --- a/designer-base/src/main/java/com/fr/design/roleAuthority/ReportAndFSManagePane.java +++ b/designer-base/src/main/java/com/fr/design/roleAuthority/ReportAndFSManagePane.java @@ -331,7 +331,7 @@ public class ReportAndFSManagePane extends DockingView implements Prepare4DataSo // return; // } // -// int returnVal = JOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Utils-Are_you_sure_to_remove_the_selected_item") + ":" + selectedNO.getName() + "?", +// int returnVal = JOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Utils_Are_You_Sure_To_Remove_The_Selected_Item") + ":" + selectedNO.getName() + "?", // com.fr.design.i18n.Toolkit.i18nText("Remove"), JOptionPane.OK_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE); // if (returnVal == JOptionPane.OK_OPTION) { // op.removeAction(selectedNO.getName()); diff --git a/designer-base/src/main/java/com/fr/design/roleAuthority/RoleSourceOP.java b/designer-base/src/main/java/com/fr/design/roleAuthority/RoleSourceOP.java index 54920e364..92c48187b 100644 --- a/designer-base/src/main/java/com/fr/design/roleAuthority/RoleSourceOP.java +++ b/designer-base/src/main/java/com/fr/design/roleAuthority/RoleSourceOP.java @@ -1 +1 @@ -package com.fr.design.roleAuthority; import com.fr.general.NameObject; import com.fr.design.gui.itree.refreshabletree.ExpandMutableTreeNode; import com.fr.design.gui.itree.refreshabletree.UserObjectOP; import java.util.*; /** * Author : daisy * Date: 13-8-30 * Time: 下午3:36 */ public class RoleSourceOP implements UserObjectOP { private static final int REPORT_PLATEFORM_MANAGE = 0; private static final int FS_MANAGE = 1; public static int manageMode = -1; public RoleSourceOP() { super(); } public List> init() { //用于存放角色 List> allRoles = new ArrayList>(); Map report_roles = new LinkedHashMap(); Map FS_roles = new LinkedHashMap(); addReportRoles(report_roles); addFSRoles(FS_roles); allRoles.add(report_roles); allRoles.add(FS_roles); return allRoles; } /** * 获取报表平台的角色 */ protected void addReportRoles(Map report_roles) { RoleDataWrapper tdw = new RoleDataWrapper(com.fr.design.i18n.Toolkit.i18nText("M_Server-Platform_Manager")); report_roles.put(com.fr.design.i18n.Toolkit.i18nText("Role"), tdw); } /** * 获取数据决策系统的角色 */ protected void addFSRoles(Map FS_roles) { RoleDataWrapper tdw = new RoleDataWrapper(com.fr.design.i18n.Toolkit.i18nText("FS_Name")); FS_roles.put(com.fr.design.i18n.Toolkit.i18nText("Role"), tdw); } public boolean interceptButtonEnabled() { return true; } /** * 移除名字是name的角色 * * @param name */ public void removeAction(String name) { //删除对应模式下的角色 switch (manageMode) { case REPORT_PLATEFORM_MANAGE: //删除报表平台的角色 break; case FS_MANAGE: //删除数据决策系统的角色 break; } } public void addAction(String name) { switch (manageMode) { case REPORT_PLATEFORM_MANAGE: //增加报表平台的角色 break; case FS_MANAGE: //增加数据决策系统的角色 break; } } public void rename(String oldName, String newName) { switch (manageMode) { case REPORT_PLATEFORM_MANAGE: //修改报表平台的角色 break; case FS_MANAGE: //修改数据决策系统的角色 break; } } /** * 根据不同模式生成子节点 * * @return */ @Override public ExpandMutableTreeNode[] load() { Map report_roles = null; Map FS_roles = null; if (this != null) { report_roles = this.init().get(0); FS_roles = this.init().get(1); } else { report_roles = Collections.emptyMap(); FS_roles = Collections.emptyMap(); } List list = new ArrayList(); //所有的角色 List reportlist = new ArrayList(); //报表平台橘色 List FSlist = new ArrayList(); //数据决策系统角色 list.add(initReportRolseNode(report_roles)); addNodeToList(report_roles, reportlist); list.add(initFSRolseNode(FS_roles)); addNodeToList(FS_roles, FSlist); switch (manageMode) { case REPORT_PLATEFORM_MANAGE: return reportlist.toArray(new ExpandMutableTreeNode[reportlist.size()]); case FS_MANAGE: return FSlist.toArray(new ExpandMutableTreeNode[FSlist.size()]); default: return list.toArray(new ExpandMutableTreeNode[list.size()]); } } protected void setDataMode(int i) { manageMode = i; } protected void addNodeToList(Map roleMap, List roleList) { ExpandMutableTreeNode[] roleNode = getNodeArrayFromMap(roleMap); for (int i = 0; i < roleNode.length; i++) { roleList.add(roleNode[i]); } } protected ExpandMutableTreeNode initReportRolseNode(Map report_roles) { ExpandMutableTreeNode templateNode = new ExpandMutableTreeNode(new NameObject(com.fr.design.i18n.Toolkit.i18nText("M_Server-Platform_Manager"), REPORT_PLATEFORM_MANAGE), true); templateNode.addChildTreeNodes(getNodeArrayFromMap(report_roles)); return templateNode; } protected ExpandMutableTreeNode initFSRolseNode(Map FS_roles) { ExpandMutableTreeNode templateNode = new ExpandMutableTreeNode(new NameObject(com.fr.design.i18n.Toolkit.i18nText("FS_Name"), FS_MANAGE), true); templateNode.addChildTreeNodes(getNodeArrayFromMap(FS_roles)); return templateNode; } protected ExpandMutableTreeNode[] getNodeArrayFromMap(Map map) { List roleList = new ArrayList(); Iterator> entryIt = map.entrySet().iterator(); while (entryIt.hasNext()) { Map.Entry entry = entryIt.next(); String name = entry.getKey(); RoleDataWrapper t = entry.getValue(); ExpandMutableTreeNode newChildTreeNode = new ExpandMutableTreeNode(new NameObject(name, t)); roleList.add(newChildTreeNode); newChildTreeNode.add(new ExpandMutableTreeNode()); } return roleList.toArray(new ExpandMutableTreeNode[roleList.size()]); } } \ No newline at end of file +package com.fr.design.roleAuthority; import com.fr.general.NameObject; import com.fr.design.gui.itree.refreshabletree.ExpandMutableTreeNode; import com.fr.design.gui.itree.refreshabletree.UserObjectOP; import java.util.*; /** * Author : daisy * Date: 13-8-30 * Time: 下午3:36 */ public class RoleSourceOP implements UserObjectOP { private static final int REPORT_PLATEFORM_MANAGE = 0; private static final int FS_MANAGE = 1; public static int manageMode = -1; public RoleSourceOP() { super(); } public List> init() { //用于存放角色 List> allRoles = new ArrayList>(); Map report_roles = new LinkedHashMap(); Map FS_roles = new LinkedHashMap(); addReportRoles(report_roles); addFSRoles(FS_roles); allRoles.add(report_roles); allRoles.add(FS_roles); return allRoles; } /** * 获取报表平台的角色 */ protected void addReportRoles(Map report_roles) { RoleDataWrapper tdw = new RoleDataWrapper(com.fr.design.i18n.Toolkit.i18nText("M_Server-Platform_Manager")); report_roles.put(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Role"), tdw); } /** * 获取数据决策系统的角色 */ protected void addFSRoles(Map FS_roles) { RoleDataWrapper tdw = new RoleDataWrapper(com.fr.design.i18n.Toolkit.i18nText("FS_Name")); FS_roles.put(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Role"), tdw); } public boolean interceptButtonEnabled() { return true; } /** * 移除名字是name的角色 * * @param name */ public void removeAction(String name) { //删除对应模式下的角色 switch (manageMode) { case REPORT_PLATEFORM_MANAGE: //删除报表平台的角色 break; case FS_MANAGE: //删除数据决策系统的角色 break; } } public void addAction(String name) { switch (manageMode) { case REPORT_PLATEFORM_MANAGE: //增加报表平台的角色 break; case FS_MANAGE: //增加数据决策系统的角色 break; } } public void rename(String oldName, String newName) { switch (manageMode) { case REPORT_PLATEFORM_MANAGE: //修改报表平台的角色 break; case FS_MANAGE: //修改数据决策系统的角色 break; } } /** * 根据不同模式生成子节点 * * @return */ @Override public ExpandMutableTreeNode[] load() { Map report_roles = null; Map FS_roles = null; if (this != null) { report_roles = this.init().get(0); FS_roles = this.init().get(1); } else { report_roles = Collections.emptyMap(); FS_roles = Collections.emptyMap(); } List list = new ArrayList(); //所有的角色 List reportlist = new ArrayList(); //报表平台橘色 List FSlist = new ArrayList(); //数据决策系统角色 list.add(initReportRolseNode(report_roles)); addNodeToList(report_roles, reportlist); list.add(initFSRolseNode(FS_roles)); addNodeToList(FS_roles, FSlist); switch (manageMode) { case REPORT_PLATEFORM_MANAGE: return reportlist.toArray(new ExpandMutableTreeNode[reportlist.size()]); case FS_MANAGE: return FSlist.toArray(new ExpandMutableTreeNode[FSlist.size()]); default: return list.toArray(new ExpandMutableTreeNode[list.size()]); } } protected void setDataMode(int i) { manageMode = i; } protected void addNodeToList(Map roleMap, List roleList) { ExpandMutableTreeNode[] roleNode = getNodeArrayFromMap(roleMap); for (int i = 0; i < roleNode.length; i++) { roleList.add(roleNode[i]); } } protected ExpandMutableTreeNode initReportRolseNode(Map report_roles) { ExpandMutableTreeNode templateNode = new ExpandMutableTreeNode(new NameObject(com.fr.design.i18n.Toolkit.i18nText("M_Server-Platform_Manager"), REPORT_PLATEFORM_MANAGE), true); templateNode.addChildTreeNodes(getNodeArrayFromMap(report_roles)); return templateNode; } protected ExpandMutableTreeNode initFSRolseNode(Map FS_roles) { ExpandMutableTreeNode templateNode = new ExpandMutableTreeNode(new NameObject(com.fr.design.i18n.Toolkit.i18nText("FS_Name"), FS_MANAGE), true); templateNode.addChildTreeNodes(getNodeArrayFromMap(FS_roles)); return templateNode; } protected ExpandMutableTreeNode[] getNodeArrayFromMap(Map map) { List roleList = new ArrayList(); Iterator> entryIt = map.entrySet().iterator(); while (entryIt.hasNext()) { Map.Entry entry = entryIt.next(); String name = entry.getKey(); RoleDataWrapper t = entry.getValue(); ExpandMutableTreeNode newChildTreeNode = new ExpandMutableTreeNode(new NameObject(name, t)); roleList.add(newChildTreeNode); newChildTreeNode.add(new ExpandMutableTreeNode()); } return roleList.toArray(new ExpandMutableTreeNode[roleList.size()]); } } \ No newline at end of file diff --git a/designer-base/src/main/java/com/fr/design/style/AlignmentPane.java b/designer-base/src/main/java/com/fr/design/style/AlignmentPane.java index 718bc088b..581a63b62 100644 --- a/designer-base/src/main/java/com/fr/design/style/AlignmentPane.java +++ b/designer-base/src/main/java/com/fr/design/style/AlignmentPane.java @@ -35,10 +35,10 @@ public class AlignmentPane extends BasicPane { private AlignmentComboBox verAlignmentComboBox; private UIComboBox textComboBox; private static final String[] TEXT = { - com.fr.design.i18n.Toolkit.i18nText("StyleAlignment-Wrap_Text"), - com.fr.design.i18n.Toolkit.i18nText("StyleAlignment-Single_Line"), - com.fr.design.i18n.Toolkit.i18nText("StyleAlignment-Single_Line(Adjust_Font)"), - com.fr.design.i18n.Toolkit.i18nText("StyleAlignment-Multi_Line(Adjust_Font)")}; + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_StyleAlignment_Wrap_Text"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_StyleAlignment_Single_Line"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_StyleAlignment_Single_Line(Adjust_Font)"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_StyleAlignment_Multi_Line(Adjust_Font)")}; private UIBasicSpinner rotationSpinner; private UICheckBox isVerticalTextCheckBox; private UIRadioButton leftToRightRB; @@ -86,7 +86,7 @@ public class AlignmentPane extends BasicPane { //richer:文本控制和图片布局 JPanel textDirectionPanel = FRGUIPaneFactory.createY_AXISBoxInnerContainer_S_Pane(); contentPane.add(textDirectionPanel); - textDirectionPanel.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("StyleAlignment-Text_Rotation"), null)); + textDirectionPanel.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_StyleAlignment_Text_Rotation"), null)); JPanel isVerticalTextPanel = FRGUIPaneFactory.createMediumHGapFlowInnerContainer_M_Pane(); textDirectionPanel.add(isVerticalTextPanel); initVerticalPane(isVerticalTextPanel); @@ -94,7 +94,7 @@ public class AlignmentPane extends BasicPane { JPanel rotationPane = FRGUIPaneFactory.createMediumHGapFlowInnerContainer_M_Pane(); textDirectionPanel.add(rotationPane); - rotationPane.add(new UILabel(" " + com.fr.design.i18n.Toolkit.i18nText("StyleAlignment-Text_Rotation")));//james:加了一个空格，这样对齐了好看些 + rotationPane.add(new UILabel(" " + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_StyleAlignment_Text_Rotation")));//james:加了一个空格，这样对齐了好看些 rotationSpinner = new UIBasicSpinner(new SpinnerNumberModel(0, -NUM_90, NUM_90, 1)); rotationSpinner.addChangeListener(changeListener); @@ -136,24 +136,24 @@ public class AlignmentPane extends BasicPane { spacingBeforeSpinner = new UIBasicSpinner(new SpinnerNumberModel(new Integer(0), new Integer(0), null, new Integer(1))); spacingBeforeSpinner.addChangeListener(changeListener); GUICoreUtils.setColumnForSpinner(spacingBeforeSpinner, 3); - spacingPane.add(this.createCenterFlowPane(com.fr.design.i18n.Toolkit.i18nText("Style-Spacing_Before"), spacingBeforeSpinner)); + spacingPane.add(this.createCenterFlowPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Spacing_Before_Duplicate"), spacingBeforeSpinner)); spacingAfterSpinner = new UIBasicSpinner(new SpinnerNumberModel(new Integer(0), new Integer(0), null, new Integer(1))); spacingAfterSpinner.addChangeListener(changeListener); GUICoreUtils.setColumnForSpinner(spacingAfterSpinner, 3); - spacingPane.add(this.createCenterFlowPane(com.fr.design.i18n.Toolkit.i18nText("Style-Spacing_After"), spacingAfterSpinner)); + spacingPane.add(this.createCenterFlowPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Spacing_After_Duplicate"), spacingAfterSpinner)); lineSpacingSpinner = new UIBasicSpinner(new SpinnerNumberModel(new Integer(0), new Integer(0), null, new Integer(1))); lineSpacingSpinner.addChangeListener(changeListener); GUICoreUtils.setColumnForSpinner(lineSpacingSpinner, 3); - spacingPane.add(this.createCenterFlowPane(com.fr.design.i18n.Toolkit.i18nText("Style-Line_Spacing"), lineSpacingSpinner)); + spacingPane.add(this.createCenterFlowPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Line_Spacing_Duplicate"), lineSpacingSpinner)); } private JPanel getIndentPane() { JPanel indentPane = FRGUIPaneFactory.createMediumHGapFlowInnerContainer_M_Pane(); - indentPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Sytle-Indentation"), null)); + indentPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Sytle_Indentation"), null)); Comparable maximum = null; leftIndentSpinner = new UIBasicSpinner(new SpinnerNumberModel(new Integer(0), new Integer(0), maximum, new Integer(1))); leftIndentSpinner.addChangeListener(changeListener); @@ -168,7 +168,7 @@ public class AlignmentPane extends BasicPane { } private JPanel getTextImagePane() { - JPanel textImagePane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("StyleAlignment-Text_Style")); + JPanel textImagePane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_StyleAlignment_Text_Style")); //textStyle. JPanel textStylePane = FRGUIPaneFactory.createMediumHGapFlowInnerContainer_M_Pane(); @@ -176,7 +176,7 @@ public class AlignmentPane extends BasicPane { textComboBox = new UIComboBox(TEXT); textComboBox.addActionListener(actionListener); - textStylePane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("StyleAlignment-Text_Style"))); + textStylePane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_StyleAlignment_Text_Style"))); textStylePane.add(textComboBox); textImagePane.add(textStylePane);//将文本放后面更好看点 return textImagePane; diff --git a/designer-base/src/main/java/com/fr/design/style/FRFontPane.java b/designer-base/src/main/java/com/fr/design/style/FRFontPane.java index 01b8cbe23..806c2f937 100644 --- a/designer-base/src/main/java/com/fr/design/style/FRFontPane.java +++ b/designer-base/src/main/java/com/fr/design/style/FRFontPane.java @@ -277,7 +277,7 @@ public class FRFontPane extends BasicPane { @Override protected String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("Sytle-FRFont"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Sytle_FRFont"); } /** @@ -401,4 +401,4 @@ public class FRFontPane extends BasicPane { updatePreviewLabel(); } } -} \ No newline at end of file +} diff --git a/designer-base/src/main/java/com/fr/design/style/FormatBox.java b/designer-base/src/main/java/com/fr/design/style/FormatBox.java index 535807637..3f322a418 100644 --- a/designer-base/src/main/java/com/fr/design/style/FormatBox.java +++ b/designer-base/src/main/java/com/fr/design/style/FormatBox.java @@ -69,7 +69,7 @@ public class FormatBox extends BasicPane { formatBox.setEnabled(false); pane.add(formatBox); - pane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("StyleFormat-Sample") + ":")); + pane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_StyleFormat_Sample") + ":")); pane.add(previewLabel = new UILabel("")); typeBox.addItemListener(typeListener); @@ -205,4 +205,4 @@ public class FormatBox extends BasicPane { private boolean isMoneyPattern(String pattern) { return (pattern.length() > 0 && pattern.charAt(0) == '¤') || (pattern.length() > 0 && pattern.charAt(0) == '$'); } -} \ No newline at end of file +} diff --git a/designer-base/src/main/java/com/fr/design/style/FormatPane.java b/designer-base/src/main/java/com/fr/design/style/FormatPane.java index 3efb1724c..062dc7f94 100644 --- a/designer-base/src/main/java/com/fr/design/style/FormatPane.java +++ b/designer-base/src/main/java/com/fr/design/style/FormatPane.java @@ -82,7 +82,7 @@ public class FormatPane extends BasicPane { //sample pane JPanel samplePane = FRGUIPaneFactory.createBorderLayout_S_Pane(); this.add(samplePane, BorderLayout.NORTH); - samplePane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("StyleFormat-Sample"), null)); + samplePane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_StyleFormat_Sample"), null)); samplePane.setLayout(FRGUIPaneFactory.createBorderLayout()); sampleLabel = new UILabel(FormatField.getInstance().getFormatValue()); samplePane.add(sampleLabel, BorderLayout.CENTER); @@ -488,4 +488,4 @@ public class FormatPane extends BasicPane { } }; -} \ No newline at end of file +} diff --git a/designer-base/src/main/java/com/fr/design/style/background/BackgroundUIComboBoxPane.java b/designer-base/src/main/java/com/fr/design/style/background/BackgroundUIComboBoxPane.java index 00fd0eec5..cb85cea46 100644 --- a/designer-base/src/main/java/com/fr/design/style/background/BackgroundUIComboBoxPane.java +++ b/designer-base/src/main/java/com/fr/design/style/background/BackgroundUIComboBoxPane.java @@ -30,8 +30,8 @@ public class BackgroundUIComboBoxPane extends BasicPane { protected static final String none = com.fr.design.i18n.Toolkit.i18nText("DataFunction-None"); protected static final String color = com.fr.design.i18n.Toolkit.i18nText("Colors"); - protected static final String image = com.fr.design.i18n.Toolkit.i18nText("Image"); - protected static final String gradient = com.fr.design.i18n.Toolkit.i18nText("Gradient-Color"); + protected static final String image = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Image"); + protected static final String gradient = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Gradient_Color"); protected CardLayout cardLayout; protected JPanel layoutPane; diff --git a/designer-base/src/main/java/com/fr/design/style/background/gradient/GradientFromToPixPane.java b/designer-base/src/main/java/com/fr/design/style/background/gradient/GradientFromToPixPane.java index 2112446b3..64099e4b6 100644 --- a/designer-base/src/main/java/com/fr/design/style/background/gradient/GradientFromToPixPane.java +++ b/designer-base/src/main/java/com/fr/design/style/background/gradient/GradientFromToPixPane.java @@ -42,7 +42,7 @@ public class GradientFromToPixPane extends BasicPane { endPixSpinner = new UIBasicSpinner(new SpinnerNumberModel(1, 1, 9999, 1)); secondFloorPane.add(endPixSpinner); - secondFloorPane.add(new UILabel("(" + com.fr.design.i18n.Toolkit.i18nText("Indent-Pixel") + ")")); + secondFloorPane.add(new UILabel("(" + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Indent_Pixel") + ")")); JFormattedTextField endField = ((JSpinner.DefaultEditor)endPixSpinner.getEditor()).getTextField(); endField.setHorizontalAlignment(UITextField.LEFT); diff --git a/designer-base/src/main/java/com/fr/design/style/background/gradient/GradientSelectBox.java b/designer-base/src/main/java/com/fr/design/style/background/gradient/GradientSelectBox.java index 8f3a920a9..3c5ebf4df 100644 --- a/designer-base/src/main/java/com/fr/design/style/background/gradient/GradientSelectBox.java +++ b/designer-base/src/main/java/com/fr/design/style/background/gradient/GradientSelectBox.java @@ -63,7 +63,7 @@ public class GradientSelectBox extends BasicPane { } protected String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("Gradient-Color"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Gradient_Color"); } public void populate(GradientBackground background) { @@ -81,4 +81,4 @@ public class GradientSelectBox extends BasicPane { background.setStartColor(startColor); background.setEndColor(endColor); } -} \ No newline at end of file +} diff --git a/designer-base/src/main/java/com/fr/design/style/background/image/ImageSelectPane.java b/designer-base/src/main/java/com/fr/design/style/background/image/ImageSelectPane.java index e63b6e2f1..dac87c57f 100644 --- a/designer-base/src/main/java/com/fr/design/style/background/image/ImageSelectPane.java +++ b/designer-base/src/main/java/com/fr/design/style/background/image/ImageSelectPane.java @@ -33,7 +33,7 @@ import java.io.File; public class ImageSelectPane extends BackgroundPane4BoxChange { private static final long serialVersionUID = -3938766570998917557L; private static String layoutCenter = com.fr.design.i18n.Toolkit.i18nText("Default"); - private static String layoutTitled = com.fr.design.i18n.Toolkit.i18nText("Image-Titled"); + private static String layoutTitled = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Image_Titled"); private String suffix = PictureCollection.DEFAULT_SUFFIX; @@ -66,7 +66,7 @@ public class ImageSelectPane extends BackgroundPane4BoxChange { pane.add(testPane1); // 选择图片按钮 - UIButton selectPictureButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Image-Select_Picture")); + UIButton selectPictureButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Image_Select_Picture")); selectFilePane.add(selectPictureButton); selectPictureButton.setPreferredSize(new Dimension(110, 20)); @@ -159,6 +159,6 @@ public class ImageSelectPane extends BackgroundPane4BoxChange { @Override protected String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("Image-Select_Picture"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Image_Select_Picture"); } -} \ No newline at end of file +} diff --git a/designer-base/src/main/java/com/fr/design/utils/gui/GUICoreUtils.java b/designer-base/src/main/java/com/fr/design/utils/gui/GUICoreUtils.java index e3cb5597b..078fe05d0 100644 --- a/designer-base/src/main/java/com/fr/design/utils/gui/GUICoreUtils.java +++ b/designer-base/src/main/java/com/fr/design/utils/gui/GUICoreUtils.java @@ -684,7 +684,7 @@ public abstract class GUICoreUtils{ return false; } - int returnVal = JOptionPane.showConfirmDialog(ancestorWindow, com.fr.design.i18n.Toolkit.i18nText("Utils-Are_you_sure_to_remove_the_selected_item") + "?", com.fr.design.i18n.Toolkit.i18nText("Remove"), + int returnVal = JOptionPane.showConfirmDialog(ancestorWindow, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Utils_Are_You_Sure_To_Remove_The_Selected_Item") + "?", com.fr.design.i18n.Toolkit.i18nText("Remove"), JOptionPane.OK_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE); if (returnVal == JOptionPane.OK_OPTION) { int minSelectedIndex = nodeList.getMinSelectionIndex(); @@ -891,4 +891,4 @@ public abstract class GUICoreUtils{ panel.add(dynamicPaneWrapper, BorderLayout.CENTER); return panel; } -} \ 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 994315bb2..eb0c1d4b1 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 @@ -30,8 +30,8 @@ public class ButtonConstants { public static final String[] TYPES4BUTTON = { com.fr.design.i18n.Toolkit.i18nText("Common"), 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_Report_Utils_Insert_Row"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Utils_Delete_Row"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Button_Type_Parameter_Submit"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_TreeNode") }; diff --git a/designer-base/src/main/java/com/fr/design/widget/component/CheckBoxDictPane.java b/designer-base/src/main/java/com/fr/design/widget/component/CheckBoxDictPane.java index 9874a01f3..13ce7fdaa 100644 --- a/designer-base/src/main/java/com/fr/design/widget/component/CheckBoxDictPane.java +++ b/designer-base/src/main/java/com/fr/design/widget/component/CheckBoxDictPane.java @@ -41,7 +41,7 @@ public class CheckBoxDictPane extends JPanel { }; returnStringPane = TableLayoutHelper.createGapTableLayoutPane(components, TableLayoutHelper.FILL_LASTCOLUMN, IntervalConstants.INTERVAL_W2, IntervalConstants.INTERVAL_L1); - returnTypeComboBox = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Widget-Array"), com.fr.design.i18n.Toolkit.i18nText("String")}); + returnTypeComboBox = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Array"), com.fr.design.i18n.Toolkit.i18nText("String")}); returnTypeComboBox.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent e) { @@ -49,7 +49,7 @@ public class CheckBoxDictPane extends JPanel { } }); JPanel headPane = TableLayoutHelper.createGapTableLayoutPane( - new Component[][]{new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Widget-Date_Selector_Return_Type")), returnTypeComboBox}}, TableLayoutHelper.FILL_LASTCOLUMN, IntervalConstants.INTERVAL_L2, IntervalConstants.INTERVAL_L1); + new Component[][]{new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Date_Selector_Return_Type")), returnTypeComboBox}}, TableLayoutHelper.FILL_LASTCOLUMN, IntervalConstants.INTERVAL_L2, IntervalConstants.INTERVAL_L1); JPanel jPanel = FRGUIPaneFactory.createBorderLayout_S_Pane(); jPanel.add(headPane, BorderLayout.NORTH); jPanel.add(returnStringPane, BorderLayout.CENTER); @@ -87,4 +87,4 @@ public class CheckBoxDictPane extends JPanel { checkBoxGroup.setStartSymbol((String)this.startComboBox.getSelectedItem()); checkBoxGroup.setEndSymbol((String)this.endComboBox.getSelectedItem()); } -} \ 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 f8e089aaa..158aacd06 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 @@ -568,7 +568,7 @@ public class DBManipulationPane extends BasicBeanPane { protected class RemoveFieldAction extends UpdateAction { public RemoveFieldAction() { - this.setName(com.fr.design.i18n.Toolkit.i18nText("RWA-Remove_Field")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_RWA_Remove_Field")); } public void actionPerformed(ActionEvent evt) { diff --git a/designer-base/src/main/java/com/fr/design/write/submit/SubmitJobListPane.java b/designer-base/src/main/java/com/fr/design/write/submit/SubmitJobListPane.java index face6e7d1..d52eb4a65 100644 --- a/designer-base/src/main/java/com/fr/design/write/submit/SubmitJobListPane.java +++ b/designer-base/src/main/java/com/fr/design/write/submit/SubmitJobListPane.java @@ -57,6 +57,6 @@ public class SubmitJobListPane extends ObjectJControlPane { @Override protected String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("Set_Submit_Event"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Set_Submit_Event"); } } diff --git a/designer-base/src/main/java/com/fr/env/RemoteSignInPane.java b/designer-base/src/main/java/com/fr/env/RemoteSignInPane.java index 047f4e5f7..2ca95160f 100644 --- a/designer-base/src/main/java/com/fr/env/RemoteSignInPane.java +++ b/designer-base/src/main/java/com/fr/env/RemoteSignInPane.java @@ -22,7 +22,7 @@ public class RemoteSignInPane extends BasicPane { public void initComponent(){ this.setLayout(FRGUIPaneFactory.create2ColumnGridLayout()); - userLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Username")+":"); + userLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_UserName")+":"); userTextField = new UITextField(); passLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Password")+":"); passwordField = new UIPassWordField(); @@ -44,4 +44,4 @@ public class RemoteSignInPane extends BasicPane { // this.showWindow(null).setVisible(false); // this.showWindow(null).dispose(); } -} \ No newline at end of file +} diff --git a/designer-base/src/main/java/com/fr/file/FILEChooserPane.java b/designer-base/src/main/java/com/fr/file/FILEChooserPane.java index 7f8087db4..3629dfdf9 100644 --- a/designer-base/src/main/java/com/fr/file/FILEChooserPane.java +++ b/designer-base/src/main/java/com/fr/file/FILEChooserPane.java @@ -246,7 +246,7 @@ public class FILEChooserPane extends BasicPane { new Component[]{GUICoreUtils.createBorderPane(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Utils_File_Name") + ":"), BorderLayout.WEST), fileNameTextField = new UIAutoCompletionField(), okButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Utils_Design_File_Open")) }, - new Component[]{GUICoreUtils.createBorderPane(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Utils-File_type") + ":"), BorderLayout.WEST), + new Component[]{GUICoreUtils.createBorderPane(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Utils_File_Type") + ":"), BorderLayout.WEST), postfixComboBox = new UIComboBox(), cancelButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Utils_Design_Action_Cancel")) }}; diff --git a/designer-base/src/main/java/com/fr/start/server/ServerManageFrame.java b/designer-base/src/main/java/com/fr/start/server/ServerManageFrame.java index 1f5eed74b..c31f72f31 100644 --- a/designer-base/src/main/java/com/fr/start/server/ServerManageFrame.java +++ b/designer-base/src/main/java/com/fr/start/server/ServerManageFrame.java @@ -70,7 +70,7 @@ public class ServerManageFrame extends JFrame { UIButton startButton = new UIButton(); startPane.add(startButton); startButton.setIcon(BaseUtils.readIcon("/com/fr/design/images/server/start.png")); - startPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Server-Start"))); + startPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Server_Start"))); startButton.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { try { @@ -87,7 +87,7 @@ public class ServerManageFrame extends JFrame { UIButton stopButton = new UIButton(); stopPane.add(stopButton); stopButton.setIcon(BaseUtils.readIcon("/com/fr/design/images/server/stop.png")); - stopPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Server-Stop"))); + stopPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Server_Stop"))); stopButton.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { try { @@ -146,4 +146,4 @@ public class ServerManageFrame extends JFrame { this.validate(); } -} \ No newline at end of file +} diff --git a/designer-chart/src/main/java/com/fr/design/chart/javascript/ChartEmailPane.java b/designer-chart/src/main/java/com/fr/design/chart/javascript/ChartEmailPane.java index fe60b47b3..1f5f37846 100644 --- a/designer-chart/src/main/java/com/fr/design/chart/javascript/ChartEmailPane.java +++ b/designer-chart/src/main/java/com/fr/design/chart/javascript/ChartEmailPane.java @@ -35,8 +35,8 @@ public class ChartEmailPane extends EmailPane{ showTplContent = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Email_Can_Preview_Report_Content")); contentPane = TableLayoutHelper.createCommonTableLayoutPane(new JComponent[][]{ {new UILabel(), tipsPane1}, - createLinePane(com.fr.design.i18n.Toolkit.i18nText("HJS-Mail_to"), maitoEditor = new UITextField()), - createLinePane(com.fr.design.i18n.Toolkit.i18nText("HJS-CC_to"), ccEditor = new UITextField()), + createLinePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_HJS_Mail_to"), maitoEditor = new UITextField()), + createLinePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_HJS_CC_To"), ccEditor = new UITextField()), createLinePane(com.fr.design.i18n.Toolkit.i18nText("EmailPane-BCC"), bccEditor = new UITextField()), createLinePane(com.fr.design.i18n.Toolkit.i18nText("EmailPane-mailSubject"), titleEditor = new UITextField()), {mainTextLabel, scrollPane}, @@ -46,8 +46,8 @@ public class ChartEmailPane extends EmailPane{ double[] rSizes = { preferred, preferred, preferred, preferred, preferred, fill, preferred}; contentPane = TableLayoutHelper.createCommonTableLayoutPane(new JComponent[][]{ {new UILabel(), tipsPane1}, - createLinePane(com.fr.design.i18n.Toolkit.i18nText("HJS-Mail_to"), maitoEditor = new UITextField()), - createLinePane(com.fr.design.i18n.Toolkit.i18nText("HJS-CC_to"), ccEditor = new UITextField()), + createLinePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_HJS_Mail_to"), maitoEditor = new UITextField()), + createLinePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_HJS_CC_To"), ccEditor = new UITextField()), createLinePane(com.fr.design.i18n.Toolkit.i18nText("EmailPane-BCC"), bccEditor = new UITextField()), createLinePane(com.fr.design.i18n.Toolkit.i18nText("EmailPane-mailSubject"), titleEditor = new UITextField()), {mainTextLabel, scrollPane}, @@ -87,4 +87,4 @@ public class ChartEmailPane extends EmailPane{ super.updateBean(email); } -} \ No newline at end of file +} diff --git a/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/dlp/DataLabelPane.java b/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/dlp/DataLabelPane.java index c736c911e..2c325fac9 100644 --- a/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/dlp/DataLabelPane.java +++ b/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/dlp/DataLabelPane.java @@ -112,10 +112,10 @@ public class DataLabelPane extends TooltipContentsPane { protected JPanel createJPanel4Position() { // 标签位置:上下左右中. - bottomButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("StyleAlignment-Bottom")); - leftButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("StyleAlignment-Left")); - rigtButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("StyleAlignment-Right")); - topButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("StyleAlignment-Top")); + bottomButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_StyleAlignment_Bottom")); + leftButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_StyleAlignment_Left")); + rigtButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_StyleAlignment_Right")); + topButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_StyleAlignment_Top")); centerButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Center")); ButtonGroup bg = new ButtonGroup(); @@ -239,4 +239,4 @@ public class DataLabelPane extends TooltipContentsPane { public void checkGuidBox() { } -} \ No newline at end of file +} diff --git a/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/dlp/RangeDataLabelPane.java b/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/dlp/RangeDataLabelPane.java index 0c643a17b..d857506ff 100644 --- a/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/dlp/RangeDataLabelPane.java +++ b/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/dlp/RangeDataLabelPane.java @@ -20,8 +20,8 @@ public class RangeDataLabelPane extends DataLabelPane { private JRadioButton bottomButton; protected JPanel createJPanel4Position() { - topButton = new JRadioButton(com.fr.design.i18n.Toolkit.i18nText("StyleAlignment-Top")); - bottomButton = new JRadioButton(com.fr.design.i18n.Toolkit.i18nText("StyleAlignment-Bottom")); + topButton = new JRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_StyleAlignment_Top")); + bottomButton = new JRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_StyleAlignment_Bottom")); centerButton = new JRadioButton(com.fr.design.i18n.Toolkit.i18nText("Center")); ButtonGroup bg = new ButtonGroup(); @@ -62,4 +62,4 @@ public class RangeDataLabelPane extends DataLabelPane { seriesAttrContents.setPosition(Constants.TOP); } } -} \ No newline at end of file +} diff --git a/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/impl/FormHyperlinkNorthPane.java b/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/impl/FormHyperlinkNorthPane.java index 074dbc4ba..4d1c6a9b7 100644 --- a/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/impl/FormHyperlinkNorthPane.java +++ b/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/impl/FormHyperlinkNorthPane.java @@ -99,7 +99,7 @@ public class FormHyperlinkNorthPane extends BasicBeanPane @Override protected String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("Hyperlink-Form_link"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Hyperlink_Form_Link"); } @Override @@ -136,4 +136,4 @@ public class FormHyperlinkNorthPane extends BasicBeanPane } formHyperlink.setRelateEditorName((String) targetFrameComboBox.getSelectedItem()); } -} \ No newline at end of file +} diff --git a/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/impl/FormHyperlinkPane.java b/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/impl/FormHyperlinkPane.java index 665a01501..7ba27f573 100644 --- a/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/impl/FormHyperlinkPane.java +++ b/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/impl/FormHyperlinkPane.java @@ -44,7 +44,7 @@ public class FormHyperlinkPane extends AbstractHyperLinkPane list = new ArrayList(); java.util.HashMap hyperLinkEditorMap = plot.getHyperLinkEditorMap(); - list.add(new ChartUIMenuNameableCreator(hyperLinkEditorMap, com.fr.design.i18n.Toolkit.i18nText("Hyperlink-Web_link"), + list.add(new ChartUIMenuNameableCreator(hyperLinkEditorMap, com.fr.design.i18n.Toolkit.i18nText("Fine_Design_Basic_Hyperlink_Web_Link"), new WebHyperlink(), getUseMap(map, WebHyperlink.class))); list.add(new ChartUIMenuNameableCreator(hyperLinkEditorMap, "FR-Designer_JavaScript", new JavaScriptImpl(), getUseMap(map, JavaScriptImpl.class))); list.add(new ChartUIMenuNameableCreator(hyperLinkEditorMap, com.fr.design.i18n.Toolkit.i18nText("FR-Engine_Interactive-chart"), null, null)); @@ -52,4 +52,4 @@ public class ChartDesignerInteractivePane extends ChartInteractivePane { autoRefreshTime.setEnabled(definition.isSupportAutoRefresh()); } } -} \ No newline at end of file +} diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/other/TimeSwitchPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/other/TimeSwitchPane.java index 365081aef..7277791ef 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/other/TimeSwitchPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/other/TimeSwitchPane.java @@ -43,13 +43,13 @@ public class TimeSwitchPane extends JPanel implements UIObserver { private static final int COM_GAP =5; private static final String YEAR = com.fr.design.i18n.Toolkit.i18nText("Year"); private static final String MONTH =com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Month"); - private static final String DAY =com.fr.design.i18n.Toolkit.i18nText("Sun"); + private static final String DAY =com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Sun"); private static final String HOUR = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_ScheHour"); private static final String MINUTE = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Sche_Minute"); private static final String SECOND = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Sche_Second"); private static String[] TYPES = new String[]{ - com.fr.design.i18n.Toolkit.i18nText("Year"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Month"), com.fr.design.i18n.Toolkit.i18nText("Sun"), + com.fr.design.i18n.Toolkit.i18nText("Year"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Month"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Sun"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_ScheHour"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Sche_Minute"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Sche_Second") }; @@ -68,7 +68,7 @@ public class TimeSwitchPane extends JPanel implements UIObserver { static { INTS.put(ChartConstants.YEAR_TYPE, com.fr.design.i18n.Toolkit.i18nText("Year")); INTS.put(ChartConstants.MONTH_TYPE, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Month")); - INTS.put(ChartConstants.DAY_TYPE, com.fr.design.i18n.Toolkit.i18nText("Sun")); + INTS.put(ChartConstants.DAY_TYPE, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Sun")); INTS.put(ChartConstants.HOUR_TYPE, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_ScheHour")); INTS.put(ChartConstants.MINUTE_TYPE, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Sche_Minute")); INTS.put(ChartConstants.SECOND_TYPE, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Sche_Second")); diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartAxisLabelPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartAxisLabelPane.java index bfb79b198..8cfaf24d4 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartAxisLabelPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartAxisLabelPane.java @@ -161,7 +161,7 @@ public class ChartAxisLabelPane extends BasicPane implements UIObserver{ Component[][] components = new Component[][]{ new Component[]{null, new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Axis_labelShowway")), showWay, null}, - new Component[]{null, new UILabel(com.fr.design.i18n.Toolkit.i18nText("StyleAlignment-Text_Rotation")), labelOrientationChoose, null}, + new Component[]{null, new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_StyleAlignment_Text_Rotation")), labelOrientationChoose, null}, new Component[]{null, orientationSpinner, orientationBar, null}, new Component[]{null, textAttrPane, null, null}, }; @@ -226,7 +226,7 @@ public class ChartAxisLabelPane extends BasicPane implements UIObserver{ double[] rowSize = {p, p, p}; Component[][] components = new Component[][]{ - new Component[]{null, new UILabel(com.fr.design.i18n.Toolkit.i18nText("StyleAlignment-Text_Rotation")), labelOrientationChoose, null}, + new Component[]{null, new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_StyleAlignment_Text_Rotation")), labelOrientationChoose, null}, new Component[]{null, orientationSpinner, orientationBar, null}, new Component[]{null, textAttrPane, null, null}, }; @@ -289,7 +289,7 @@ public class ChartAxisLabelPane extends BasicPane implements UIObserver{ Component[][] components = new Component[][]{ new Component[]{null,new UILabel(com.fr.design.i18n.Toolkit.i18nText("ChartF-Label_Interval")), labelSampleChoose, customLabelSamleTime}, - new Component[]{null,new UILabel(com.fr.design.i18n.Toolkit.i18nText("StyleAlignment-Text_Rotation")), labelOrientationChoose, null}, + new Component[]{null,new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_StyleAlignment_Text_Rotation")), labelOrientationChoose, null}, new Component[]{null,orientationSpinner, orientationBar, null}, new Component[]{null,textAttrPane, null, null}, }; 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 5d5637ae8..0f8945538 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 @@ -54,7 +54,7 @@ public class ChartAxisLineStylePane extends BasicPane{ double[] rowSize = { p,p,p,p,p,p}; Component[][] components = new Component[][]{ - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Type")),axisLineStyle} , + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Type")),axisLineStyle} , new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Color")),axisLineColor}, new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Main_Graduation_Line")),null}, new Component[]{null, mainTickPosition}, diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartBeautyPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartBeautyPane.java index 6a67a6662..aa0fc21d0 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartBeautyPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartBeautyPane.java @@ -18,7 +18,7 @@ public class ChartBeautyPane extends BasicBeanPane{ public ChartBeautyPane() { String[] nameArray = {com.fr.design.i18n.Toolkit.i18nText("Common"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Plane3D"),com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Gradient_HighLight"), - com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Top_Down_Shade"),com.fr.design.i18n.Toolkit.i18nText("Transparent") //新加的两种风格，注意兼容处理 + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Top_Down_Shade"),com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Transparent") //新加的两种风格，注意兼容处理 }; styleBox = new UIComboBox(nameArray); diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/DateAxisValuePane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/DateAxisValuePane.java index 06c5b2f42..29025c451 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/DateAxisValuePane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/DateAxisValuePane.java @@ -48,7 +48,7 @@ import java.util.regex.Pattern; public class DateAxisValuePane extends FurtherBasicBeanPane{ private static String[] TYPES = new String[]{ - com.fr.design.i18n.Toolkit.i18nText("Year"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Month"), com.fr.design.i18n.Toolkit.i18nText("Sun"), + com.fr.design.i18n.Toolkit.i18nText("Year"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Month"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Sun"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_ScheHour"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Sche_Minute"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Sche_Second") }; @@ -57,7 +57,7 @@ public class DateAxisValuePane extends FurtherBasicBeanPane{ static { VALUES.put(com.fr.design.i18n.Toolkit.i18nText("Year"), ChartConstants.YEAR_TYPE); VALUES.put(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Month"), ChartConstants.MONTH_TYPE); - VALUES.put(com.fr.design.i18n.Toolkit.i18nText("Sun"), ChartConstants.DAY_TYPE); + VALUES.put(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Sun"), ChartConstants.DAY_TYPE); VALUES.put(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_ScheHour"), ChartConstants.HOUR_TYPE); VALUES.put(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Sche_Minute"), ChartConstants.MINUTE_TYPE); VALUES.put(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Sche_Second"), ChartConstants.SECOND_TYPE); @@ -67,7 +67,7 @@ public class DateAxisValuePane extends FurtherBasicBeanPane{ static { INTS.put(ChartConstants.YEAR_TYPE, com.fr.design.i18n.Toolkit.i18nText("Year")); INTS.put(ChartConstants.MONTH_TYPE, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Month")); - INTS.put(ChartConstants.DAY_TYPE, com.fr.design.i18n.Toolkit.i18nText("Sun")); + INTS.put(ChartConstants.DAY_TYPE, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Sun")); INTS.put(ChartConstants.HOUR_TYPE, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_ScheHour")); INTS.put(ChartConstants.MINUTE_TYPE, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Sche_Minute")); INTS.put(ChartConstants.SECOND_TYPE, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Sche_Second")); diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/area/DefaultAxisAreaPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/area/DefaultAxisAreaPane.java index e6f7d3b60..d646c7f87 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/area/DefaultAxisAreaPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/area/DefaultAxisAreaPane.java @@ -55,8 +55,8 @@ public class DefaultAxisAreaPane extends ChartAxisAreaPane { verticalColorPane = new ColorSelectBox(100); Component[][] components = new Component[][]{ - new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Utils-Left_to_Right") + ":"),horizontalColorPane}, - new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Utils-Top_to_Bottom") + ":"),verticalColorPane}, + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("FIne-Design_Report_Utils_Left_To_Right") + ":"),horizontalColorPane}, + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Utils_Top_To_Bottom") + ":"),verticalColorPane}, }; backgroundPane = TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"Chart_Interval_Back"}, components, rowSize, columnSize); @@ -69,8 +69,8 @@ public class DefaultAxisAreaPane extends ChartAxisAreaPane { double[] rowSize = {p,p}; double[] columnSize = { p, f }; - isVerticleGridLine = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Utils-Left_to_Right")); - isHorizontalGridLine = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Utils-Top_to_Bottom")); + isVerticleGridLine = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("FIne-Design_Report_Utils_Left_To_Right")); + isHorizontalGridLine = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Utils_Top_To_Bottom")); gridColorPane = new ColorSelectBox(100); JPanel container = TableLayoutHelper.createTableLayoutPane(new Component[][]{ @@ -116,4 +116,4 @@ public class DefaultAxisAreaPane extends ChartAxisAreaPane { ((RectanglePlot)plot).setHorizontalIntervalBackgroundColor(horizontalColorPane.getSelectObject()); ((RectanglePlot)plot).setVerticalIntervalBackgroundColor(verticalColorPane.getSelectObject()); } -} \ No newline at end of file +} diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/datalabel/ChartDataLabelPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/datalabel/ChartDataLabelPane.java index ab4ca532e..0d0fea4fd 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/datalabel/ChartDataLabelPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/datalabel/ChartDataLabelPane.java @@ -97,7 +97,7 @@ public class ChartDataLabelPane extends BasicScrollPane{ }else if(plot instanceof PiePlot){ return new String[] {com.fr.design.i18n.Toolkit.i18nText("Chart_In_Pie"), com.fr.design.i18n.Toolkit.i18nText("Chart_Out_Pie")}; }else if(plot instanceof RangePlot){ - return new String[]{com.fr.design.i18n.Toolkit.i18nText("StyleAlignment-Top"), com.fr.design.i18n.Toolkit.i18nText("StyleAlignment-Bottom"), com.fr.design.i18n.Toolkit.i18nText("Center")}; + return new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_StyleAlignment_Top"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_StyleAlignment_Bottom"), com.fr.design.i18n.Toolkit.i18nText("Center")}; }else if(plot instanceof BubblePlot){ return new String[] {com.fr.design.i18n.Toolkit.i18nText("Chart_Bubble_Inside"), com.fr.design.i18n.Toolkit.i18nText("Chart_Bubble_Outside")}; }else{ @@ -122,4 +122,4 @@ public class ChartDataLabelPane extends BasicScrollPane{ } -} \ No newline at end of file +} diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/legend/ChartLegendPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/legend/ChartLegendPane.java index 8885fcb87..6fb278998 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/legend/ChartLegendPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/legend/ChartLegendPane.java @@ -56,8 +56,8 @@ public class ChartLegendPane extends BasicScrollPane{ textAttrPane = new ChartTextAttrPane(); borderPane = new ChartBorderPane(); - String[] textArray = {com.fr.design.i18n.Toolkit.i18nText("StyleAlignment-Top"), com.fr.design.i18n.Toolkit.i18nText("StyleAlignment-Bottom"), - com.fr.design.i18n.Toolkit.i18nText("StyleAlignment-Left"), com.fr.design.i18n.Toolkit.i18nText("StyleAlignment-Right"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Right_Top")}; + String[] textArray = {com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_StyleAlignment_Top"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_StyleAlignment_Bottom"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_StyleAlignment_Left"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_StyleAlignment_Right"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Right_Top")}; Integer[] valueArray = {Constants.TOP, Constants.BOTTOM, Constants.LEFT, Constants.RIGHT, Constants.RIGHT_TOP}; Icon[] iconArray = {BaseUtils.readIcon("/com/fr/design/images/chart/ChartLegend/layout_top.png"), BaseUtils.readIcon("/com/fr/design/images/chart/ChartLegend/layout_bottom.png"), diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/MeterSeriesPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/MeterSeriesPane.java index 3542ea6e6..f86148958 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/MeterSeriesPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/MeterSeriesPane.java @@ -43,7 +43,7 @@ public class MeterSeriesPane extends AbstractPlotSeriesPane { protected JPanel getContentInPlotType() { unit = new UITextField(); angleMax = new UINumberDragPane(0, 360); - String[] orderUnit = new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Ge"), com.fr.design.i18n.Toolkit.i18nText("Unit_Ten"), com.fr.design.i18n.Toolkit.i18nText("Unit_Hundred"), + String[] orderUnit = new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Ge"), com.fr.design.i18n.Toolkit.i18nText("Unit_Ten"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Unit_Hundred"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Unit_Thousand"), com.fr.design.i18n.Toolkit.i18nText("Unit_Ten_Thousand")}; order = new UIComboBox(orderUnit); colorPickerPane = createColorPickerPane(); diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/XYScatterPlotPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/XYScatterPlotPane.java index ad4ad9e14..0effae28e 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/XYScatterPlotPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/XYScatterPlotPane.java @@ -28,7 +28,7 @@ public class XYScatterPlotPane extends AbstractChartTypePane{ @Override protected String[] getTypeTipName() { return new String[]{ - com.fr.design.i18n.Toolkit.i18nText("I-xyScatterStyle_Marker") + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_I_XYScatterStyle_Marker") }; } @@ -47,7 +47,7 @@ public class XYScatterPlotPane extends AbstractChartTypePane{ * @return 界面标题 */ public String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("I-xyScatterStyle_Marker"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_I_XYScatterStyle_Marker"); } /** @@ -86,4 +86,4 @@ public class XYScatterPlotPane extends AbstractChartTypePane{ public Chart getDefaultChart() { return XYScatterIndependentChart.XYScatterChartTypes[0]; } -} \ No newline at end of file +} diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/component/background/VanChartGradientPane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/component/background/VanChartGradientPane.java index 565183e54..2cdcf2401 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/component/background/VanChartGradientPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/component/background/VanChartGradientPane.java @@ -32,7 +32,7 @@ public class VanChartGradientPane extends GradientBackgroundQuickPane { } protected void constructPane(){ - String[] textArray = {com.fr.design.i18n.Toolkit.i18nText("Utils-Left_to_Right"), com.fr.design.i18n.Toolkit.i18nText("Utils-Top_to_Bottom")}; + String[] textArray = {com.fr.design.i18n.Toolkit.i18nText("FIne-Design_Report_Utils_Left_To_Right"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Utils_Top_To_Bottom")}; Integer[] valueArray = {GradientBackground.LEFT2RIGHT, GradientBackground.TOP2BOTTOM}; directionPane = new UIButtonGroup(textArray, valueArray); directionPane.setSelectedIndex(0); @@ -102,4 +102,4 @@ public class VanChartGradientPane extends GradientBackgroundQuickPane { return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Gradient_Color"); } -} \ No newline at end of file +} diff --git a/designer-form/src/main/java/com/fr/design/designer/creator/XTreeEditor.java b/designer-form/src/main/java/com/fr/design/designer/creator/XTreeEditor.java index 8dbbfa1e8..fed7d7079 100644 --- a/designer-form/src/main/java/com/fr/design/designer/creator/XTreeEditor.java +++ b/designer-form/src/main/java/com/fr/design/designer/creator/XTreeEditor.java @@ -68,20 +68,20 @@ public class XTreeEditor extends XWidgetCreator { .setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Font_Size")) .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced")); crp = (CRPropertyDescriptor[]) ArrayUtils.add(crp, new CRPropertyDescriptor("multipleSelection", this.data.getClass()).setI18NName( - com.fr.design.i18n.Toolkit.i18nText("Tree-Mutiple_Selection_Or_Not")).putKeyValue( + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tree_Mutiple_Selection_Or_Not")).putKeyValue( XCreatorConstants.PROPERTY_CATEGORY, "Advanced").setEditorClass(InChangeBooleanEditor.class)); crp = (CRPropertyDescriptor[]) ArrayUtils.add(crp, new CRPropertyDescriptor("ajax", this.data.getClass()).setI18NName( - com.fr.design.i18n.Toolkit.i18nText("Widget-Load_By_Async")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Load_By_Async")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced")); crp = this.addAllowEdit(crp); crp = this.addCustomData(crp); crp = (CRPropertyDescriptor[]) ArrayUtils.add(crp, new CRPropertyDescriptor("selectLeafOnly", this.data - .getClass()).setI18NName(com.fr.design.i18n.Toolkit.i18nText("Tree-Select_Leaf_Only")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced")); + .getClass()).setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tree_Select_Leaf_Only")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced")); crp = (CRPropertyDescriptor[]) ArrayUtils.add(crp, new CRPropertyDescriptor("returnFullPath", this.data - .getClass()).setI18NName(com.fr.design.i18n.Toolkit.i18nText("Tree-Return_Full_Path")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced")); + .getClass()).setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tree_Return_Full_Path")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced")); return (CRPropertyDescriptor[]) ArrayUtils.addAll(super.supportedDescriptor(), crp); } diff --git a/designer-form/src/main/java/com/fr/design/designer/creator/XWriteAbleRepeatEditor.java b/designer-form/src/main/java/com/fr/design/designer/creator/XWriteAbleRepeatEditor.java index cd5c40c3b..c98587da8 100644 --- a/designer-form/src/main/java/com/fr/design/designer/creator/XWriteAbleRepeatEditor.java +++ b/designer-form/src/main/java/com/fr/design/designer/creator/XWriteAbleRepeatEditor.java @@ -27,7 +27,7 @@ public abstract class XWriteAbleRepeatEditor extends XDirectWriteEditor { super.supportedDescriptor(), new CRPropertyDescriptor[]{ new CRPropertyDescriptor("removeRepeat", this.data.getClass()).setI18NName(com.fr.design.i18n.Toolkit.i18nText("Form-Remove_Repeat")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), - new CRPropertyDescriptor("waterMark", this.data.getClass()).setI18NName(com.fr.design.i18n.Toolkit.i18nText("WaterMark")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), + new CRPropertyDescriptor("waterMark", this.data.getClass()).setI18NName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_WaterMark")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), }); } -} \ No newline at end of file +} diff --git a/designer-form/src/main/java/com/fr/design/designer/properties/FRBorderLayoutConstraints.java b/designer-form/src/main/java/com/fr/design/designer/properties/FRBorderLayoutConstraints.java index 10fb7508a..b99c774db 100644 --- a/designer-form/src/main/java/com/fr/design/designer/properties/FRBorderLayoutConstraints.java +++ b/designer-form/src/main/java/com/fr/design/designer/properties/FRBorderLayoutConstraints.java @@ -84,7 +84,7 @@ public class FRBorderLayoutConstraints implements ConstraintsGroupModel { case 0: return com.fr.design.i18n.Toolkit.i18nText("BorderLayout-Constraints"); case 1: - return com.fr.design.i18n.Toolkit.i18nText("Title"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Title"); default: return getSizeDisplayName(); } diff --git a/designer-form/src/main/java/com/fr/design/designer/properties/FRBorderLayoutPropertiesGroupModel.java b/designer-form/src/main/java/com/fr/design/designer/properties/FRBorderLayoutPropertiesGroupModel.java index d9dbd5c57..e45a632b3 100644 --- a/designer-form/src/main/java/com/fr/design/designer/properties/FRBorderLayoutPropertiesGroupModel.java +++ b/designer-form/src/main/java/com/fr/design/designer/properties/FRBorderLayoutPropertiesGroupModel.java @@ -1,21 +1,20 @@ package com.fr.design.designer.properties; -import javax.swing.table.DefaultTableCellRenderer; -import javax.swing.table.TableCellEditor; -import javax.swing.table.TableCellRenderer; - - import com.fr.design.beans.GroupModel; +import com.fr.design.designer.creator.XWBorderLayout; +import com.fr.design.designer.properties.items.Item; +import com.fr.design.form.layout.FRBorderLayout; import com.fr.design.mainframe.widget.editors.BorderLayoutDirectionEditor; import com.fr.design.mainframe.widget.editors.ExtendedPropertyEditor; import com.fr.design.mainframe.widget.editors.IntegerPropertyEditor; import com.fr.design.mainframe.widget.editors.PropertyCellEditor; import com.fr.design.mainframe.widget.renderer.PropertyCellRenderer; -import com.fr.design.designer.creator.XWBorderLayout; -import com.fr.design.designer.properties.items.Item; -import com.fr.design.form.layout.FRBorderLayout; import com.fr.form.ui.container.WBorderLayout; +import javax.swing.table.DefaultTableCellRenderer; +import javax.swing.table.TableCellEditor; +import javax.swing.table.TableCellRenderer; + public class FRBorderLayoutPropertiesGroupModel implements GroupModel { private DefaultTableCellRenderer renderer; @@ -83,9 +82,9 @@ public class FRBorderLayoutPropertiesGroupModel implements GroupModel { if (column == 0) { switch (row) { case 0: - return com.fr.design.i18n.Toolkit.i18nText("Hgap"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Hgap"); case 1: - return com.fr.design.i18n.Toolkit.i18nText("Vgap"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Vgap"); default: return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Layout_Style"); } @@ -141,4 +140,4 @@ public class FRBorderLayoutPropertiesGroupModel implements GroupModel { public boolean isEditable(int row) { return true; } -} \ No newline at end of file +} diff --git a/designer-form/src/main/java/com/fr/design/designer/properties/FormWidgetAuthorityEditPane.java b/designer-form/src/main/java/com/fr/design/designer/properties/FormWidgetAuthorityEditPane.java index a078ca905..6f84aaa32 100644 --- a/designer-form/src/main/java/com/fr/design/designer/properties/FormWidgetAuthorityEditPane.java +++ b/designer-form/src/main/java/com/fr/design/designer/properties/FormWidgetAuthorityEditPane.java @@ -91,7 +91,7 @@ public class FormWidgetAuthorityEditPane extends AuthorityEditPane { * @date 2014-12-21-下午6:19:43 */ public void populateType() { - type.setText(com.fr.design.i18n.Toolkit.i18nText("Widget-Form_Widget_Config")); + type.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Form_Widget_Config")); } /** diff --git a/designer-form/src/main/java/com/fr/design/designer/properties/HorizontalLayoutPropertiesGroupModel.java b/designer-form/src/main/java/com/fr/design/designer/properties/HorizontalLayoutPropertiesGroupModel.java index f6ffe962e..8ac065a12 100644 --- a/designer-form/src/main/java/com/fr/design/designer/properties/HorizontalLayoutPropertiesGroupModel.java +++ b/designer-form/src/main/java/com/fr/design/designer/properties/HorizontalLayoutPropertiesGroupModel.java @@ -74,9 +74,9 @@ public class HorizontalLayoutPropertiesGroupModel implements GroupModel { if (column == 0) { switch (row) { case 0: - return com.fr.design.i18n.Toolkit.i18nText("Hgap"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Hgap"); case 1: - return com.fr.design.i18n.Toolkit.i18nText("Vgap"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Vgap"); default: return com.fr.design.i18n.Toolkit.i18nText("Alignment"); } diff --git a/designer-form/src/main/java/com/fr/design/designer/properties/VerticalBoxProperties.java b/designer-form/src/main/java/com/fr/design/designer/properties/VerticalBoxProperties.java index 9f6f59e34..0d0f6509d 100644 --- a/designer-form/src/main/java/com/fr/design/designer/properties/VerticalBoxProperties.java +++ b/designer-form/src/main/java/com/fr/design/designer/properties/VerticalBoxProperties.java @@ -1,18 +1,17 @@ package com.fr.design.designer.properties; -import javax.swing.table.DefaultTableCellRenderer; -import javax.swing.table.TableCellEditor; -import javax.swing.table.TableCellRenderer; - - import com.fr.design.beans.GroupModel; -import com.fr.design.mainframe.widget.editors.IntegerPropertyEditor; -import com.fr.design.mainframe.widget.editors.PropertyCellEditor; import com.fr.design.designer.creator.XWVerticalBoxLayout; import com.fr.design.form.layout.FRVerticalLayout; +import com.fr.design.mainframe.widget.editors.IntegerPropertyEditor; +import com.fr.design.mainframe.widget.editors.PropertyCellEditor; import com.fr.form.ui.container.WVerticalBoxLayout; +import javax.swing.table.DefaultTableCellRenderer; +import javax.swing.table.TableCellEditor; +import javax.swing.table.TableCellRenderer; + public class VerticalBoxProperties implements GroupModel { private DefaultTableCellRenderer renderer; @@ -52,9 +51,9 @@ public class VerticalBoxProperties implements GroupModel { if (column == 0) { switch (row) { case 0: - return com.fr.design.i18n.Toolkit.i18nText("Hgap"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Hgap"); case 1: - return com.fr.design.i18n.Toolkit.i18nText("Vgap"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Vgap"); } } else { switch (row) { diff --git a/designer-form/src/main/java/com/fr/design/designer/properties/VerticalSplitProperties.java b/designer-form/src/main/java/com/fr/design/designer/properties/VerticalSplitProperties.java index 6b5996816..3ff873e64 100644 --- a/designer-form/src/main/java/com/fr/design/designer/properties/VerticalSplitProperties.java +++ b/designer-form/src/main/java/com/fr/design/designer/properties/VerticalSplitProperties.java @@ -48,9 +48,9 @@ public class VerticalSplitProperties implements GroupModel { case 0: return com.fr.design.i18n.Toolkit.i18nText("Ratio"); case 1: - return com.fr.design.i18n.Toolkit.i18nText("Hgap"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Hgap"); case 2: - return com.fr.design.i18n.Toolkit.i18nText("Vgap"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Vgap"); } } else { switch (row) { diff --git a/designer-form/src/main/java/com/fr/design/designer/properties/items/UnderlineItems.java b/designer-form/src/main/java/com/fr/design/designer/properties/items/UnderlineItems.java index 4e6fa93e8..77278ae5f 100644 --- a/designer-form/src/main/java/com/fr/design/designer/properties/items/UnderlineItems.java +++ b/designer-form/src/main/java/com/fr/design/designer/properties/items/UnderlineItems.java @@ -6,12 +6,12 @@ public class UnderlineItems implements ItemProvider { private static Item[] VALUE_ITEMS = { new Item(com.fr.design.i18n.Toolkit.i18nText("DataFunction-None"), ""), - new Item(com.fr.design.i18n.Toolkit.i18nText("StyleAlignment-Top"), "overline"), + new Item(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_StyleAlignment_Top"), "overline"), new Item(com.fr.design.i18n.Toolkit.i18nText("Center"), "line-through"), - new Item(com.fr.design.i18n.Toolkit.i18nText("StyleAlignment-Bottom"), "underline")}; + new Item(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_StyleAlignment_Bottom"), "underline")}; @Override public Item[] getItems() { return VALUE_ITEMS; } -} \ No newline at end of file +} diff --git a/designer-form/src/main/java/com/fr/design/designer/properties/items/WidgetDisplayPositionItems.java b/designer-form/src/main/java/com/fr/design/designer/properties/items/WidgetDisplayPositionItems.java index 2c867ea9f..845ebbd50 100644 --- a/designer-form/src/main/java/com/fr/design/designer/properties/items/WidgetDisplayPositionItems.java +++ b/designer-form/src/main/java/com/fr/design/designer/properties/items/WidgetDisplayPositionItems.java @@ -12,13 +12,13 @@ import com.fr.report.stable.FormConstants; public class WidgetDisplayPositionItems implements ItemProvider{ //这里为了和web端一致，只好设置成012了 private static Item[] VALUE_ITEMS = { - new Item(com.fr.design.i18n.Toolkit.i18nText("StyleAlignment-Left"), FormConstants.LEFTPOSITION), + new Item(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_StyleAlignment_Left"), FormConstants.LEFTPOSITION), new Item(com.fr.design.i18n.Toolkit.i18nText("Center"), FormConstants.CENTERPOSITION), - new Item(com.fr.design.i18n.Toolkit.i18nText("StyleAlignment-Right"), FormConstants.RIGHTPOSITION) + new Item(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_StyleAlignment_Right"), FormConstants.RIGHTPOSITION) }; @Override public Item[] getItems() { return VALUE_ITEMS; } -} \ No newline at end of file +} diff --git a/designer-form/src/main/java/com/fr/design/form/javascript/FormEmailPane.java b/designer-form/src/main/java/com/fr/design/form/javascript/FormEmailPane.java index 0efcf02d8..4fc29d8dd 100644 --- a/designer-form/src/main/java/com/fr/design/form/javascript/FormEmailPane.java +++ b/designer-form/src/main/java/com/fr/design/form/javascript/FormEmailPane.java @@ -23,12 +23,12 @@ public class FormEmailPane extends EmailPane{ double[] columnSize = { preferred, fill}; centerPane = TableLayoutHelper.createCommonTableLayoutPane(new JComponent[][]{ {new UILabel(), tipsPane1}, - createLinePane(com.fr.design.i18n.Toolkit.i18nText("HJS-Mail_to"), maitoEditor = new UITextField()), - createLinePane(com.fr.design.i18n.Toolkit.i18nText("HJS-CC_to"), ccEditor = new UITextField()), + createLinePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_HJS_Mail_to"), maitoEditor = new UITextField()), + createLinePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_HJS_CC_To"), ccEditor = new UITextField()), createLinePane(com.fr.design.i18n.Toolkit.i18nText("EmailPane-BCC"), bccEditor = new UITextField()), createLinePane(com.fr.design.i18n.Toolkit.i18nText("EmailPane-mailSubject"), titleEditor = new UITextField()), {mainTextLabel, scrollPane}, {new UILabel(), tipsPane2}},rowSize, columnSize, 7); } -} \ No newline at end of file +} diff --git a/designer-form/src/main/java/com/fr/design/gui/xpane/JTreeAutoBuildPane.java b/designer-form/src/main/java/com/fr/design/gui/xpane/JTreeAutoBuildPane.java index 88acae8d5..7c36577f5 100644 --- a/designer-form/src/main/java/com/fr/design/gui/xpane/JTreeAutoBuildPane.java +++ b/designer-form/src/main/java/com/fr/design/gui/xpane/JTreeAutoBuildPane.java @@ -47,7 +47,7 @@ public class JTreeAutoBuildPane extends BasicPane implements Previewable, Editab public void initComponent() { this.setLayout(FRGUIPaneFactory.createM_BorderLayout()); - UILabel selectTreeDataLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Select_A_Tree_DataSource_To_Build") + ": "); + UILabel selectTreeDataLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Select_A_Tree_DataSource_To_Build") + ": "); treeTableDataComboBox = new TreeTableDataComboBox(DesignTableDataManager.getEditingTableDataSource()); treeTableDataComboBox.setPreferredSize(new Dimension(180, 20)); selectTreeDataPanel = FRGUIPaneFactory.createBoxFlowInnerContainer_S_Pane(); @@ -191,4 +191,4 @@ public class JTreeAutoBuildPane extends BasicPane implements Previewable, Editab valuePane.populate(1); } -} \ No newline at end of file +} diff --git a/designer-form/src/main/java/com/fr/design/mainframe/FormEditToolBar.java b/designer-form/src/main/java/com/fr/design/mainframe/FormEditToolBar.java index 0b0491392..f2b06aff6 100644 --- a/designer-form/src/main/java/com/fr/design/mainframe/FormEditToolBar.java +++ b/designer-form/src/main/java/com/fr/design/mainframe/FormEditToolBar.java @@ -208,7 +208,7 @@ public class FormEditToolBar extends BasicPane { private class MoveUpItemAction extends UpdateAction { public MoveUpItemAction() { - this.setName(com.fr.design.i18n.Toolkit.i18nText("Utils-Move_Up")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Utils_Move_Up")); this.setMnemonic('U'); this.setSmallIcon(IOUtils.readIcon("/com/fr/design/images/control/up.png")); } @@ -239,7 +239,7 @@ public class FormEditToolBar extends BasicPane { private class MoveDownItemAction extends UpdateAction { public MoveDownItemAction() { - this.setName(com.fr.design.i18n.Toolkit.i18nText("Utils-Move_Down")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Utils_Move_Down")); this.setMnemonic('D'); this.setSmallIcon(IOUtils.readIcon("/com/fr/design/images/control/down.png")); } diff --git a/designer-form/src/main/java/com/fr/design/mainframe/FormParaPane.java b/designer-form/src/main/java/com/fr/design/mainframe/FormParaPane.java index b7fd82b73..647a0dd8a 100644 --- a/designer-form/src/main/java/com/fr/design/mainframe/FormParaPane.java +++ b/designer-form/src/main/java/com/fr/design/mainframe/FormParaPane.java @@ -91,7 +91,7 @@ public class FormParaPane extends JPanel { } }; predefineButton.set4ToolbarButton(); - predefineButton.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Widget-User_Defined_Widget_Config")); + predefineButton.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_User_Defined_Widget_Config")); predefineButton.addMouseListener(new MouseAdapter() { @Override public void mouseClicked(MouseEvent e) { @@ -186,4 +186,4 @@ public class FormParaPane extends JPanel { } } -} \ No newline at end of file +} diff --git a/designer-form/src/main/java/com/fr/design/mainframe/WLayoutSelectionPane.java b/designer-form/src/main/java/com/fr/design/mainframe/WLayoutSelectionPane.java index bfe74d721..22f4059b1 100644 --- a/designer-form/src/main/java/com/fr/design/mainframe/WLayoutSelectionPane.java +++ b/designer-form/src/main/java/com/fr/design/mainframe/WLayoutSelectionPane.java @@ -63,7 +63,7 @@ public class WLayoutSelectionPane extends BasicPane { @Override protected String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("Widget-Form_Widget_Container"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Form_Widget_Container"); } @Override diff --git a/designer-form/src/main/java/com/fr/design/mainframe/widget/accessibles/ColorPalette.java b/designer-form/src/main/java/com/fr/design/mainframe/widget/accessibles/ColorPalette.java index de9bbd953..e5920ad25 100644 --- a/designer-form/src/main/java/com/fr/design/mainframe/widget/accessibles/ColorPalette.java +++ b/designer-form/src/main/java/com/fr/design/mainframe/widget/accessibles/ColorPalette.java @@ -22,7 +22,7 @@ public class ColorPalette extends JPopupMenu { private Border BLACK_BORDER = BorderFactory.createLineBorder(new Color(127, 157, 185)); private Object[] colors = new Object[]{new Object[]{com.fr.design.i18n.Toolkit.i18nText("Black"), new Color(0, 0, 0)}, new Object[]{com.fr.design.i18n.Toolkit.i18nText("Crimson"), new Color(128, 0, 0)}, new Object[]{com.fr.design.i18n.Toolkit.i18nText("Red"), new Color(255, 0, 0)}, - new Object[]{com.fr.design.i18n.Toolkit.i18nText("Pink"), new Color(255, 0, 255)}, new Object[]{com.fr.design.i18n.Toolkit.i18nText("Rose_Red"), new Color(255, 153, 204)}, new Object[]{com.fr.design.i18n.Toolkit.i18nText("Brown"), new Color(153, 51, 0)}, + new Object[]{com.fr.design.i18n.Toolkit.i18nText("Pink"), new Color(255, 0, 255)}, new Object[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Rose_Red"), new Color(255, 153, 204)}, new Object[]{com.fr.design.i18n.Toolkit.i18nText("Brown"), new Color(153, 51, 0)}, new Object[]{com.fr.design.i18n.Toolkit.i18nText("Orange"), new Color(255, 102, 0)}, new Object[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Light_Orange"), new Color(255, 153, 0)}, new Object[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Golden"), new Color(255, 204, 0)}, new Object[]{com.fr.design.i18n.Toolkit.i18nText("Brown_Orange"), new Color(255, 204, 153)}, new Object[]{"", new Color(51, 51, 0)}, new Object[]{"", new Color(128, 128, 0)}, new Object[]{"", new Color(153, 204, 0)}, new Object[]{"", new Color(255, 255, 0)}, new Object[]{"", new Color(255, 255, 153)}, new Object[]{"", new Color(0, 51, 0)}, new Object[]{"", new Color(0, 128, 0)}, diff --git a/designer-form/src/main/java/com/fr/design/mainframe/widget/wrappers/ParameterWrapper.java b/designer-form/src/main/java/com/fr/design/mainframe/widget/wrappers/ParameterWrapper.java index 9a335e27a..f2f523dd4 100644 --- a/designer-form/src/main/java/com/fr/design/mainframe/widget/wrappers/ParameterWrapper.java +++ b/designer-form/src/main/java/com/fr/design/mainframe/widget/wrappers/ParameterWrapper.java @@ -14,7 +14,7 @@ public class ParameterWrapper implements Encoder, Decoder { if (v == null) { return StringUtils.EMPTY; } - return com.fr.design.i18n.Toolkit.i18nText("Total") + ((ParameterProvider[]) v).length + com.fr.design.i18n.Toolkit.i18nText("Parameters"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Total") + ((ParameterProvider[]) v).length + com.fr.design.i18n.Toolkit.i18nText("Parameters"); } @Override @@ -26,4 +26,4 @@ public class ParameterWrapper implements Encoder, Decoder { 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/DateEditorDefinePane.java b/designer-form/src/main/java/com/fr/design/widget/ui/designer/DateEditorDefinePane.java index 1c1dfd4c3..53bbc1f56 100644 --- a/designer-form/src/main/java/com/fr/design/widget/ui/designer/DateEditorDefinePane.java +++ b/designer-form/src/main/java/com/fr/design/widget/ui/designer/DateEditorDefinePane.java @@ -76,7 +76,7 @@ public class DateEditorDefinePane extends DirectWriteEditorDefinePane group = super.createToolBarComponent(); if (group != null) { group.setForToolBarButtonGroup(true); - group.setAllToolTips(new String[]{com.fr.design.i18n.Toolkit.i18nText("StyleAlignment-Left"), com.fr.design.i18n.Toolkit.i18nText("Center"), com.fr.design.i18n.Toolkit.i18nText("StyleAlignment-Right")}); + group.setAllToolTips(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_StyleAlignment_Left"), com.fr.design.i18n.Toolkit.i18nText("Center"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_StyleAlignment_Right")}); } for (int i = 0; i < 3; i++) { group.getButton(i).setRoundBorder(true, UIConstants.ARC); @@ -117,4 +116,4 @@ public class AlignmentAction extends ButtonGroupAction implements StyleActionInt return group; } -} \ No newline at end of file +} diff --git a/designer-realize/src/main/java/com/fr/design/actions/columnrow/ColumnHideAction.java b/designer-realize/src/main/java/com/fr/design/actions/columnrow/ColumnHideAction.java index a772506ec..5aafef099 100644 --- a/designer-realize/src/main/java/com/fr/design/actions/columnrow/ColumnHideAction.java +++ b/designer-realize/src/main/java/com/fr/design/actions/columnrow/ColumnHideAction.java @@ -10,7 +10,7 @@ public class ColumnHideAction extends AbstractColumnRowIndexAction { public ColumnHideAction(ElementCasePane t, int indexOfColumnOrRow) { super(t, indexOfColumnOrRow); - this.setName(com.fr.design.i18n.Toolkit.i18nText("Hide")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Hide_Duplicate")); } @Override @@ -26,4 +26,4 @@ public class ColumnHideAction extends AbstractColumnRowIndexAction { return false; } -} \ No newline at end of file +} diff --git a/designer-realize/src/main/java/com/fr/design/actions/columnrow/RowHideAction.java b/designer-realize/src/main/java/com/fr/design/actions/columnrow/RowHideAction.java index 552992d0d..df4c3936c 100644 --- a/designer-realize/src/main/java/com/fr/design/actions/columnrow/RowHideAction.java +++ b/designer-realize/src/main/java/com/fr/design/actions/columnrow/RowHideAction.java @@ -10,7 +10,7 @@ public class RowHideAction extends AbstractColumnRowIndexAction { public RowHideAction(ElementCasePane t, int indexOfColumnOrRow) { super(t, indexOfColumnOrRow); - this.setName(com.fr.design.i18n.Toolkit.i18nText("Hide")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Hide_Duplicate")); } @Override @@ -26,4 +26,4 @@ public class RowHideAction extends AbstractColumnRowIndexAction { return false; } -} \ No newline at end of file +} diff --git a/designer-realize/src/main/java/com/fr/design/actions/utils/DeprecatedActionManager.java b/designer-realize/src/main/java/com/fr/design/actions/utils/DeprecatedActionManager.java index 916f0b77d..e7ecd6e67 100644 --- a/designer-realize/src/main/java/com/fr/design/actions/utils/DeprecatedActionManager.java +++ b/designer-realize/src/main/java/com/fr/design/actions/utils/DeprecatedActionManager.java @@ -145,7 +145,7 @@ public class DeprecatedActionManager { } public static UIMenu getInsertMenu(ElementCasePane ePane) { - UIMenu deleteMenu = new UIMenu(com.fr.design.i18n.Toolkit.i18nText("Insert") + "(I)"); + UIMenu deleteMenu = new UIMenu(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Insert") + "(I)"); deleteMenu.setIcon(BaseUtils.readIcon("/com/fr/base/images/cell/control/add.png")); deleteMenu.setMnemonic('i'); deleteMenu.add(new InsertRowAction(ePane).createMenuItem()); 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 ccfae0455..95532acc2 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 @@ -100,7 +100,7 @@ public class HyperlinkPane extends ConditionAttrSingleConditionPane(new ParameterTableModel()); - paramButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("TableData_Dynamic_Parameter_Setting")); + paramButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_TableData_Dynamic_Parameter_Setting")); paramButton.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { BasicDialog paramDialog = editorPane.showSmallWindow(DesignerContext.getDesignerFrame(), new DialogActionAdapter() { diff --git a/designer-realize/src/main/java/com/fr/design/expand/ConditionParentPane.java b/designer-realize/src/main/java/com/fr/design/expand/ConditionParentPane.java index 9d2f41059..579a8efbc 100644 --- a/designer-realize/src/main/java/com/fr/design/expand/ConditionParentPane.java +++ b/designer-realize/src/main/java/com/fr/design/expand/ConditionParentPane.java @@ -42,7 +42,7 @@ public class ConditionParentPane extends JPanel { eastPane.add(GUICoreUtils.createFlowPane( new JComponent[] { - new UILabel(com.fr.design.i18n.Toolkit.i18nText("UpParent") + ": "), + new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Up_Parent") + ": "), upParentPane = new ParentPane(ParentPane.UP, listener) }, FlowLayout.LEFT)); } public void putElementcase(ElementCasePane t){ diff --git a/designer-realize/src/main/java/com/fr/design/expand/ExpandDirectionPane.java b/designer-realize/src/main/java/com/fr/design/expand/ExpandDirectionPane.java index eb7af6cfa..9db5a885c 100644 --- a/designer-realize/src/main/java/com/fr/design/expand/ExpandDirectionPane.java +++ b/designer-realize/src/main/java/com/fr/design/expand/ExpandDirectionPane.java @@ -1,21 +1,18 @@ package com.fr.design.expand; -import java.awt.Component; -import java.awt.FlowLayout; -import java.awt.GridLayout; - -import javax.swing.ButtonGroup; - import com.fr.design.gui.ibutton.UIRadioButton; import com.fr.design.gui.ilable.UILabel; -import javax.swing.JPanel; - import com.fr.design.layout.FRGUIPaneFactory; - +import com.fr.design.utils.gui.GUICoreUtils; import com.fr.report.cell.cellattr.CellExpandAttr; import com.fr.stable.Constants; import com.fr.stable.StringUtils; -import com.fr.design.utils.gui.GUICoreUtils; + +import javax.swing.ButtonGroup; +import javax.swing.JPanel; +import java.awt.Component; +import java.awt.FlowLayout; +import java.awt.GridLayout; /** * * @editor zhou @@ -37,8 +34,8 @@ public class ExpandDirectionPane extends JPanel { this.setLayout(new GridLayout(1, 3)); JPanel innerthis=FRGUIPaneFactory.createNormalFlowInnerContainer_M_Pane(); this.add(innerthis); - t2bRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Utils-Top_to_Bottom")); - l2rRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Utils-Left_to_Right")); + t2bRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Utils_Top_To_Bottom")); + l2rRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("FIne-Design_Report_Utils_Left_To_Right")); noneRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("ExpandD-Not_Expand")); ButtonGroup bg = new ButtonGroup(); bg.add(t2bRadioButton); @@ -98,4 +95,4 @@ public class ExpandDirectionPane extends JPanel { } } } -} \ No newline at end of file +} diff --git a/designer-realize/src/main/java/com/fr/design/expand/SortExpandAttrPane.java b/designer-realize/src/main/java/com/fr/design/expand/SortExpandAttrPane.java index 1a3036020..3481863e5 100644 --- a/designer-realize/src/main/java/com/fr/design/expand/SortExpandAttrPane.java +++ b/designer-realize/src/main/java/com/fr/design/expand/SortExpandAttrPane.java @@ -1,20 +1,19 @@ package com.fr.design.expand; -import java.awt.BorderLayout; -import java.awt.CardLayout; - -import javax.swing.*; -import javax.swing.event.ChangeEvent; -import javax.swing.event.ChangeListener; - import com.fr.base.BaseUtils; import com.fr.data.DataConstants; import com.fr.design.formula.TinyFormulaPane; import com.fr.design.gui.ibutton.UIButtonGroup; - import com.fr.report.cell.cellattr.CellExpandAttr; import com.fr.stable.StringUtils; +import javax.swing.Icon; +import javax.swing.JPanel; +import javax.swing.event.ChangeEvent; +import javax.swing.event.ChangeListener; +import java.awt.BorderLayout; +import java.awt.CardLayout; + public class SortExpandAttrPane extends JPanel { private UIButtonGroup sort_type_pane; private TinyFormulaPane tinyFormulaPane; @@ -29,7 +28,7 @@ public class SortExpandAttrPane extends JPanel { {BaseUtils.readIcon("/com/fr/design/images/expand/asc.png"), BaseUtils.readIcon("/com/fr/design/images/expand/asc_selected.png")}, {BaseUtils.readIcon("/com/fr/design/images/expand/des.png"), BaseUtils.readIcon("/com/fr/design/images/expand/des_selected.png")} }; - String[] nameArray = { com.fr.design.i18n.Toolkit.i18nText("Sort-Original"), com.fr.design.i18n.Toolkit.i18nText("Sort-Ascending"), com.fr.design.i18n.Toolkit.i18nText("Sort-Descending") }; + String[] nameArray = { com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Sort_Original"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Sort_Ascending"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Sort_Descending") }; sort_type_pane = new UIButtonGroup(iconArray); sort_type_pane.setAllToolTips(nameArray); sort_type_pane.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_ExpandD_Sort_After_Expand")); @@ -89,4 +88,4 @@ public class SortExpandAttrPane extends JPanel { } } -} \ No newline at end of file +} diff --git a/designer-realize/src/main/java/com/fr/design/headerfooter/HFAttributesEditDialog.java b/designer-realize/src/main/java/com/fr/design/headerfooter/HFAttributesEditDialog.java index 68cbf9a1e..2a4f3e45f 100644 --- a/designer-realize/src/main/java/com/fr/design/headerfooter/HFAttributesEditDialog.java +++ b/designer-realize/src/main/java/com/fr/design/headerfooter/HFAttributesEditDialog.java @@ -246,7 +246,7 @@ public class HFAttributesEditDialog extends BasicPane { } private void addImagePaneToTab() { - this.tabbedPane.addTab(com.fr.design.i18n.Toolkit.i18nText("Image"), this.imagePane); + this.tabbedPane.addTab(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Image"), this.imagePane); } private void addNewLinePaneToTab() { diff --git a/designer-realize/src/main/java/com/fr/design/headerfooter/HFComponent.java b/designer-realize/src/main/java/com/fr/design/headerfooter/HFComponent.java index ccc6e2bb9..061e3af57 100644 --- a/designer-realize/src/main/java/com/fr/design/headerfooter/HFComponent.java +++ b/designer-realize/src/main/java/com/fr/design/headerfooter/HFComponent.java @@ -267,9 +267,9 @@ public class HFComponent extends UILabel implements MoveActionListener { } else if (hfElement.getClass().equals(DateHFElement.class)) { return com.fr.design.i18n.Toolkit.i18nText("Date"); } else if (hfElement.getClass().equals(TimeHFElement.class)) { - return com.fr.design.i18n.Toolkit.i18nText("Time"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Time"); } else if (hfElement.getClass().equals(ImageHFElement.class)) { - return com.fr.design.i18n.Toolkit.i18nText("Image"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Image"); } else if (hfElement.getClass().equals(NewLineHFElement.class)) { return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_HF_New_Line"); } diff --git a/designer-realize/src/main/java/com/fr/design/headerfooter/ImagePane.java b/designer-realize/src/main/java/com/fr/design/headerfooter/ImagePane.java index a08fd4487..4fca75e87 100644 --- a/designer-realize/src/main/java/com/fr/design/headerfooter/ImagePane.java +++ b/designer-realize/src/main/java/com/fr/design/headerfooter/ImagePane.java @@ -14,7 +14,6 @@ import com.fr.design.style.background.image.ImagePreviewPane; import javax.swing.BorderFactory; import javax.swing.JPanel; import javax.swing.JScrollPane; -import javax.swing.SwingWorker; import java.awt.BorderLayout; import java.awt.Image; import java.awt.event.ActionEvent; @@ -56,7 +55,7 @@ public class ImagePane extends BasicPane { } else { rightPane.setBorder(BorderFactory.createEmptyBorder(4, 2, 0, 2)); } - UIButton selectImageButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Image-Select_Picture")); + UIButton selectImageButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Image_Select_Picture")); rightPane.add(selectImageButton, BorderLayout.NORTH); selectImageButton.addActionListener(selectPictureActionListener); @@ -91,4 +90,4 @@ public class ImagePane extends BasicPane { ImgChooseWrapper.getInstance(imagePreviewPane, imageFileChooser, null).dealWithImageFile(returnVal); } }; -} \ No newline at end of file +} diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/ElementCasePane.java b/designer-realize/src/main/java/com/fr/design/mainframe/ElementCasePane.java index e6ab7dc10..19fc93dd0 100644 --- a/designer-realize/src/main/java/com/fr/design/mainframe/ElementCasePane.java +++ b/designer-realize/src/main/java/com/fr/design/mainframe/ElementCasePane.java @@ -4,7 +4,6 @@ package com.fr.design.mainframe; import com.fr.base.BaseFormula; -import com.fr.base.BaseUtils; import com.fr.base.DynamicUnitList; import com.fr.base.FRContext; import com.fr.base.Formula; @@ -1049,9 +1048,9 @@ public abstract class ElementCasePane extends Tar return popupMenu; } - InsertRowAction insertRowAction = new InsertRowAction(this, com.fr.design.i18n.Toolkit.i18nText("Utils-Insert_Row")); + InsertRowAction insertRowAction = new InsertRowAction(this, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Utils_Insert_Row")); - DeleteRowAction deleteRowAction = new DeleteRowAction(this, com.fr.design.i18n.Toolkit.i18nText("Utils-Delete_Row")); + DeleteRowAction deleteRowAction = new DeleteRowAction(this, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Utils_Delete_Row")); RowHeightAction rowHeightAction = new RowHeightAction(this, selectedRows); @@ -1142,9 +1141,9 @@ public abstract class ElementCasePane extends Tar return popupMenu; } - InsertColumnAction insertColumnAction = new InsertColumnAction(this, com.fr.design.i18n.Toolkit.i18nText("Utils-Insert_Column")); + InsertColumnAction insertColumnAction = new InsertColumnAction(this, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Utils_Insert_Column")); - DeleteColumnAction deleteColumnAction = new DeleteColumnAction(this, com.fr.design.i18n.Toolkit.i18nText("Utils-Delete_Column")); + DeleteColumnAction deleteColumnAction = new DeleteColumnAction(this, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Utils_Delete_Column")); ColumnWidthAction columnWidthAction = new ColumnWidthAction(this, selectedColumn); diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/SheetAuthorityEditPane.java b/designer-realize/src/main/java/com/fr/design/mainframe/SheetAuthorityEditPane.java index a853f7883..a138f2f8e 100644 --- a/designer-realize/src/main/java/com/fr/design/mainframe/SheetAuthorityEditPane.java +++ b/designer-realize/src/main/java/com/fr/design/mainframe/SheetAuthorityEditPane.java @@ -41,7 +41,7 @@ public class SheetAuthorityEditPane extends AuthorityEditPane { @Override public void itemStateChanged(ItemEvent e) { String selectedRole = ReportAndFSManagePane.getInstance().getRoleTree().getSelectedRoleName(); - if (ComparatorUtils.equals(selectedRole, com.fr.design.i18n.Toolkit.i18nText("Role"))) { + if (ComparatorUtils.equals(selectedRole, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Role"))) { return; } if (selectedRole == null) { diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/SheetNameTabPane.java b/designer-realize/src/main/java/com/fr/design/mainframe/SheetNameTabPane.java index 03ea5fe0a..0bf8c6155 100644 --- a/designer-realize/src/main/java/com/fr/design/mainframe/SheetNameTabPane.java +++ b/designer-realize/src/main/java/com/fr/design/mainframe/SheetNameTabPane.java @@ -769,7 +769,7 @@ public class SheetNameTabPane extends JComponent implements MouseListener, Mouse protected abstract class SheetInsertAction extends UpdateAction { SheetInsertAction() { - this.setName(com.fr.design.i18n.Toolkit.i18nText("Insert") + getTemplateReportType()); + this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Insert") + getTemplateReportType()); this.setSmallIcon(BaseUtils.readIcon("/com/fr/base/images/cell/control/add.png")); } diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/CellExpandAttrPane.java b/designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/CellExpandAttrPane.java index 94cb796bb..8e2a5b21f 100644 --- a/designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/CellExpandAttrPane.java +++ b/designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/CellExpandAttrPane.java @@ -43,7 +43,7 @@ public class CellExpandAttrPane extends AbstractCellAttrPane { * @return */ public JPanel createContentPane() { - String[] nameArray = {com.fr.design.i18n.Toolkit.i18nText("ExpandD-Not_Expand"), com.fr.design.i18n.Toolkit.i18nText("Utils-Top_to_Bottom"), com.fr.design.i18n.Toolkit.i18nText("Utils-Left_to_Right")}; + String[] nameArray = {com.fr.design.i18n.Toolkit.i18nText("ExpandD-Not_Expand"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Utils_Top_To_Bottom"), com.fr.design.i18n.Toolkit.i18nText("FIne-Design_Report_Utils_Left_To_Right")}; Icon[][] iconArray = { {BaseUtils.readIcon("/com/fr/design/images/expand/none16x16.png"), BaseUtils.readIcon("/com/fr/design/images/expand/none16x16_selected@1x.png")}, {BaseUtils.readIcon("/com/fr/design/images/expand/vertical.png"), BaseUtils.readIcon("/com/fr/design/images/expand/vertical_selected@1x.png")}, diff --git a/designer-realize/src/main/java/com/fr/design/present/BarCodePane.java b/designer-realize/src/main/java/com/fr/design/present/BarCodePane.java index 93a37e3a4..15a506cc3 100644 --- a/designer-realize/src/main/java/com/fr/design/present/BarCodePane.java +++ b/designer-realize/src/main/java/com/fr/design/present/BarCodePane.java @@ -68,7 +68,7 @@ public class BarCodePane extends FurtherBasicBeanPane { this.barWidthSpinner.setPreferredSize(new Dimension(60, 20)); this.barHeightSpinner.setPreferredSize(new Dimension(60, 20)); JPanel borderPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); - TitledBorder titledBorder = new TitledBorder(new UIRoundedBorder(UIConstants.LINE_COLOR, 1, 5), com.fr.design.i18n.Toolkit.i18nText("StyleFormat-Sample"), 4, 2, this.getFont(), UIConstants.LINE_COLOR); + TitledBorder titledBorder = new TitledBorder(new UIRoundedBorder(UIConstants.LINE_COLOR, 1, 5), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_StyleFormat_Sample"), 4, 2, this.getFont(), UIConstants.LINE_COLOR); borderPane.setBorder(titledBorder); borderPane.add(barCodePreviewPane, BorderLayout.CENTER); setTypeComboBox(); diff --git a/designer-realize/src/main/java/com/fr/design/present/CurrencyLinePane.java b/designer-realize/src/main/java/com/fr/design/present/CurrencyLinePane.java index 5ce431519..1252fa9b0 100644 --- a/designer-realize/src/main/java/com/fr/design/present/CurrencyLinePane.java +++ b/designer-realize/src/main/java/com/fr/design/present/CurrencyLinePane.java @@ -85,7 +85,7 @@ public class CurrencyLinePane extends FurtherBasicBeanPane CurrencyLinePreviewPane = new CurrencyLinePreviewPane(); CurrencyLinePreviewPane.setPreferredSize(new Dimension(0, 145)); JPanel borderPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); - TitledBorder titledBorder = new TitledBorder(new UIRoundedBorder(UIConstants.LINE_COLOR, 1, 5), com.fr.design.i18n.Toolkit.i18nText("StyleFormat-Sample"), 4, 2, this.getFont(), UIConstants.LINE_COLOR); + TitledBorder titledBorder = new TitledBorder(new UIRoundedBorder(UIConstants.LINE_COLOR, 1, 5), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_StyleFormat_Sample"), 4, 2, this.getFont(), UIConstants.LINE_COLOR); borderPane.setBorder(titledBorder); borderPane.add(CurrencyLinePreviewPane, BorderLayout.CENTER); @@ -102,7 +102,7 @@ public class CurrencyLinePane extends FurtherBasicBeanPane Component[][] components = new Component[][]{ new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Data"), UILabel.LEFT), textField}, new Component[]{borderPane, null}, - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("IntPart"), UILabel.LEFT), groupPane(intPartSpinner)}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_IntPart"), UILabel.LEFT), groupPane(intPartSpinner)}, new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("DeciPart"), UILabel.LEFT), groupPane(deciPartSpinner)} }; @@ -230,4 +230,4 @@ public class CurrencyLinePane extends FurtherBasicBeanPane return new CurrencyLinePresent(currencylineAttr); } -} \ No newline at end of file +} 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 058c3ba1c..c0f98ec62 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 @@ -277,7 +277,7 @@ public class PageSetupPane extends BasicPane { JPanel marginLeftTextPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane(); marginLeftPane.add(marginLeftTextPane); - marginLeftTextPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Top") + ":")); + marginLeftTextPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Top_Duplicate") + ":")); marginTopUnitFieldPane = new UnitFieldPane(Constants.UNIT_MM); marginLeftTextPane.add(marginTopUnitFieldPane); JPanel marginLeftUnitPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane(); diff --git a/designer-realize/src/main/java/com/fr/design/report/SelectImagePane.java b/designer-realize/src/main/java/com/fr/design/report/SelectImagePane.java index 61c4dcdd0..263fc6ea1 100644 --- a/designer-realize/src/main/java/com/fr/design/report/SelectImagePane.java +++ b/designer-realize/src/main/java/com/fr/design/report/SelectImagePane.java @@ -74,7 +74,7 @@ public class SelectImagePane extends BasicPane { .createEmptyBorder(8, 2, 4, 0)); UIButton selectPictureButton = new UIButton( - com.fr.design.i18n.Toolkit.i18nText("Image-Select_Picture")); + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Image_Select_Picture")); selectFilePane.add(selectPictureButton, BorderLayout.NORTH); selectPictureButton.setMnemonic('S'); selectPictureButton.addActionListener(selectPictureActionListener); @@ -84,7 +84,7 @@ public class SelectImagePane extends BasicPane { //布局 defaultRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Default")); - tiledRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Image-Titled")); + tiledRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Image_Titled")); extendRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Image_Extend")); adjustRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Image_Adjust")); @@ -173,7 +173,7 @@ public class SelectImagePane extends BasicPane { @Override protected String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("Image"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Image"); } public void populate(Elem cell) { 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 60b5208fe..c523ceb19 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 @@ -82,7 +82,7 @@ public class SubReportPane extends BasicPane { centerPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Set", "Delivery", "Parameter"}),null)); JPanel kcPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); kcPane.add(kvPane); - extend = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Hyperlink-Extends_Report_Parameters")); + extend = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Find-Design_Basic_Hyperlink_Extends_Report_Parameters")); kcPane.add(extend, BorderLayout.SOUTH); centerPane.add(kcPane, BorderLayout.CENTER); UITextArea description = new UITextArea(2, 1); 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 8902a9820..1a8e0402a 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 @@ -42,6 +42,6 @@ public class FreezePagePane extends FreezeAndRepeatPane { @Override public String getLabeshow() { - return isNumber ? com.fr.design.i18n.Toolkit.i18nText("RowTo") : com.fr.design.i18n.Toolkit.i18nText("ColumnTo"); + return isNumber ? com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Row_To") : com.fr.design.i18n.Toolkit.i18nText("ColumnTo"); } -} \ No newline at end of file +} 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 fa8e2e680..8dbbb1dd5 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 @@ -33,7 +33,7 @@ public class FreezeWriteRowPane extends FreezeAndRepeatPane { @Override public String getLabeshow() { - return com.fr.design.i18n.Toolkit.i18nText("RowTo"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Row_To"); } -} \ No newline at end of file +} diff --git a/designer-realize/src/main/java/com/fr/design/report/freeze/RepeatRowPane.java b/designer-realize/src/main/java/com/fr/design/report/freeze/RepeatRowPane.java index 9b8628e8a..e46a59a6e 100644 --- a/designer-realize/src/main/java/com/fr/design/report/freeze/RepeatRowPane.java +++ b/designer-realize/src/main/java/com/fr/design/report/freeze/RepeatRowPane.java @@ -32,7 +32,7 @@ public class RepeatRowPane extends FreezeAndRepeatPane { @Override public String getLabeshow() { - return StringUtils.BLANK + com.fr.design.i18n.Toolkit.i18nText("RowTo") + StringUtils.BLANK; + return StringUtils.BLANK + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Row_To") + StringUtils.BLANK; } -} \ No newline at end of file +} diff --git a/designer-realize/src/main/java/com/fr/design/style/StylePane.java b/designer-realize/src/main/java/com/fr/design/style/StylePane.java index d4e6a9202..1ddf0c130 100644 --- a/designer-realize/src/main/java/com/fr/design/style/StylePane.java +++ b/designer-realize/src/main/java/com/fr/design/style/StylePane.java @@ -82,7 +82,7 @@ public class StylePane extends BasicBeanPane