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

com.fr.base.i18n.BidiUtils.concatenateStrings方法名改一下，加注释

persist/11.0-arabic
obo 6 months ago
parent
2f564fbd7c
commit
8435520445
24 changed files with 41 additions and 49 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. 8
      designer-base/src/main/java/com/fr/base/i18n/BidiUtils.java
  2. 1
      designer-base/src/main/java/com/fr/design/actions/server/FunctionManagerAction.java
  3. 1
      designer-base/src/main/java/com/fr/design/condition/ObjectLiteConditionPane.java
  4. 12
      designer-base/src/main/java/com/fr/design/data/datapane/TreeTableDataDictPane.java
  5. 2
      designer-base/src/main/java/com/fr/design/data/datapane/connect/JDBCDefPane.java
  6. 2
      designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/MultiTDTableDataPane.java
  7. 4
      designer-base/src/main/java/com/fr/design/file/MultiTemplateTabMenuFactory.java
  8. 1
      designer-base/src/main/java/com/fr/design/file/MultiTemplateTabPane.java
  9. 2
      designer-base/src/main/java/com/fr/design/hyperlink/WebHyperNorthPane.java
  10. 4
      designer-base/src/main/java/com/fr/design/menu/MenuKeySet.java
  11. 2
      designer-chart/src/main/java/com/fr/design/module/ChartPreFillStylePane.java
  12. 2
      designer-realize/src/main/java/com/fr/design/cell/editor/BiasTextPainterCellEditor.java
  13. 4
      designer-realize/src/main/java/com/fr/design/dscolumn/DSColumnAdvancedPane.java
  14. 4
      designer-realize/src/main/java/com/fr/design/expand/ConditionParentPane.java
  15. 4
      designer-realize/src/main/java/com/fr/design/javascript/ListenerEditPane.java
  16. 7
      designer-realize/src/main/java/com/fr/design/report/PageSetupPane.java
  17. 4
      designer-realize/src/main/java/com/fr/design/report/ReportColumnsPane.java
  18. 4
      designer-realize/src/main/java/com/fr/design/webattr/EditToolBar.java
  19. 6
      designer-realize/src/main/java/com/fr/design/webattr/ServerPrinterPane.java
  20. 3
      designer-realize/src/main/java/com/fr/design/webattr/ToolBarDragPane.java
  21. 5
      designer-realize/src/main/java/com/fr/design/webattr/WebJsPane.java
  22. 2
      designer-realize/src/main/java/com/fr/design/webattr/WriteToolBarPane.java
  23. 4
      designer-realize/src/main/java/com/fr/design/webattr/printsettings/GlobalNativePrintSettingPane.java
  24. 2
      designer-realize/src/main/java/com/fr/design/widget/ValueWidgetPane.java

8
designer-base/src/main/java/com/fr/base/i18n/BidiUtils.java
Unescape View File

