fanruan
/
design
6
1
Fork 2
Code Issues 2 Pull Requests Releases Wiki Activity
Browse Source

格式化 

Signed-off-by: Jinbokai <Jinbokai@fanruan.com>

Signed-off-by: Jinbokai <Jinbokai@fanruan.com>
final/10.0
Jinbokai 6 years ago
parent
c085d77d45
commit
d2a54a881f
43 changed files with 0 additions and 74 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      designer-realize/src/main/java/com/fr/design/actions/cell/CleanAuthorityAction.java
  2. 1
      designer-realize/src/main/java/com/fr/design/actions/columnrow/ResetColumnHideAction.java
  3. 1
      designer-realize/src/main/java/com/fr/design/actions/columnrow/ResetRowHideAction.java
  4. 2
      designer-realize/src/main/java/com/fr/design/actions/edit/EditFloatElementNameAction.java
  5. 4
      designer-realize/src/main/java/com/fr/design/condition/HyperlinkPane.java
  6. 1
      designer-realize/src/main/java/com/fr/design/condition/PresentHighlightPane.java
  7. 1
      designer-realize/src/main/java/com/fr/design/condition/WidgetHighlightPane.java
  8. 2
      designer-realize/src/main/java/com/fr/design/dscolumn/SpecifiedGroupAttrPane.java
  9. 1
      designer-realize/src/main/java/com/fr/design/javascript/ListenerEditPane.java
  10. 2
      designer-realize/src/main/java/com/fr/design/mainframe/AuthorityEditToolBarPane.java
  11. 1
      designer-realize/src/main/java/com/fr/design/mainframe/AuthoritySheetEditedPane.java
  12. 4
      designer-realize/src/main/java/com/fr/design/mainframe/AuthorityToolBarPane.java
  13. 1
      designer-realize/src/main/java/com/fr/design/mainframe/ElementCasePane.java
  14. 1
      designer-realize/src/main/java/com/fr/design/mainframe/ReportComponent.java
  15. 1
      designer-realize/src/main/java/com/fr/design/mainframe/cell/CellElementEditPane.java
  16. 1
      designer-realize/src/main/java/com/fr/design/mainframe/cell/QuickEditorRegion.java
  17. 1
      designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/style/CustomStylePane.java
  18. 1
      designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/style/PredefinedStylePane.java
  19. 1
      designer-realize/src/main/java/com/fr/design/mainframe/form/FormElementCaseDesigner.java
  20. 1
      designer-realize/src/main/java/com/fr/design/parameter/ParameterDefinitePane.java
  21. 1
      designer-realize/src/main/java/com/fr/design/present/BarCodePane.java
  22. 3
      designer-realize/src/main/java/com/fr/design/report/ExcelExportPane.java
  23. 2
      designer-realize/src/main/java/com/fr/design/report/LayerReportPane.java
  24. 1
      designer-realize/src/main/java/com/fr/design/report/PDFExportPane.java
  25. 3
      designer-realize/src/main/java/com/fr/design/report/SubReportPane.java
  26. 2
      designer-realize/src/main/java/com/fr/design/report/VerifierListPane.java
  27. 1
      designer-realize/src/main/java/com/fr/design/report/freeze/FreezePagePane.java
  28. 2
      designer-realize/src/main/java/com/fr/design/report/freeze/FreezeWriteColPane.java
  29. 2
      designer-realize/src/main/java/com/fr/design/report/freeze/FreezeWriteRowPane.java
  30. 5
      designer-realize/src/main/java/com/fr/design/report/freeze/RepeatAndFreezeSettingPane.java
  31. 1
      designer-realize/src/main/java/com/fr/design/webattr/DragToolBarPane.java
  32. 9
      designer-realize/src/main/java/com/fr/design/webattr/EditToolBar.java
  33. 1
      designer-realize/src/main/java/com/fr/design/webattr/ReportWebWidgetConstants.java
  34. 1
      designer-realize/src/main/java/com/fr/design/webattr/ToolBarDragPane.java
  35. 1
      designer-realize/src/main/java/com/fr/design/webattr/WriteToolBarPane.java
  36. 1
      designer-realize/src/main/java/com/fr/design/widget/ValueWidgetPane.java
  37. 1
      designer-realize/src/main/java/com/fr/design/widget/WidgetPane.java
  38. 1
      designer-realize/src/main/java/com/fr/design/widget/ui/CheckBoxGroupDefinePane.java
  39. 1
      designer-realize/src/main/java/com/fr/design/widget/ui/ParameterTreeComboBox.java
  40. 1
      designer-realize/src/main/java/com/fr/design/widget/ui/btn/DefineAppendColumnRowPane.java
  41. 1
      designer-realize/src/main/java/com/fr/design/widget/ui/btn/DefineDeleteColumnRowPane.java
  42. 2
      designer-realize/src/main/java/com/fr/design/write/submit/SmartInsertDBManipulationPane.java
  43. 2
      designer-realize/src/main/java/com/fr/grid/selection/FloatSelection.java

1
designer-realize/src/main/java/com/fr/design/actions/cell/CleanAuthorityAction.java
Unescape View File

@ -26,7 +26,6 @@ public class CleanAuthorityAction extends ElementCaseAction {
public CleanAuthorityAction(ElementCasePane t) { public CleanAuthorityAction(ElementCasePane t) {
super(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")); this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Clear_DashBoard_Potence"));
} }

1
designer-realize/src/main/java/com/fr/design/actions/columnrow/ResetColumnHideAction.java
Unescape View File