@ -19,8 +19,6 @@ public class BidiUtils {
private static final Locale LOCALE = DesignerEnvManager.getEnvManager().getLanguage(); private static final Locale LOCALE = DesignerEnvManager.getEnvManager().getLanguage();
private BidiUtils() { private BidiUtils() {
} }
@ -53,7 +51,11 @@ public class BidiUtils {
public static boolean rtl() { public static boolean rtl() {
return ComponentOrientation.getOrientation(LOCALE) == ComponentOrientation.RIGHT_TO_LEFT; return ComponentOrientation.getOrientation(LOCALE) == ComponentOrientation.RIGHT_TO_LEFT;
} }
public static String reverseConcatenateStrings(String... strs) {
/**
* 拼接字符数组，有的组件名是多段字符串拼接起来的，如果是rtl的话需要反向拼接
*/
public static String concatenateStrings(String... strs) {
StringBuilder result = new StringBuilder(); StringBuilder result = new StringBuilder();
if (rtl()) { if (rtl()) {

1
designer-base/src/main/java/com/fr/design/actions/server/FunctionManagerAction.java
Unescape View File

@ -4,7 +4,6 @@
package com.fr.design.actions.server; package com.fr.design.actions.server;
import com.fr.base.i18n.BidiUtils;
import com.fr.base.svg.IconUtils; import com.fr.base.svg.IconUtils;
import com.fr.config.Configuration; import com.fr.config.Configuration;
import com.fr.design.actions.UpdateAction; import com.fr.design.actions.UpdateAction;

1
designer-base/src/main/java/com/fr/design/condition/ObjectLiteConditionPane.java
Unescape View File

@ -4,7 +4,6 @@ import java.awt.BorderLayout;
import java.awt.Component; import java.awt.Component;
import javax.swing.DefaultComboBoxModel; import javax.swing.DefaultComboBoxModel;
import com.fr.design.gui.ilable.UILabel; import com.fr.design.gui.ilable.UILabel;
import javax.swing.JList; import javax.swing.JList;
import javax.swing.JPanel; import javax.swing.JPanel;

12
designer-base/src/main/java/com/fr/design/data/datapane/TreeTableDataDictPane.java
Unescape View File

@ -57,7 +57,7 @@ public class TreeTableDataDictPane extends BasicPane implements Previewable {
public TreeTableDataDictPane(String treeName) { public TreeTableDataDictPane(String treeName) {
this.setLayout(new BorderLayout(5, 30)); this.setLayout(new BorderLayout(5, 30));
this.setBorder(BorderFactory.createEmptyBorder(20, 20, 0, 0)); this.setBorder(BorderFactory.createEmptyBorder(20, 20, 0, 0));
selectTableDataLabel = new UILabel(BidiUtils.reverseConcatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_TableData_Select_One"), " :")); selectTableDataLabel = new UILabel(BidiUtils.concatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_TableData_Select_One"), " :"));
setTableDataNameComboBox(treeName); setTableDataNameComboBox(treeName);
tableDataNameComboBox.setPreferredSize(new Dimension(180, 20)); tableDataNameComboBox.setPreferredSize(new Dimension(180, 20));
JPanel tableFlowPane = FRGUIPaneFactory.createBoxFlowInnerContainer_S_Pane(); JPanel tableFlowPane = FRGUIPaneFactory.createBoxFlowInnerContainer_S_Pane();
@ -96,11 +96,11 @@ public class TreeTableDataDictPane extends BasicPane implements Previewable {
markButtonGroup.add(parentMarkRadio); markButtonGroup.add(parentMarkRadio);
markButtonGroup.add(lengthMarkRadio); markButtonGroup.add(lengthMarkRadio);
originFieldDependsOnParentLabel = new UILabel(BidiUtils.reverseConcatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Original_Marked_Filed"), " :"), SwingConstants.TRAILING); originFieldDependsOnParentLabel = new UILabel(BidiUtils.concatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Original_Marked_Filed"), " :"), SwingConstants.TRAILING);
parentFieldLabel = new UILabel(BidiUtils.reverseConcatenateStrings(" ", com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Parent_Marked_Field"), " :"), SwingConstants.TRAILING); parentFieldLabel = new UILabel(BidiUtils.concatenateStrings(" ", com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Parent_Marked_Field"), " :"), SwingConstants.TRAILING);
treeDataFieldLabel1 = new UILabel(BidiUtils.reverseConcatenateStrings(" ", com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tree_Data_Field"), " :"), SwingConstants.TRAILING); treeDataFieldLabel1 = new UILabel(BidiUtils.concatenateStrings(" ", com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tree_Data_Field"), " :"), SwingConstants.TRAILING);
originFieldDependsOnLengthLabel = new UILabel(BidiUtils.reverseConcatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Original_Marked_Filed"), " :"), SwingConstants.TRAILING); originFieldDependsOnLengthLabel = new UILabel(BidiUtils.concatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Original_Marked_Filed"), " :"), SwingConstants.TRAILING);
treeDataFieldLabel2 = new UILabel(BidiUtils.reverseConcatenateStrings(" ", com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tree_Data_Field"), " :"), SwingConstants.TRAILING); treeDataFieldLabel2 = new UILabel(BidiUtils.concatenateStrings(" ", com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tree_Data_Field"), " :"), SwingConstants.TRAILING);
// originFieldDependsOnParentPane = ValueEditorPaneFactory.createValueEditorPane(new Editor[] {new OldColumnIndexEditor(com.fr.design.i18n.Toolkit.i18nText("Columns"))}); // originFieldDependsOnParentPane = ValueEditorPaneFactory.createValueEditorPane(new Editor[] {new OldColumnIndexEditor(com.fr.design.i18n.Toolkit.i18nText("Columns"))});
// parentFieldPane = ValueEditorPaneFactory.createValueEditorPane(new Editor[] {new OldColumnIndexEditor(com.fr.design.i18n.Toolkit.i18nText("Columns"))}); // parentFieldPane = ValueEditorPaneFactory.createValueEditorPane(new Editor[] {new OldColumnIndexEditor(com.fr.design.i18n.Toolkit.i18nText("Columns"))});

2
designer-base/src/main/java/com/fr/design/data/datapane/connect/JDBCDefPane.java
Unescape View File

@ -163,7 +163,7 @@ public class JDBCDefPane extends JPanel {
public JDBCDefPane() { public JDBCDefPane() {
initMap(); initMap();
this.setBorder(UITitledBorder.createBorderWithTitle(BidiUtils.reverseConcatenateStrings("JDBC", ":"))); this.setBorder(UITitledBorder.createBorderWithTitle(BidiUtils.concatenateStrings("JDBC", ":")));
this.setLayout(FRGUIPaneFactory.createLabelFlowLayout()); this.setLayout(FRGUIPaneFactory.createLabelFlowLayout());
JPanel innerthis = FRGUIPaneFactory.createY_AXISBoxInnerContainer_L_Pane(); JPanel innerthis = FRGUIPaneFactory.createY_AXISBoxInnerContainer_L_Pane();
innerthis.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0)); innerthis.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));

2
designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/MultiTDTableDataPane.java
Unescape View File

@ -313,7 +313,7 @@ public class MultiTDTableDataPane extends AbstractTableDataPane<MultiTDTableData
formulaButton.setEnabled(false); formulaButton.setEnabled(false);
formulaButton.setPreferredSize(new Dimension(25, 23)); formulaButton.setPreferredSize(new Dimension(25, 23));
formulaButton.addActionListener(getFormulaActionListener()); formulaButton.addActionListener(getFormulaActionListener());
rightPanel.add(new UILabel(BidiUtils.reverseConcatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Conditions_Formula"), " ="))); rightPanel.add(new UILabel(BidiUtils.concatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Conditions_Formula"), " =")));
rightPanel.add(formulaContentTextField); rightPanel.add(formulaContentTextField);
rightPanel.add(formulaButton); rightPanel.add(formulaButton);

4
designer-base/src/main/java/com/fr/design/file/MultiTemplateTabMenuFactory.java
Unescape View File

@ -1,6 +1,5 @@
package com.fr.design.file; package com.fr.design.file;
import com.fr.base.i18n.BidiUtils;
import com.fr.base.svg.IconUtils; import com.fr.base.svg.IconUtils;
import com.fr.design.constants.UIConstants; import com.fr.design.constants.UIConstants;
import com.fr.design.gui.ibutton.UIButton; import com.fr.design.gui.ibutton.UIButton;
@ -18,14 +17,11 @@ import javax.swing.JPanel;
import javax.swing.SwingConstants; import javax.swing.SwingConstants;
import java.awt.BorderLayout; import java.awt.BorderLayout;
import java.awt.Component; import java.awt.Component;
import java.awt.ComponentOrientation;
import java.awt.Container;
import java.awt.Dimension; import java.awt.Dimension;
import java.awt.event.ActionEvent; import java.awt.event.ActionEvent;
import java.awt.event.ActionListener; import java.awt.event.ActionListener;
import java.awt.event.MouseAdapter; import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent; import java.awt.event.MouseEvent;
import java.text.Bidi;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;

1
designer-base/src/main/java/com/fr/design/file/MultiTemplateTabPane.java
Unescape View File

@ -68,7 +68,6 @@ import java.awt.geom.GeneralPath;
import java.awt.geom.Line2D; import java.awt.geom.Line2D;
import java.awt.geom.Path2D; import java.awt.geom.Path2D;
import java.awt.geom.RoundRectangle2D; import java.awt.geom.RoundRectangle2D;
import java.text.Bidi;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.stream.Collectors; import java.util.stream.Collectors;

2
designer-base/src/main/java/com/fr/design/hyperlink/WebHyperNorthPane.java
Unescape View File