@ -11,7 +11,6 @@ public class ResetColumnHideAction extends AbstractColumnRowIndexAction {
public ResetColumnHideAction(ElementCasePane t, int indexOfColumnOrRow) { public ResetColumnHideAction(ElementCasePane t, int indexOfColumnOrRow) {
super(t, 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")); this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Cancel_Hide"));
} }

1
designer-realize/src/main/java/com/fr/design/actions/columnrow/ResetRowHideAction.java
Unescape View File

@ -11,7 +11,6 @@ public class ResetRowHideAction extends AbstractColumnRowIndexAction {
public ResetRowHideAction(ElementCasePane t, int indexOfColumnOrRow) { public ResetRowHideAction(ElementCasePane t, int indexOfColumnOrRow) {
super(t, 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")); this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Cancel_Hide"));
} }

2
designer-realize/src/main/java/com/fr/design/actions/edit/EditFloatElementNameAction.java
Unescape View File

@ -18,7 +18,6 @@ public class EditFloatElementNameAction extends FloatSelectionAction {
public EditFloatElementNameAction(ElementCasePane t) { public EditFloatElementNameAction(ElementCasePane t) {
super(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")); 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 @Override
protected String title4PopupWindow() { 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"); return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Set_Float_Element_Name");
} }

4
designer-realize/src/main/java/com/fr/design/condition/HyperlinkPane.java
Unescape View File

@ -51,7 +51,6 @@ public class HyperlinkPane extends ConditionAttrSingleConditionPane<HighlightAct
} }
}); });
hyperlinkButton.setEnabled(false); hyperlinkButton.setEnabled(false);
// UILabel hyperlinkLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Hyperlink", "Type"}) + ":");
UILabel hyperlinkLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Hyperlink_Type") + ":"); UILabel hyperlinkLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Hyperlink_Type") + ":");
typeField = new UITextField(12); typeField = new UITextField(12);
typeField.setEditable(false); typeField.setEditable(false);
@ -59,7 +58,6 @@ public class HyperlinkPane extends ConditionAttrSingleConditionPane<HighlightAct
this.add(typeField); this.add(typeField);
this.add(hyperlinkButton); this.add(hyperlinkButton);
// useHyperlink = new UICheckBox(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Use", "Links"}));
useHyperlink = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Use_Links")); useHyperlink = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Use_Links"));
useHyperlink.addActionListener(l); useHyperlink.addActionListener(l);
this.add(useHyperlink); this.add(useHyperlink);
@ -100,12 +98,10 @@ public class HyperlinkPane extends ConditionAttrSingleConditionPane<HighlightAct
if (js instanceof JavaScriptImpl) { if (js instanceof JavaScriptImpl) {
this.typeField.setText("JavaScript"); this.typeField.setText("JavaScript");
} else if (js instanceof ReportletHyperlink) { } else if (js instanceof ReportletHyperlink) {
// this.typeField.setText(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Report", "Links"}));
this.typeField.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Report_Links")); this.typeField.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Report_Links"));
} else if (js instanceof WebHyperlink) { } else if (js instanceof WebHyperlink) {
this.typeField.setText(com.fr.design.i18n.Toolkit.i18nText("Hyperlink-Web_link")); this.typeField.setText(com.fr.design.i18n.Toolkit.i18nText("Hyperlink-Web_link"));
} else if (js instanceof EmailJavaScript) { } else if (js instanceof EmailJavaScript) {
// this.typeField.setText(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Email", "Links"}));
this.typeField.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Email_Links")); this.typeField.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Email_Links"));
} }

1
designer-realize/src/main/java/com/fr/design/condition/PresentHighlightPane.java
Unescape View File

@ -35,7 +35,6 @@ public class PresentHighlightPane extends ConditionAttrSingleConditionPane<Highl
super(conditionAttributesPane); super(conditionAttributesPane);
this.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Present") + ":")); this.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Present") + ":"));
// String[] typeArray = {PresentConstants.NORMAL, com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Other", "Present"})};
String[] typeArray = {PresentConstants.NORMAL, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Other_Present")}; String[] typeArray = {PresentConstants.NORMAL, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Other_Present")};
presentComboBox = new UIComboBox(typeArray); presentComboBox = new UIComboBox(typeArray);
this.add(presentComboBox); this.add(presentComboBox);

1
designer-realize/src/main/java/com/fr/design/condition/WidgetHighlightPane.java
Unescape View File

@ -83,7 +83,6 @@ public class WidgetHighlightPane extends ConditionAttrSingleConditionPane<Highli
box.setEnabled(false); box.setEnabled(false);
this.add(widgetButton); this.add(widgetButton);
widgetButton.setEnabled(false); widgetButton.setEnabled(false);
// useWidget = new UICheckBox(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Use", "Widget"}));
useWidget = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Use_Widget")); useWidget = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Use_Widget"));
this.add(useWidget); this.add(useWidget);
useWidget.addActionListener(new ActionListener() { useWidget.addActionListener(new ActionListener() {

2
designer-realize/src/main/java/com/fr/design/dscolumn/SpecifiedGroupAttrPane.java
Unescape View File

@ -88,7 +88,6 @@ public class SpecifiedGroupAttrPane extends BasicPane {
protected void initComponents() { protected void initComponents() {
this.setLayout(FRGUIPaneFactory.createBorderLayout()); this.setLayout(FRGUIPaneFactory.createBorderLayout());
specifiedComboBox = new UIComboBox(new String[]{ 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") com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Condition_Group"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Formula_Group")
}); });
@ -361,7 +360,6 @@ 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")), 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); new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Custom_Value") + ": "), label, valueField, formulaButton}, FlowLayout.LEFT);
contentPane.add(southPane); contentPane.add(southPane);
} }