@ -51,7 +51,7 @@ public class WebHyperNorthPane extends AbstractHyperNorthPane<WebHyperlink> {
urlTextField = new UITextField(headerPane.getWidth()); urlTextField = new UITextField(headerPane.getWidth());
urlTextField.setText(ProductConstants.WEBSITE_URL); urlTextField.setText(ProductConstants.WEBSITE_URL);
JPanel urlWithHelp = GUICoreUtils.createNamedPane(urlTextField, BidiUtils.reverseConcatenateStrings("URL", ":")); JPanel urlWithHelp = GUICoreUtils.createNamedPane(urlTextField, BidiUtils.concatenateStrings("URL", ":"));
if (this.needRenamePane) { if (this.needRenamePane) {
headerPane.setLayout(new BorderLayout(LayoutConstants.VGAP_LARGE, LayoutConstants.VGAP_SMALL)); headerPane.setLayout(new BorderLayout(LayoutConstants.VGAP_LARGE, LayoutConstants.VGAP_SMALL));

4
designer-base/src/main/java/com/fr/design/menu/MenuKeySet.java
Unescape View File

@ -29,11 +29,11 @@ public abstract class MenuKeySet {
public abstract String getMenuName(); public abstract String getMenuName();
public String getMenuKeySetName(){ public String getMenuKeySetName(){
return BidiUtils.reverseConcatenateStrings(getMenuName()+ "(" +getMnemonic() + ")"); return BidiUtils.concatenateStrings(getMenuName()+ "(" +getMnemonic() + ")");
} }
public String getMenuKeySetNameWithDot(){ public String getMenuKeySetNameWithDot(){
return BidiUtils.reverseConcatenateStrings(getMenuKeySetName() + "..."); return BidiUtils.concatenateStrings(getMenuKeySetName() + "...");
} }
public abstract KeyStroke getKeyStroke(); public abstract KeyStroke getKeyStroke();

2
designer-chart/src/main/java/com/fr/design/module/ChartPreFillStylePane.java
Unescape View File

@ -74,7 +74,7 @@ public class ChartPreFillStylePane extends BasicBeanPane<ChartColorMatching> {
double[] columnSize = {p, p}; double[] columnSize = {p, p};
double[] rowSize = {p, p, p}; double[] rowSize = {p, p, p};
Component[][] components = new Component[][]{ Component[][] components = new Component[][]{
new Component[]{new UILabel(BidiUtils.reverseConcatenateStrings(" ", com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Color_Match"))), null}, new Component[]{new UILabel(BidiUtils.concatenateStrings(" ", com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Color_Match"))), null},
new Component[]{null, customPane}, new Component[]{null, customPane},
}; };

2
designer-realize/src/main/java/com/fr/design/cell/editor/BiasTextPainterCellEditor.java
Unescape View File

@ -123,7 +123,7 @@ public class BiasTextPainterCellEditor extends AbstractCellEditor {
centerPane.setBorder(BorderFactory.createEmptyBorder(20, 0, 0, 0)); centerPane.setBorder(BorderFactory.createEmptyBorder(20, 0, 0, 0));
centerPane.add(textPane, BorderLayout.CENTER); centerPane.add(textPane, BorderLayout.CENTER);
UILabel formulaLabel = new UILabel(BidiUtils.reverseConcatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Slope_Line_Tip"), "'|'", "Season|Product")); UILabel formulaLabel = new UILabel(BidiUtils.concatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Slope_Line_Tip"), "'|'", "Season|Product"));
textPane.add(formulaLabel, BorderLayout.NORTH); textPane.add(formulaLabel, BorderLayout.NORTH);
formulaLabel.setBorder(BorderFactory.createEmptyBorder(2, 2, 2, 0)); formulaLabel.setBorder(BorderFactory.createEmptyBorder(2, 2, 2, 0));

4
designer-realize/src/main/java/com/fr/design/dscolumn/DSColumnAdvancedPane.java
Unescape View File

@ -405,7 +405,7 @@ public class DSColumnAdvancedPane extends BasicPane {
UIButton bottomFrmulaButton = new UIButton("..."); UIButton bottomFrmulaButton = new UIButton("...");
this.add(bottomFrmulaButton); this.add(bottomFrmulaButton);
bottomFrmulaButton.setToolTipText(BidiUtils.reverseConcatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Formula"), "...")); bottomFrmulaButton.setToolTipText(BidiUtils.concatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Formula"), "..."));
bottomFrmulaButton.setPreferredSize(new Dimension(25, formulaTextField.getPreferredSize().height)); bottomFrmulaButton.setPreferredSize(new Dimension(25, formulaTextField.getPreferredSize().height));
bottomFrmulaButton.addActionListener(formulaButtonActionListener); bottomFrmulaButton.addActionListener(formulaButtonActionListener);
} }
@ -468,7 +468,7 @@ public class DSColumnAdvancedPane extends BasicPane {
public ValuePane() { public ValuePane() {
this.setLayout(FRGUIPaneFactory.createBoxFlowLayout()); this.setLayout(FRGUIPaneFactory.createBoxFlowLayout());
this.add(new UILabel(BidiUtils.reverseConcatenateStrings(InsetText, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Value"), ":"))); this.add(new UILabel(BidiUtils.concatenateStrings(InsetText, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Value"), ":")));
this.add(Box.createHorizontalStrut(2)); this.add(Box.createHorizontalStrut(2));
this.add((formulaField = new JFormulaField("$$$"))); this.add((formulaField = new JFormulaField("$$$")));
} }