1
designer-realize/src/main/java/com/fr/design/javascript/ListenerEditPane.java
Unescape View File

@ -45,7 +45,6 @@ public class ListenerEditPane extends BasicBeanPane<Listener> {
private static final String JS = com.fr.design.i18n.Toolkit.i18nText("FR-Designer_JavaScript"); 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 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 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 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 static final String EMAIL = com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Email_sentEmail");

2
designer-realize/src/main/java/com/fr/design/mainframe/AuthorityEditToolBarPane.java
Unescape View File

@ -40,7 +40,6 @@ public class AuthorityEditToolBarPane extends AuthorityPropertyPane {
super(HistoryTemplateListPane.getInstance().getCurrentEditingTemplate()); super(HistoryTemplateListPane.getInstance().getCurrentEditingTemplate());
this.setLayout(new BorderLayout()); this.setLayout(new BorderLayout());
this.setBorder(null); 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")) { UILabel authorityTitle = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Permissions_Edit")) {
@Override @Override
public Dimension getPreferredSize() { public Dimension getPreferredSize() {
@ -208,7 +207,6 @@ public class AuthorityEditToolBarPane extends AuthorityPropertyPane {
if (name.getText() == "") { if (name.getText() == "") {
type.setText(""); type.setText("");
} else { } 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")); type.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Toolbar_Button"));
} }
} }

1
designer-realize/src/main/java/com/fr/design/mainframe/AuthoritySheetEditedPane.java
Unescape View File

@ -30,7 +30,6 @@ public class AuthoritySheetEditedPane extends AuthorityPropertyPane {
super(HistoryTemplateListPane.getInstance().getCurrentEditingTemplate()); super(HistoryTemplateListPane.getInstance().getCurrentEditingTemplate());
this.setLayout(new BorderLayout()); this.setLayout(new BorderLayout());
this.setBorder(null); 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")) { UILabel authorityTitle = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Edit_DashBoard_Potence")) {
@Override @Override
public Dimension getPreferredSize() { public Dimension getPreferredSize() {

4
designer-realize/src/main/java/com/fr/design/mainframe/AuthorityToolBarPane.java
Unescape View File

@ -46,7 +46,6 @@ public class AuthorityToolBarPane<T extends WebContent> extends BasicBeanPane<Re
private static final int COMBOX_WIDTH = 144; private static final int COMBOX_WIDTH = 144;
private static final String[] CHOOSEITEM = new String[]{com.fr.design.i18n.Toolkit.i18nText("M-Page_Preview"), private static final String[] CHOOSEITEM = new String[]{com.fr.design.i18n.Toolkit.i18nText("M-Page_Preview"),
// com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Face_Write", "PageSetup-Page"}),
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Face_Write_Page"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Face_Write_Page"),
com.fr.design.i18n.Toolkit.i18nText("M-Data_Analysis")}; com.fr.design.i18n.Toolkit.i18nText("M-Data_Analysis")};
private UIComboBox choseComboBox; private UIComboBox choseComboBox;
@ -131,7 +130,6 @@ public class AuthorityToolBarPane<T extends WebContent> extends BasicBeanPane<Re
public AuthorityToolBarPane() { public AuthorityToolBarPane() {
this.setLayout(new FlowLayout(FlowLayout.LEFT, 0, 3)); this.setLayout(new FlowLayout(FlowLayout.LEFT, 0, 3));
this.setBorder(BorderFactory.createEmptyBorder(0, PRE_GAP, 0, 0)); this.setBorder(BorderFactory.createEmptyBorder(0, PRE_GAP, 0, 0));
// title = new UILabel(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"ReportServerP-Toolbar", "Choose_Role"}));
title = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Toolbar_Choose_Role")); title = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Toolbar_Choose_Role"));
title.setHorizontalAlignment(SwingConstants.CENTER); title.setHorizontalAlignment(SwingConstants.CENTER);
this.add(title, 0); this.add(title, 0);
@ -186,7 +184,6 @@ public class AuthorityToolBarPane<T extends WebContent> extends BasicBeanPane<Re
*/ */
private void checkToolBarPaneEnable() { private void checkToolBarPaneEnable() {
List<ToolBarButton> toolBarButtons = toolBarPane.getToolBarButtons(); List<ToolBarButton> 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(); 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) { for (ToolBarButton button : toolBarButtons) {
button.setEnabled(!isnotEnable); button.setEnabled(!isnotEnable);
@ -283,7 +280,6 @@ public class AuthorityToolBarPane<T extends WebContent> extends BasicBeanPane<Re
} }
// 模板设置 // 模板设置
T webContent = this.getWebContent(reportWebAttr); T webContent = this.getWebContent(reportWebAttr);
// title = new UILabel(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"the_template", "ReportServerP-Toolbar", "Choose_Role"}));
title = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Template_Toolbar_Choose_Role")); title = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Template_Toolbar_Choose_Role"));
this.add(title, 0); this.add(title, 0);
populate(webContent.getToolBarManagers()); populate(webContent.getToolBarManagers());

1
designer-realize/src/main/java/com/fr/design/mainframe/ElementCasePane.java
Unescape View File

@ -1237,7 +1237,6 @@ public abstract class ElementCasePane<T extends TemplateElementCase> extends Tar
*/ */
public ShortCut[] shortCuts4Authority() { public ShortCut[] shortCuts4Authority() {
return new ShortCut[]{ 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")), new NameSeparator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Edit_DashBoard_Potence")),
DesignerMode.isAuthorityEditing() ? new ExitAuthorityEditAction(this) : new AllowAuthorityEditAction(this), DesignerMode.isAuthorityEditing() ? new ExitAuthorityEditAction(this) : new AllowAuthorityEditAction(this),
}; };