4
designer-realize/src/main/java/com/fr/design/expand/ConditionParentPane.java
Unescape View File

@ -39,12 +39,12 @@ public class ConditionParentPane extends JPanel {
innerthis.add(eastPane); innerthis.add(eastPane);
eastPane.add(GUICoreUtils.createFlowPane(new JComponent[] { eastPane.add(GUICoreUtils.createFlowPane(new JComponent[] {
new UILabel(BidiUtils.reverseConcatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Left_Parent"), ": ")), new UILabel(BidiUtils.concatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Left_Parent"), ": ")),
leftParentPane = new ParentPane(ParentPane.LEFT, listener) }, FlowLayout.LEADING)); leftParentPane = new ParentPane(ParentPane.LEFT, listener) }, FlowLayout.LEADING));
eastPane.add(GUICoreUtils.createFlowPane( eastPane.add(GUICoreUtils.createFlowPane(
new JComponent[] { new JComponent[] {
new UILabel(BidiUtils.reverseConcatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Up_Parent"), ": ")), new UILabel(BidiUtils.concatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Up_Parent"), ": ")),
upParentPane = new ParentPane(ParentPane.UP, listener) }, FlowLayout.LEADING)); upParentPane = new ParentPane(ParentPane.UP, listener) }, FlowLayout.LEADING));
} }
public void putElementcase(ElementCasePane t){ public void putElementcase(ElementCasePane t){

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

@ -80,9 +80,9 @@ public class ListenerEditPane extends BasicBeanPane<Listener> {
styleBox = new UIComboBox(style.toArray()); styleBox = new UIComboBox(style.toArray());
namePane.add(styleBox); namePane.add(styleBox);
namePane = GUICoreUtils.createFlowPane(new Component[]{ namePane = GUICoreUtils.createFlowPane(new Component[]{
new UILabel(BidiUtils.reverseConcatenateStrings(" ", Toolkit.i18nText("Fine-Design_Report_Event_Name"), ":")), new UILabel(BidiUtils.concatenateStrings(" ", Toolkit.i18nText("Fine-Design_Report_Event_Name"), ":")),
nameText, nameText,
new UILabel(BidiUtils.reverseConcatenateStrings(" ", Toolkit.i18nText("Fine-Design_Report_Event_Type"), ":")), new UILabel(BidiUtils.concatenateStrings(" ", Toolkit.i18nText("Fine-Design_Report_Event_Type"), ":")),
styleBox}, styleBox},
FlowLayout.LEADING); FlowLayout.LEADING);
namePane.setBorder(BidiUtils.applyTitledBorderJustification(BorderFactory.createTitledBorder(Toolkit.i18nText("Fine-Design_Report_Event_Name_Type")))); namePane.setBorder(BidiUtils.applyTitledBorderJustification(BorderFactory.createTitledBorder(Toolkit.i18nText("Fine-Design_Report_Event_Name_Type"))));

7
designer-realize/src/main/java/com/fr/design/report/PageSetupPane.java
Unescape View File

@ -22,7 +22,6 @@ import java.awt.event.ItemListener;
import javax.swing.*; import javax.swing.*;
import com.fr.base.i18n.BidiUtils; import com.fr.base.i18n.BidiUtils;
import com.fr.design.gui.ispinner.ColumnRowSpinner;
import com.fr.page.PaperSettingProvider; import com.fr.page.PaperSettingProvider;
import com.fr.page.ReportSettingsProvider; import com.fr.page.ReportSettingsProvider;
import com.fr.design.gui.frpane.UITabbedPane; import com.fr.design.gui.frpane.UITabbedPane;
@ -195,12 +194,12 @@ public class PageSetupPane extends BasicPane {
defaultPane.add(paperSizePane); defaultPane.add(paperSizePane);
predefinedRadioButton = new UIRadioButton(BidiUtils.reverseConcatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_PageSetup_Predefined"), ":")); predefinedRadioButton = new UIRadioButton(BidiUtils.concatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_PageSetup_Predefined"), ":"));
predefinedRadioButton.setMnemonic('P'); predefinedRadioButton.setMnemonic('P');
predefinedRadioButton.addActionListener(previewListener); predefinedRadioButton.addActionListener(previewListener);
customRadioButton = new UIRadioButton(BidiUtils.reverseConcatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Custom"), ":")); customRadioButton = new UIRadioButton(BidiUtils.concatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Custom"), ":"));
customRadioButton.setMnemonic('C'); customRadioButton.setMnemonic('C');
customRadioButton.addActionListener(previewListener); customRadioButton.addActionListener(previewListener);
@ -930,7 +929,7 @@ public class PageSetupPane extends BasicPane {
JPanel firstPaneNumberPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane(); JPanel firstPaneNumberPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane();
defaultPane.add(firstPaneNumberPane); defaultPane.add(firstPaneNumberPane);
firstPaneNumberPane.add(new UILabel(BidiUtils.reverseConcatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_PageSetup_First_Page_Number"), ": "))); firstPaneNumberPane.add(new UILabel(BidiUtils.concatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_PageSetup_First_Page_Number"), ": ")));
// marks: 这个地方必须为大于零的整数 // marks: 这个地方必须为大于零的整数
firstPageNumberSpinner = new UISpinner(1, Integer.MAX_VALUE, 1, 1); firstPageNumberSpinner = new UISpinner(1, Integer.MAX_VALUE, 1, 1);
firstPaneNumberPane.add(firstPageNumberSpinner); firstPaneNumberPane.add(firstPageNumberSpinner);