1
designer-realize/src/main/java/com/fr/design/mainframe/ReportComponent.java
Unescape View File

@ -68,7 +68,6 @@ public abstract class ReportComponent<T extends TemplateReport, E extends Elemen
public ShortCut[] shortCuts4Authority() { public ShortCut[] shortCuts4Authority() {
return new ShortCut[]{ 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")), new NameSeparator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Edit_DashBoard_Potence")),
DesignerMode.isAuthorityEditing() ? new ExitAuthorityEditAction(this) : new AllowAuthorityEditAction(this), DesignerMode.isAuthorityEditing() ? new ExitAuthorityEditAction(this) : new AllowAuthorityEditAction(this),
}; };

1
designer-realize/src/main/java/com/fr/design/mainframe/cell/CellElementEditPane.java
Unescape View File

@ -147,7 +147,6 @@ public class CellElementEditPane extends BasicPane {
ePane.fireTargetModified(); ePane.fireTargetModified();
} }
} else { } else {
// DesignUtils.errorMessage(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"FR-Designer_Not_use_a_cell_attribute_table_editing", "FR-Designer_Float_Element"}) + "!");
DesignUtils.errorMessage(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Float_Element_Edit_Tips") + "!"); DesignUtils.errorMessage(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Float_Element_Edit_Tips") + "!");
} }
ePane.setSupportDefaultParentCalculate(false); ePane.setSupportDefaultParentCalculate(false);

1
designer-realize/src/main/java/com/fr/design/mainframe/cell/QuickEditorRegion.java
Unescape View File

@ -32,7 +32,6 @@ public class QuickEditorRegion extends JPanel {
public static JPanel getEmptyEditor() { public static JPanel getEmptyEditor() {
if (EMPTY == null) { if (EMPTY == null) {
EMPTY = new JPanel(new BorderLayout()); EMPTY = new JPanel(new BorderLayout());
// UILabel content = new UILabel(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"DataFunction-None", "HJS-Message", "Form-Widget_Property_Table"}) + "!");
UILabel content = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_None_Message_Property_Table") + "!"); UILabel content = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_None_Message_Property_Table") + "!");
content.setBorder(BorderFactory.createEmptyBorder(0, 70, 0, 0)); content.setBorder(BorderFactory.createEmptyBorder(0, 70, 0, 0));
EMPTY.add(content, BorderLayout.CENTER); EMPTY.add(content, BorderLayout.CENTER);

1
designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/style/CustomStylePane.java
Unescape View File

@ -59,7 +59,6 @@ public class CustomStylePane extends MultiTabPane<Style> {
* @return * @return
*/ */
public String title4PopupWindow() { 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"); return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Custom_Style");
} }

1
designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/style/PredefinedStylePane.java
Unescape View File

@ -124,7 +124,6 @@ public class PredefinedStylePane extends FurtherBasicBeanPane<NameStyle> impleme
* @return 标题 * @return 标题
*/ */
public String title4PopupWindow() { 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"); return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Predefined_Style");
} }

1
designer-realize/src/main/java/com/fr/design/mainframe/form/FormElementCaseDesigner.java
Unescape View File

@ -94,7 +94,6 @@ public class FormElementCaseDesigner<T extends FormElementCaseProvider, E extend
@Override @Override
public ShortCut[] shortCuts4Authority() { public ShortCut[] shortCuts4Authority() {
return new ShortCut[]{ 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")), new NameSeparator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Edit_DashBoard_Potence")),
DesignerMode.isAuthorityEditing() ? new ExitAuthorityEditAction(this) : new AllowAuthorityEditAction(this), DesignerMode.isAuthorityEditing() ? new ExitAuthorityEditAction(this) : new AllowAuthorityEditAction(this),
}; };

1
designer-realize/src/main/java/com/fr/design/parameter/ParameterDefinitePane.java
Unescape View File

@ -481,7 +481,6 @@ public class ParameterDefinitePane extends JPanel implements ToolBarMenuDockPlus
if (!DesignerMode.isAuthorityEditing()) { if (!DesignerMode.isAuthorityEditing()) {
tplMenu.addShortCut(new NameSeparator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Utils_WorkBook"))); tplMenu.addShortCut(new NameSeparator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Utils_WorkBook")));
tplMenu.addShortCut(new ReportParameterAction(workBook)); tplMenu.addShortCut(new ReportParameterAction(workBook));
// tplMenu.addShortCut(new NameSeparator(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"DashBoard-Potence", "Edit"})));
tplMenu.addShortCut(new NameSeparator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Edit_DashBoard_Potence"))); tplMenu.addShortCut(new NameSeparator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Edit_DashBoard_Potence")));
tplMenu.addShortCut(new AllowAuthorityEditAction(workBook)); tplMenu.addShortCut(new AllowAuthorityEditAction(workBook));
} else { } else {

1
designer-realize/src/main/java/com/fr/design/present/BarCodePane.java
Unescape View File

@ -225,7 +225,6 @@ public class BarCodePane extends FurtherBasicBeanPane<BarcodePresent> {
} }
private void initVersionComboBox() { 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"}; 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); initcombobox(this.RCodeVersionComboBox, array, 0);
} }

3
designer-realize/src/main/java/com/fr/design/report/ExcelExportPane.java
Unescape View File

@ -51,7 +51,6 @@ public class ExcelExportPane extends BasicPane {
northPane.add(passwordPane); northPane.add(passwordPane);
passwordWritePane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane(); passwordWritePane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane();
passwordPane.add(passwordWritePane); 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); passwordWritePane.add(passwordLabel);
passwordField = new UITextField(11); passwordField = new UITextField(11);
@ -70,10 +69,8 @@ public class ExcelExportPane extends BasicPane {
JPanel protectedWordPane =FRGUIPaneFactory.createNormalFlowInnerContainer_M_Pane(); 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")); protectedWord = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Protected_Password"));
wordPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane(); 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); protectedField = new UITextField(11);
wordPane.add(protectedField); wordPane.add(protectedField);

2
designer-realize/src/main/java/com/fr/design/report/LayerReportPane.java
Unescape View File

@ -49,7 +49,6 @@ public class LayerReportPane extends BasicBeanPane<LayerReportAttr> {
protected void initComponents() { protected void initComponents() {
this.setLayout(FRGUIPaneFactory.createBorderLayout()); 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 outlayerReportPane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Report_Engine_Attribute"));
JPanel layerReportPane = FRGUIPaneFactory.createY_AXISBoxInnerContainer_M_Pane(); JPanel layerReportPane = FRGUIPaneFactory.createY_AXISBoxInnerContainer_M_Pane();
this.add(outlayerReportPane); this.add(outlayerReportPane);
@ -114,7 +113,6 @@ public class LayerReportPane extends BasicBeanPane<LayerReportAttr> {
@Override @Override
protected String title4PopupWindow() { 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"); return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Report_Engine_Attribute");
} }

1
designer-realize/src/main/java/com/fr/design/report/PDFExportPane.java
Unescape View File

@ -40,7 +40,6 @@ public class PDFExportPane extends BasicPane {
northPane.add(passwordPane); northPane.add(passwordPane);
passwordWritePane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane(); passwordWritePane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane();
passwordPane.add(passwordWritePane); 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); passwordWritePane.add(passwordLabel);
passwordField = new UITextField(11); passwordField = new UITextField(11);

3
designer-realize/src/main/java/com/fr/design/report/SubReportPane.java
Unescape View File

@ -45,7 +45,6 @@ public class SubReportPane extends BasicPane {
this.setLayout(FRGUIPaneFactory.createM_BorderLayout()); this.setLayout(FRGUIPaneFactory.createM_BorderLayout());
JPanel northPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); JPanel northPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
// northPane.setLayout(FRGUIPaneFactory.createM_BorderLayout()); // 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.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(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Location") + ":"), BorderLayout.WEST);
northPane.add(pathTextField = new UITextField(), BorderLayout.CENTER); northPane.add(pathTextField = new UITextField(), BorderLayout.CENTER);
@ -80,7 +79,6 @@ public class SubReportPane extends BasicPane {
centerPane.setLayout(FRGUIPaneFactory.createM_BorderLayout()); centerPane.setLayout(FRGUIPaneFactory.createM_BorderLayout());
centerPane.setBorder(BorderFactory.createEmptyBorder(0, 5, 10, 5)); centerPane.setBorder(BorderFactory.createEmptyBorder(0, 5, 10, 5));
kvPane = new ReportletParameterViewPane(); 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)); centerPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Set_Delivery_Parameter"),null));
JPanel kcPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); JPanel kcPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
kcPane.add(kvPane); kcPane.add(kvPane);
@ -96,7 +94,6 @@ public class SubReportPane extends BasicPane {
@Override @Override
protected String title4PopupWindow() { 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"); return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Insert_Sub_Report");
} }

2
designer-realize/src/main/java/com/fr/design/report/VerifierListPane.java
Unescape View File