4
designer-realize/src/main/java/com/fr/design/report/ReportColumnsPane.java
Unescape View File

@ -315,14 +315,14 @@ public class ReportColumnsPane extends BasicPane{
repeatColDataTextField = new UITextField(); repeatColDataTextField = new UITextField();
repeatColDataTextField.setPreferredSize(new Dimension(107,24)); repeatColDataTextField.setPreferredSize(new Dimension(107,24));
rowPane.add(repeatColDataTextField); rowPane.add(repeatColDataTextField);
rowPane.add(new UILabel(BidiUtils.reverseConcatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Base_Format") + ": A2:D5 "))); rowPane.add(new UILabel(BidiUtils.concatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Base_Format") + ": A2:D5 ")));
copyLabel = new UILabel(REPORT_COLUMN_RAPEAT[rowOrColumn] + ":"); copyLabel = new UILabel(REPORT_COLUMN_RAPEAT[rowOrColumn] + ":");
rowPane.add(copyLabel); rowPane.add(copyLabel);
copyTitleTextField = new UITextField(); copyTitleTextField = new UITextField();
copyTitleTextField.setPreferredSize(new Dimension(107,24)); copyTitleTextField.setPreferredSize(new Dimension(107,24));
rowPane.add(copyTitleTextField); rowPane.add(copyTitleTextField);
rowPane.add(new UILabel(BidiUtils.reverseConcatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Base_Format") + ": 1,2-3,5,18"))); rowPane.add(new UILabel(BidiUtils.concatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Base_Format") + ": 1,2-3,5,18")));
return BidiUtils.applyOrientationByLocale(rowPane); return BidiUtils.applyOrientationByLocale(rowPane);

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

@ -420,7 +420,7 @@ 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.i18nText("Fine-Design_Report_Widget_Printer_Alias") + ":"), nameField}, {new UILabel(BidiUtils.reverseConcatenateStrings(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(BidiUtils.concatenateStrings(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);
@ -454,7 +454,7 @@ public class EditToolBar extends BasicPane {
button = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_User_Defined_Event")); button = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_User_Defined_Event"));
customPane.add(button); customPane.add(button);
customPane.setBorder(GUICoreUtils.createTitledBorder(BidiUtils.reverseConcatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Edit"), "JS"), null)); customPane.setBorder(GUICoreUtils.createTitledBorder(BidiUtils.concatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Edit"), "JS"), null));
button.addActionListener(l); button.addActionListener(l);
return customPane; return customPane;
} }

6
designer-realize/src/main/java/com/fr/design/webattr/ServerPrinterPane.java
Unescape View File