@ -34,7 +34,6 @@ public class VerifierListPane extends ObjectJControlPane {
*/ */
public NameableCreator[] createNameableCreators() { public NameableCreator[] createNameableCreators() {
NameableCreator[] creators = new NameableCreator[]{ 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"), new NameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_BuildIn_Verify"),
"/com/fr/web/images/reportlet.png", "/com/fr/web/images/reportlet.png",
ValueVerifier.class, ValueVerifier.class,
@ -51,7 +50,6 @@ public class VerifierListPane extends ObjectJControlPane {
}); });
} }
creators = ArrayUtils.add(creators, new NameObjectCreator( 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.design.i18n.Toolkit.i18nText("Fine-Design_Report_Custom_Verify"),
"/com/fr/web/images/reportlet.png", "/com/fr/web/images/reportlet.png",
WClassVerifier.class, WClassVerifier.class,

1
designer-realize/src/main/java/com/fr/design/report/freeze/FreezePagePane.java
Unescape View File

@ -12,7 +12,6 @@ public class FreezePagePane extends FreezeAndRepeatPane {
public FreezePagePane(boolean isNumber) { public FreezePagePane(boolean isNumber) {
this.isNumber = 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); 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); end = new UILabel(isNumber ? " 1"+com.fr.design.i18n.Toolkit.i18nText("Row") : " A"+com.fr.design.i18n.Toolkit.i18nText("Column"), SwingConstants.CENTER);
super.initComponent(); super.initComponent();

2
designer-realize/src/main/java/com/fr/design/report/freeze/FreezeWriteColPane.java
Unescape View File

@ -10,7 +10,6 @@ public class FreezeWriteColPane extends FreezeAndRepeatPane {
public FreezeWriteColPane() { 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); 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); end = new ColSpinner(1,Integer.MAX_VALUE,1,1);
super.initComponent(); super.initComponent();
@ -26,7 +25,6 @@ public class FreezeWriteColPane extends FreezeAndRepeatPane {
@Override @Override
public void populateBean(FT ob) { 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())); ((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)); ((ColSpinner)end).setValue((ob.getTo() + 1));
} }

2
designer-realize/src/main/java/com/fr/design/report/freeze/FreezeWriteRowPane.java
Unescape View File

@ -9,7 +9,6 @@ import com.fr.stable.StableUtils;
public class FreezeWriteRowPane extends FreezeAndRepeatPane { public class FreezeWriteRowPane extends FreezeAndRepeatPane {
public FreezeWriteRowPane() { 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); 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); end = new RowSpinner(1, Integer.MAX_VALUE, 1,1);
super.initComponent(); super.initComponent();
@ -23,7 +22,6 @@ public class FreezeWriteRowPane extends FreezeAndRepeatPane {
@Override @Override
public void populateBean(FT ob) { 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())); ((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); ((RowSpinner)end).setValue(ob.getTo() + 1);
} }

5
designer-realize/src/main/java/com/fr/design/report/freeze/RepeatAndFreezeSettingPane.java
Unescape View File

@ -66,7 +66,6 @@ public class RepeatAndFreezeSettingPane extends BasicPane {
JPanel soverlapRowStartPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane(); JPanel soverlapRowStartPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane();
useRepeatTitleRCheckBox = new UICheckBox(); useRepeatTitleRCheckBox = new UICheckBox();
soverlapRowStartPane.add(useRepeatTitleRCheckBox); 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"))); soverlapRowStartPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Title_Start_Row_Form")));
repeatTitleRowPane = new RepeatRowPane(); repeatTitleRowPane = new RepeatRowPane();
soverlapRowStartPane.add(repeatTitleRowPane); soverlapRowStartPane.add(repeatTitleRowPane);
@ -82,7 +81,6 @@ public class RepeatAndFreezeSettingPane extends BasicPane {
JPanel soverlapColStartPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane(); JPanel soverlapColStartPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane();
useRepeatTitleCCheckBox = new UICheckBox(); useRepeatTitleCCheckBox = new UICheckBox();
soverlapColStartPane.add(useRepeatTitleCCheckBox); 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"))); soverlapColStartPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Title_Start_Column_Form")));
// 重复打印标题的结束列 // 重复打印标题的结束列
repeatTitleColPane = new RepeatColPane(); repeatTitleColPane = new RepeatColPane();
@ -99,7 +97,6 @@ public class RepeatAndFreezeSettingPane extends BasicPane {
JPanel foverlapRowStartPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane(); JPanel foverlapRowStartPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane();
useRepeatFinisRCheckBox = new UICheckBox(); useRepeatFinisRCheckBox = new UICheckBox();
foverlapRowStartPane.add(useRepeatFinisRCheckBox); 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"))); foverlapRowStartPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Finis_Start_Row_Form")));
repeatFinisRowPane = new RepeatRowPane(); repeatFinisRowPane = new RepeatRowPane();
foverlapRowStartPane.add(repeatFinisRowPane); foverlapRowStartPane.add(repeatFinisRowPane);
@ -115,7 +112,6 @@ public class RepeatAndFreezeSettingPane extends BasicPane {
JPanel foverlapColStartPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane(); JPanel foverlapColStartPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane();
useRepeatFinisCCheckBox = new UICheckBox(); useRepeatFinisCCheckBox = new UICheckBox();
foverlapColStartPane.add(useRepeatFinisCCheckBox); 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"))); foverlapColStartPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Finis_Start_Column_Form")));
repeatFinisColPane = new RepeatColPane(); repeatFinisColPane = new RepeatColPane();
foverlapColStartPane.add(repeatFinisColPane); foverlapColStartPane.add(repeatFinisColPane);
@ -179,7 +175,6 @@ public class RepeatAndFreezeSettingPane extends BasicPane {
private JPanel initWriteFrozenPane() { private JPanel initWriteFrozenPane() {
JPanel writePanel = FRGUIPaneFactory.createBorderLayout_S_Pane(); 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") + ":"); UILabel writeLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Face_Write_Frozen") + ":");
JPanel writeLabelPanel = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane(); JPanel writeLabelPanel = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane();
writeLabelPanel.add(writeLabel); writeLabelPanel.add(writeLabel);

1
designer-realize/src/main/java/com/fr/design/webattr/DragToolBarPane.java
Unescape View File

@ -136,7 +136,6 @@ public class DragToolBarPane extends WidgetToolBarPane {
@Override @Override
protected String title4PopupWindow() { 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"); return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Set_Toolbar");
} }

9
designer-realize/src/main/java/com/fr/design/webattr/EditToolBar.java
Unescape View File

@ -152,14 +152,11 @@ public class EditToolBar extends BasicPane {
this.add(splitPane); this.add(splitPane);
list.addListSelectionListener(listSelectionListener); list.addListSelectionListener(listSelectionListener);
JPanel backgroundPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane(); 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")); 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")); defaultCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Default_Background"));
bgButton.addActionListener(actioner); bgButton.addActionListener(actioner);
backgroundPane.add(defaultCheckBox); backgroundPane.add(defaultCheckBox);
backgroundPane.add(bgButton); 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"))); backgroundPane.setBorder(BorderFactory.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Set_Background")));
this.add(backgroundPane, BorderLayout.SOUTH); this.add(backgroundPane, BorderLayout.SOUTH);
} }
@ -383,14 +380,12 @@ public class EditToolBar extends BasicPane {
double rowSize[] = {p, p}; double rowSize[] = {p, p};
double columnSize[] = {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}}; 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); JPanel nameIconPane = TableLayoutHelper.createTableLayoutPane(coms, rowSize, columnSize);
north.add(nameIconPane, BorderLayout.SOUTH); 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"))); north.setBorder(BorderFactory.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Set_Form_Button_Property")));
this.add(north, BorderLayout.NORTH); this.add(north, BorderLayout.NORTH);
JPanel none = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane(); JPanel none = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane();
@ -447,7 +442,6 @@ public class EditToolBar extends BasicPane {
export = exportToolBarProviders[i].updateCenterPane(export); 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)); export.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Set_Form_Button_Property"), null));
return export; return export;
} }
@ -455,7 +449,6 @@ public class EditToolBar extends BasicPane {
private JPanel getCpane() { private JPanel getCpane() {
JPanel appendCountPane = FRGUIPaneFactory.createY_AXISBoxInnerContainer_S_Pane(); JPanel appendCountPane = FRGUIPaneFactory.createY_AXISBoxInnerContainer_S_Pane();
count = new UIBasicSpinner(new SpinnerNumberModel(1, 0, Integer.MAX_VALUE, 1)); 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") + ":"); UILabel countLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Add_Row_Column_Numbers") + ":");
JPanel cpane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane(); JPanel cpane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane();
cpane.add(countLabel); cpane.add(countLabel);
@ -467,11 +460,9 @@ public class EditToolBar extends BasicPane {
private JPanel getSubmitPane() { private JPanel getSubmitPane() {
isVerify = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Verify-Data_Verify")); 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")); 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")); isCurSheet = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Only_Submit_Current_Sheet"));
JPanel submitPane = FRGUIPaneFactory.createY_AXISBoxInnerContainer_S_Pane(); 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.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Set_Form_Button_Property"), null));
submitPane.add(isVerify); submitPane.add(isVerify);
submitPane.add(failSubmit); submitPane.add(failSubmit);

1
designer-realize/src/main/java/com/fr/design/webattr/ReportWebWidgetConstants.java
Unescape View File

@ -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 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 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); .createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Custom_Form_Button"), CustomToolBarButton.class);
// 输出离线html报表 // 输出离线html报表

1
designer-realize/src/main/java/com/fr/design/webattr/ToolBarDragPane.java
Unescape View File

@ -256,7 +256,6 @@ public class ToolBarDragPane extends WidgetToolBarPane {
@Override @Override
protected String title4PopupWindow() { 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"); return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Set_Toolbar");
} }

1
designer-realize/src/main/java/com/fr/design/webattr/WriteToolBarPane.java
Unescape View File

@ -73,7 +73,6 @@ public class WriteToolBarPane extends AbstractEditToolBarPane {
rptButtonGroup.add(centerRadioButton); rptButtonGroup.add(centerRadioButton);
northPane.add(GUICoreUtils.createFlowPane(new Component[]{rptShowLocationLabel, centerRadioButton, leftRadioButton}, FlowLayout.LEFT)); 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 = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Set_Face_Write_Current_Edit_Row_Background") + ":");
colorBox.setSelected(true); colorBox.setSelected(true);
colorBox.addActionListener(colorListener); colorBox.addActionListener(colorListener);

1
designer-realize/src/main/java/com/fr/design/widget/ValueWidgetPane.java
Unescape View File

@ -27,7 +27,6 @@ public class ValueWidgetPane extends WidgetPane {
public JPanel initNorthPane(){ public JPanel initNorthPane(){
JPanel northPane = super.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 = new UILabel(" " + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Widget_Value")+ ":");
label.setVisible(false); label.setVisible(false);
widgetValuePane = new JPanel(); widgetValuePane = new JPanel();

1
designer-realize/src/main/java/com/fr/design/widget/WidgetPane.java
Unescape View File

@ -81,7 +81,6 @@ public class WidgetPane extends AbstractAttrNoScrollPane implements ItemListener
double[] columnSize = {p, p, f}; double[] columnSize = {p, p, f};
double[] rowSize = {p}; double[] rowSize = {p};
Component[][] components = new Component[][]{ 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}, new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Select_Widget")), emptyLabel, editorTypeComboBox},
}; };
JPanel jPanel = TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize); JPanel jPanel = TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize);

1
designer-realize/src/main/java/com/fr/design/widget/ui/CheckBoxGroupDefinePane.java
Unescape View File

@ -37,7 +37,6 @@ public class CheckBoxGroupDefinePane extends FieldEditorDefinePane<CheckBoxGroup
@Override @Override
protected JPanel setFirstContentPane() { protected JPanel setFirstContentPane() {
JPanel advancePane = FRGUIPaneFactory.createBorderLayout_S_Pane(); JPanel advancePane = FRGUIPaneFactory.createBorderLayout_S_Pane();
// checkbox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Provide", "Choose_All"}));
checkbox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Provide_Choose_All")); checkbox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Provide_Choose_All"));
checkbox.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0)); checkbox.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
buttonGroupDictPane = new ButtonGroupDictPane(); buttonGroupDictPane = new ButtonGroupDictPane();

1
designer-realize/src/main/java/com/fr/design/widget/ui/ParameterTreeComboBox.java
Unescape View File