@ -142,7 +142,7 @@ public class ServerPrinterPane extends BasicPane {
} }
} }
}); });
printerDialog.setTitle(BidiUtils.reverseConcatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_ReportServerP_Add_Printer"), "...")); printerDialog.setTitle(BidiUtils.concatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_ReportServerP_Add_Printer"), "..."));
BidiUtils.applyOrientationByLocale(printerDialog); BidiUtils.applyOrientationByLocale(printerDialog);
printerDialog.setVisible(true); printerDialog.setVisible(true);
} }
@ -264,7 +264,7 @@ public class ServerPrinterPane extends BasicPane {
} }
}); });
printersPane.populate(printerList.getSelectedValue().toString()); printersPane.populate(printerList.getSelectedValue().toString());
printerDialog.setTitle(BidiUtils.reverseConcatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_ReportServerP_Edit_Printer"), "...")); printerDialog.setTitle(BidiUtils.concatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_ReportServerP_Edit_Printer"), "..."));
BidiUtils.applyOrientationByLocale(printerDialog); BidiUtils.applyOrientationByLocale(printerDialog);
printerDialog.setVisible(true); printerDialog.setVisible(true);
} }
@ -347,7 +347,7 @@ public class ServerPrinterPane extends BasicPane {
public void checkValid() throws Exception { public void checkValid() throws Exception {
String printerName = printerCombo.getSelectedItem().toString(); String printerName = printerCombo.getSelectedItem().toString();
if (StringUtils.isBlank(printerName)) { if (StringUtils.isBlank(printerName)) {
throw new Exception(BidiUtils.reverseConcatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_ReportServerP_The_Name_Of_Printer_Cannot_Be_Null"), ".")); throw new Exception(BidiUtils.concatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_ReportServerP_The_Name_Of_Printer_Cannot_Be_Null"), "."));
} }
} }

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

@ -27,7 +27,6 @@ import javax.swing.SwingUtilities;
import javax.swing.table.DefaultTableCellRenderer; import javax.swing.table.DefaultTableCellRenderer;
import javax.swing.table.DefaultTableModel; import javax.swing.table.DefaultTableModel;
import javax.swing.table.TableColumnModel; import javax.swing.table.TableColumnModel;
import javax.swing.table.TableModel;
import java.awt.BorderLayout; import java.awt.BorderLayout;
import java.awt.Color; import java.awt.Color;
import java.awt.Component; import java.awt.Component;
@ -51,7 +50,7 @@ public class ToolBarDragPane extends WidgetToolBarPane {
private int row = 7; private int row = 7;
private DefaultTableModel toolbarButtonTableModel; private DefaultTableModel toolbarButtonTableModel;
private JTable layoutTable; private JTable layoutTable;
private UICheckBox isUseToolBarCheckBox = new UICheckBox(BidiUtils.reverseConcatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Use_ToolBar"), ":")); // 是否使用工具栏 private UICheckBox isUseToolBarCheckBox = new UICheckBox(BidiUtils.concatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Use_ToolBar"), ":")); // 是否使用工具栏
private boolean isEnabled; private boolean isEnabled;
public ToolBarDragPane() { public ToolBarDragPane() {

5
designer-realize/src/main/java/com/fr/design/webattr/WebJsPane.java
Unescape View File

@ -27,7 +27,6 @@ import javax.swing.JPanel;
import javax.swing.SwingUtilities; import javax.swing.SwingUtilities;
import java.awt.BorderLayout; import java.awt.BorderLayout;
import java.awt.Color; import java.awt.Color;
import java.awt.Dimension;
import java.awt.FlowLayout; import java.awt.FlowLayout;
import java.awt.event.ActionEvent; import java.awt.event.ActionEvent;
import java.awt.event.ActionListener; import java.awt.event.ActionListener;
@ -56,8 +55,8 @@ public class WebJsPane extends BasicPane {
this.setLayout(new BorderLayout(0, 20)); this.setLayout(new BorderLayout(0, 20));
this.setBorder(BorderFactory.createEmptyBorder(10, 5, 0, 0)); this.setBorder(BorderFactory.createEmptyBorder(10, 5, 0, 0));
localFileRadioButton = new UIRadioButton(BidiUtils.reverseConcatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Disk_File"), ":"), true); localFileRadioButton = new UIRadioButton(BidiUtils.concatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Disk_File"), ":"), true);
urlFileRadioButton = new UIRadioButton(BidiUtils.reverseConcatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Url_Location"), ":"), false); urlFileRadioButton = new UIRadioButton(BidiUtils.concatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Url_Location"), ":"), false);
ButtonGroup bg = new ButtonGroup(); ButtonGroup bg = new ButtonGroup();
bg.add(localFileRadioButton); bg.add(localFileRadioButton);
bg.add(urlFileRadioButton); bg.add(urlFileRadioButton);

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