@ -171,7 +171,6 @@ public class ParameterTreeComboBox extends FRTreeComboBox {
} }
} }
if (!ArrayUtils.isEmpty(parameters)) { if (!ArrayUtils.isEmpty(parameters)) {
// groupList.add(new ParameterGroup(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Server", "Datasource-Datasource", "Parameter"}), parameters));
groupList.add(new ParameterGroup(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Server_Datasource_Parameter"), parameters)); groupList.add(new ParameterGroup(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Server_Datasource_Parameter"), parameters));
} }
return groupList.toArray(new ParameterGroup[0]); return groupList.toArray(new ParameterGroup[0]);

1
designer-realize/src/main/java/com/fr/design/widget/ui/btn/DefineAppendColumnRowPane.java
Unescape View File

@ -47,7 +47,6 @@ public class DefineAppendColumnRowPane extends BasicPane {
UILabel label = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Append_Delete_Row_Message")); UILabel label = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Append_Delete_Row_Message"));
label.setForeground(new Color(0x8F8F92)); label.setForeground(new Color(0x8F8F92));
lpane.add(label); lpane.add(label);
// Component[][] components = { { new UILabel(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Specify", "Cell"})), crEditor }, { rowCountLable, jNumberEditor } ,{lpane,null}};
Component[][] components = { { new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Specify_Cell")), crEditor }, { rowCountLable, jNumberEditor } ,{lpane,null}}; Component[][] components = { { new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Specify_Cell")), crEditor }, { rowCountLable, jNumberEditor } ,{lpane,null}};
JPanel contentPane = TableLayoutHelper.createGapTableLayoutPane(components, TableLayoutHelper.FILL_LASTCOLUMN, IntervalConstants.INTERVAL_L2, IntervalConstants.INTERVAL_L1); JPanel contentPane = TableLayoutHelper.createGapTableLayoutPane(components, TableLayoutHelper.FILL_LASTCOLUMN, IntervalConstants.INTERVAL_L2, IntervalConstants.INTERVAL_L1);
contentPane.setBorder(BorderFactory.createEmptyBorder(10, 0, 0, 0)); contentPane.setBorder(BorderFactory.createEmptyBorder(10, 0, 0, 0));

1
designer-realize/src/main/java/com/fr/design/widget/ui/btn/DefineDeleteColumnRowPane.java
Unescape View File

@ -38,7 +38,6 @@ public class DefineDeleteColumnRowPane extends BasicPane {
UILabel messageLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Append_Delete_Row_Message")); UILabel messageLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Append_Delete_Row_Message"));
messageLabel.setForeground(new Color(0x8F8F92)); messageLabel.setForeground(new Color(0x8F8F92));
Component[][] components = { Component[][] components = {
// { new UILabel(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Specify", "Cell"})), crEditor },
{ new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Specify_Cell")), crEditor }, { new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Specify_Cell")), crEditor },
{ messageLabel, null}}; { messageLabel, null}};
JPanel contentPane = TableLayoutHelper.createGapTableLayoutPane(components, TableLayoutHelper.FILL_LASTCOLUMN, IntervalConstants.INTERVAL_L2, IntervalConstants.INTERVAL_L1); JPanel contentPane = TableLayoutHelper.createGapTableLayoutPane(components, TableLayoutHelper.FILL_LASTCOLUMN, IntervalConstants.INTERVAL_L2, IntervalConstants.INTERVAL_L1);

2
designer-realize/src/main/java/com/fr/design/write/submit/SmartInsertDBManipulationPane.java
Unescape View File

@ -82,12 +82,10 @@ public class SmartInsertDBManipulationPane extends DBManipulationPane {
@Override @Override
public NameableCreator[] createNameableCreators() { public NameableCreator[] createNameableCreators() {
return new NameableCreator[]{ return new NameableCreator[]{
// new NameObjectCreator(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Submit", "Event"}),
new NameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Submit_Event"), new NameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Submit_Event"),
"/com/fr/web/images/reportlet.png", "/com/fr/web/images/reportlet.png",
DMLConfigJob.class, DMLConfigJob.class,
SmartInsertDMLJobPane.class), SmartInsertDMLJobPane.class),
// new NameObjectCreator(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Custom", "Event"}),
new NameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Custom_Event"), new NameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Custom_Event"),
"/com/fr/web/images/reportlet.png", "/com/fr/web/images/reportlet.png",
ClassSubmitJob.class, ClassSubmitJob.class,

2
designer-realize/src/main/java/com/fr/grid/selection/FloatSelection.java
Unescape View File

@ -78,7 +78,6 @@ public class FloatSelection extends Selection {
@Override @Override
public boolean pasteCellElementsClip(CellElementsClip ceClip, ElementCasePane ePane) { public boolean pasteCellElementsClip(CellElementsClip ceClip, ElementCasePane ePane) {
Toolkit.getDefaultToolkit().beep(); Toolkit.getDefaultToolkit().beep();
// DesignUtils.errorMessage(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Only_selected_cell_can_paste_only", "M_Insert-Cell"}));
DesignUtils.errorMessage(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Paste_Cell_Tips")); DesignUtils.errorMessage(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Paste_Cell_Tips"));
return false; return false;
@ -87,7 +86,6 @@ public class FloatSelection extends Selection {
@Override @Override
public boolean pasteString(String str, ElementCasePane ePane) { public boolean pasteString(String str, ElementCasePane ePane) {
Toolkit.getDefaultToolkit().beep(); Toolkit.getDefaultToolkit().beep();
// DesignUtils.errorMessage(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Only_selected_cell_can_paste_only", "Character"}));
DesignUtils.errorMessage(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Paste_Character_Tips")); DesignUtils.errorMessage(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Paste_Character_Tips"));
// return pasteOtherType(str, ePane); // return pasteOtherType(str, ePane);
return false; return false;

Write Preview
Loading…
Cancel
Save