@ -75,7 +75,7 @@ public class WriteToolBarPane extends AbstractEditToolBarPane {
rptButtonGroup.add(centerRadioButton); rptButtonGroup.add(centerRadioButton);
northPane.add(GUICoreUtils.createFlowPane(new Component[]{rptShowLocationLabel, centerRadioButton, leftRadioButton}, BidiUtils.rtl() ? FlowLayout.RIGHT : FlowLayout.LEFT)); northPane.add(GUICoreUtils.createFlowPane(new Component[]{rptShowLocationLabel, centerRadioButton, leftRadioButton}, BidiUtils.rtl() ? FlowLayout.RIGHT : FlowLayout.LEFT));
colorBox = new UICheckBox(BidiUtils.reverseConcatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Set_Face_Write_Current_Edit_Row_Background"), ":")); colorBox = new UICheckBox(BidiUtils.concatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Set_Face_Write_Current_Edit_Row_Background"), ":"));
colorBox.setSelected(false); colorBox.setSelected(false);
colorBox.addActionListener(colorListener); colorBox.addActionListener(colorListener);
colorButton = new UINoThemeColorButton(BaseUtils.readIcon("/com/fr/design/images/gui/color/background.png")); colorButton = new UINoThemeColorButton(BaseUtils.readIcon("/com/fr/design/images/gui/color/background.png"));

4
designer-realize/src/main/java/com/fr/design/webattr/printsettings/GlobalNativePrintSettingPane.java
Unescape View File

@ -68,11 +68,11 @@ public class GlobalNativePrintSettingPane extends AbstractNativePrintSettingPane
defaultDownloadUrlCheck = GUICoreUtils.createNoBorderCheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Default")); defaultDownloadUrlCheck = GUICoreUtils.createNoBorderCheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Default"));
JPanel downloadUrlSettingCheckPane = GUICoreUtils.createCheckboxAndDynamicPane(defaultDownloadUrlCheck, getCustomUrlSettingPane(), true); JPanel downloadUrlSettingCheckPane = GUICoreUtils.createCheckboxAndDynamicPane(defaultDownloadUrlCheck, getCustomUrlSettingPane(), true);
downloadUrlSettingCheckPane.setBorder(BorderFactory.createEmptyBorder(0, 5, 0, 0)); downloadUrlSettingCheckPane.setBorder(BorderFactory.createEmptyBorder(0, 5, 0, 0));
JPanel downloadTipPane = getTopAlignLabelPane(BidiUtils.reverseConcatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Software_Download_Url"), ": ")); JPanel downloadTipPane = getTopAlignLabelPane(BidiUtils.concatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Software_Download_Url"), ": "));
downloadTipPane.setBorder(BorderFactory.createEmptyBorder(0, 0, -6, 0)); downloadTipPane.setBorder(BorderFactory.createEmptyBorder(0, 0, -6, 0));
// 打印软件端口号 // 打印软件端口号
UILabel printPortTip = new UILabel(BidiUtils.reverseConcatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Native_Print_Port"), ": ")); UILabel printPortTip = new UILabel(BidiUtils.concatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Native_Print_Port"), ": "));
JPanel printPortFiledPane = getPrintPortFieldPane(); JPanel printPortFiledPane = getPrintPortFieldPane();
// TableLayout // TableLayout

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

@ -28,7 +28,7 @@ public class ValueWidgetPane extends WidgetPane {
public JPanel initNorthPane(){ public JPanel initNorthPane(){
JPanel northPane = super.initNorthPane(); JPanel northPane = super.initNorthPane();
label = new UILabel(BidiUtils.reverseConcatenateStrings(" ", com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Widget_Value"), ":")); label = new UILabel(BidiUtils.concatenateStrings(" ", com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Widget_Value"), ":"));
label.setVisible(false); label.setVisible(false);
widgetValuePane = new JPanel(); widgetValuePane = new JPanel();
widgetValuePane.setLayout(FRGUIPaneFactory.createBorderLayout()); widgetValuePane.setLayout(FRGUIPaneFactory.createBorderLayout());

Write Preview
Loading…
Cancel
Save