From af3f81a3308a7440213858dac06b4aff50eb629f Mon Sep 17 00:00:00 2001 From: obo Date: Wed, 7 Aug 2024 16:01:34 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=9D=E5=AF=B9=E4=BD=8D=E7=BD=AE=E6=9B=BF?= =?UTF-8?q?=E6=8D=A2=E4=B8=BA=E7=9B=B8=E5=AF=B9=E4=BD=8D=E7=BD=AE=EF=BC=8C?= =?UTF-8?q?=E7=AC=AC=E4=B8=89=E6=89=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SeriesCondition/impl/ChartHyperPopAttrPane.java | 2 +- .../SeriesCondition/impl/ChartHyperPoplinkPane.java | 2 +- .../mainframe/chart/gui/ChartTypeButtonPane.java | 6 +++--- .../chart/gui/data/DatabaseTableDataPane.java | 2 +- .../chart/gui/data/NormalChartDataPane.java | 2 +- .../mainframe/chart/gui/data/TableDataPane.java | 2 +- .../data/table/CategoryPlotTableDataContentPane.java | 2 +- .../gui/data/table/SeriesTypeUseComboxPane.java | 2 +- .../gui/style/ChartTextAttrPaneWithThemeStyle.java | 2 +- .../fr/design/module/ChartEmptyDataStylePane.java | 8 ++++---- .../com/fr/design/module/ChartPreFillStylePane.java | 2 +- .../java/com/fr/design/module/ChartPreStylePane.java | 2 +- .../van/chart/designer/style/VanChartTitlePane.java | 4 ++-- .../com/fr/design/cell/editor/RichTextToolBar.java | 2 +- .../com/fr/design/dscolumn/DSColumnAdvancedPane.java | 8 ++++---- .../fr/design/dscolumn/DSColumnConditionsPane.java | 2 +- .../fr/design/dscolumn/ResultSetGroupPopUpPane.java | 6 +++--- .../com/fr/design/expand/ConditionParentPane.java | 4 ++-- .../fr/design/headerfooter/HeaderFooterEditPane.java | 2 +- .../com/fr/design/headerfooter/HeaderFooterPane.java | 2 +- .../com/fr/design/javascript/ListenerEditPane.java | 2 +- .../CellDesensitizationGroupsPane.java | 2 +- .../java/com/fr/design/present/CurrencyLinePane.java | 2 +- .../fr/design/report/NewReportBackgroundPane.java | 2 +- .../java/com/fr/design/report/ReportColumnsPane.java | 6 +++--- .../java/com/fr/design/report/SubReportPane.java | 4 ++-- .../java/com/fr/design/webattr/DragToolBarPane.java | 4 ++-- .../java/com/fr/design/webattr/PageToolBarPane.java | 6 +++--- .../com/fr/design/webattr/PageWebSettingPane.java | 2 +- .../java/com/fr/design/webattr/ToolBarDragPane.java | 6 +++--- .../java/com/fr/design/webattr/ViewToolBarPane.java | 6 +++--- .../com/fr/design/webattr/ViewWebSettingPane.java | 2 +- .../main/java/com/fr/design/webattr/WebCssPane.java | 2 +- .../java/com/fr/design/webattr/WebSettingPane.java | 2 +- .../java/com/fr/design/webattr/WriteToolBarPane.java | 2 +- .../com/fr/design/webattr/WriteWebSettingPane.java | 12 ++++++------ .../AbstractNativePrintSettingPane.java | 4 ++-- .../printsettings/NoClientPrintSettingPane.java | 4 ++-- .../webattr/printsettings/PrintSettingPane.java | 2 +- .../design/write/submit/SubmitVisitorListPane.java | 2 +- 40 files changed, 69 insertions(+), 69 deletions(-) diff --git a/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperPopAttrPane.java b/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperPopAttrPane.java index 10b3d7c2e3..6a23e0d0df 100644 --- a/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperPopAttrPane.java +++ b/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperPopAttrPane.java @@ -92,7 +92,7 @@ public class ChartHyperPopAttrPane extends AbstractChartAttrPane { return pane; } private int getBoldFontTextLabelHorizontalAlignment() { - return BidiUtils.rtl() ? SwingConstants.LEFT : SwingConstants.RIGHT; + return SwingConstants.TRAILING; } private String getBoldFontTextLabelName(String i18ney) { diff --git a/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperPoplinkPane.java b/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperPoplinkPane.java index 0230d1eac6..cc5bf596a1 100644 --- a/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperPoplinkPane.java +++ b/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperPoplinkPane.java @@ -52,7 +52,7 @@ public class ChartHyperPoplinkPane extends AbstractHyperLinkPane implemen button.add(copyButton); button.add(moveForwardButton); button.add(moveBackButton); - northPane.add(button, BidiUtils.rtl() ? BorderLayout.EAST : BorderLayout.WEST); - northPane.add(configButton, BidiUtils.rtl() ? BorderLayout.WEST : BorderLayout.EAST); + northPane.add(button, BorderLayout.LINE_START); + northPane.add(configButton, BorderLayout.LINE_END); BidiUtils.applyOrientationByLocale(this); initConfigCreator(); @@ -341,7 +341,7 @@ public class ChartTypeButtonPane extends BasicBeanPane implemen JPanel pane = null; for (int i = 0; i < indexList.size(); i++) { if (i % COL_COUNT == 0) { - pane = new JPanel(new FlowLayout(BidiUtils.rtl() ? FlowLayout.RIGHT : FlowLayout.LEFT)); + pane = new JPanel(new FlowLayout(FlowLayout.LEADING)); northPane.add(pane); } diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/DatabaseTableDataPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/DatabaseTableDataPane.java index a98f7bc74a..7aff66d3fd 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/DatabaseTableDataPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/DatabaseTableDataPane.java @@ -41,7 +41,7 @@ public class DatabaseTableDataPane extends BasicPane{ this.setLayout(new BorderLayout(0,0)); if (label != null) { - this.add(label, BidiUtils.rtl() ? BorderLayout.EAST : BorderLayout.WEST); + this.add(label, BorderLayout.LINE_START); } JPanel pane = new JPanel(new BorderLayout(LayoutConstants.HGAP_LARGE,0)); diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/NormalChartDataPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/NormalChartDataPane.java index 5526a51cb6..6dcc369c66 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/NormalChartDataPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/NormalChartDataPane.java @@ -68,7 +68,7 @@ public class NormalChartDataPane extends DataContentsPane { if (ChartEditContext.supportReportData()) { JPanel northPane = new JPanel(new BorderLayout(LayoutConstants.HGAP_LARGE, 0)); northPane.add(jcb, BorderLayout.CENTER); - UILabel label1 = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Data_Source"), BidiUtils.rtl() ? SwingConstants.RIGHT : SwingConstants.LEFT); + UILabel label1 = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Data_Source"), SwingConstants.LEADING); label1.setPreferredSize(new Dimension(ChartDataPane.LABEL_WIDTH, ChartDataPane.LABEL_HEIGHT)); northPane.add(GUICoreUtils.createBorderLayoutPane(new Component[]{jcb, null, null, label1, null})); if (ChartEditContext.normalMode()) { diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/TableDataPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/TableDataPane.java index 6b6021f9bd..72efba4806 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/TableDataPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/TableDataPane.java @@ -43,7 +43,7 @@ public class TableDataPane extends FurtherBasicBeanPane{ } private void initDataPane() { - UILabel label = new BoldFontTextLabel(Toolkit.i18nText("Fine-Design_Chart_Table_Data"), BidiUtils.rtl() ? SwingConstants.RIGHT : SwingConstants.LEFT); + UILabel label = new BoldFontTextLabel(Toolkit.i18nText("Fine-Design_Chart_Table_Data"), SwingConstants.LEADING); UIComponentUtils.setLineWrap(label, TABLE_DATA_LABEL_LINE_WRAP_WIDTH); UIComponentUtils.setPreferedWidth(label, ChartDataPane.LABEL_WIDTH); diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/table/CategoryPlotTableDataContentPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/table/CategoryPlotTableDataContentPane.java index 4be80e2f0c..bf5ad2cd74 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/table/CategoryPlotTableDataContentPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/table/CategoryPlotTableDataContentPane.java @@ -43,7 +43,7 @@ public class CategoryPlotTableDataContentPane extends AbstractTableDataContentPa categoryCombox = new UIComboBox(); JPanel categoryPane = new JPanel(new BorderLayout(4,0)); categoryPane.setBorder(BorderFactory.createMatteBorder(0, 0, 6, 1, getBackground())); - UILabel label1 = new BoldFontTextLabel(Toolkit.i18nText("Fine-Design_Chart_Style_Category"), BidiUtils.rtl() ? SwingConstants.RIGHT : SwingConstants.LEFT) ; + UILabel label1 = new BoldFontTextLabel(Toolkit.i18nText("Fine-Design_Chart_Style_Category"), SwingConstants.LEADING) ; label1.setPreferredSize(new Dimension(ChartDataPane.LABEL_WIDTH,ChartDataPane.LABEL_HEIGHT)); categoryCombox.setPreferredSize(new Dimension(100,20)); diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/table/SeriesTypeUseComboxPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/table/SeriesTypeUseComboxPane.java index 32f4049de0..0b20335775 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/table/SeriesTypeUseComboxPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/table/SeriesTypeUseComboxPane.java @@ -104,7 +104,7 @@ public class SeriesTypeUseComboxPane extends BasicBeanPane { JPanel northPane = new JPanel(new BorderLayout(4, 0)); //使用系列名/系列值选项面板 - UILabel seriesLabel = new UILabel(Toolkit.i18nText("Fine-Design_Chart_Series_Name_From"), BidiUtils.rtl() ? SwingConstants.RIGHT : SwingConstants.LEFT); + UILabel seriesLabel = new UILabel(Toolkit.i18nText("Fine-Design_Chart_Series_Name_From"), SwingConstants.LEADING); seriesLabel.setPreferredSize(new Dimension(ChartDataPane.LABEL_WIDTH, ChartDataPane.LABEL_HEIGHT)); JPanel borderLayoutPane = GUICoreUtils.createBorderLayoutPane(new Component[]{content, null, null, seriesLabel, null}); northPane.add(borderLayoutPane); diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartTextAttrPaneWithThemeStyle.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartTextAttrPaneWithThemeStyle.java index 1d824ea831..e43b8de392 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartTextAttrPaneWithThemeStyle.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartTextAttrPaneWithThemeStyle.java @@ -42,7 +42,7 @@ public class ChartTextAttrPaneWithThemeStyle extends ChartTextAttrPane { double e = getEdithAreaWidth(); double p = TableLayout.PREFERRED; double[] columnSize = {f, e}; - UILabel text = new UILabel(Toolkit.i18nText("Fine-Design_Chart_Character"), BidiUtils.rtl() ? SwingConstants.RIGHT : SwingConstants.LEFT); + UILabel text = new UILabel(Toolkit.i18nText("Fine-Design_Chart_Character"), SwingConstants.LEADING); JPanel preButtonPane = TableLayout4VanChartHelper.createGapTableLayoutPane(new Component[][]{new Component[]{text, preButton}}, new double[]{p}, columnSize); textFontPane = TableLayout4VanChartHelper.createGapTableLayoutPane(getComponents(buttonPane), getRowSize(), columnSize); panel.add(preButtonPane, BorderLayout.CENTER); diff --git a/designer-chart/src/main/java/com/fr/design/module/ChartEmptyDataStylePane.java b/designer-chart/src/main/java/com/fr/design/module/ChartEmptyDataStylePane.java index 0977f0026d..34e81b1c43 100644 --- a/designer-chart/src/main/java/com/fr/design/module/ChartEmptyDataStylePane.java +++ b/designer-chart/src/main/java/com/fr/design/module/ChartEmptyDataStylePane.java @@ -101,10 +101,10 @@ public class ChartEmptyDataStylePane extends AbstractAttrNoScrollPane { UILabel promptContent = new UILabel(Toolkit.i18nText("Fine-Design_Chart_Tip_Content")); imageContent = new UILabel(Toolkit.i18nText("Fine-Design_Report_Image")); - JPanel emptyPane = GUICoreUtils.createFlowPane(new Component[]{promptContent, emptyData}, BidiUtils.rtl() ? FlowLayout.RIGHT : FlowLayout.LEFT, TEN, 0); - JPanel imagePane = GUICoreUtils.createFlowPane(new Component[]{imageContent, imageData}, BidiUtils.rtl() ? FlowLayout.RIGHT : FlowLayout.LEFT, TEN, 0); + JPanel emptyPane = GUICoreUtils.createFlowPane(new Component[]{promptContent, emptyData}, FlowLayout.LEADING, TEN, 0); + JPanel imagePane = GUICoreUtils.createFlowPane(new Component[]{imageContent, imageData}, FlowLayout.LEADING, TEN, 0); imagePane.setBorder(BorderFactory.createEmptyBorder(0, 20, 0, 0)); - JPanel northPane = GUICoreUtils.createFlowPane(new Component[]{emptyPane, imagePane}, BidiUtils.rtl() ? FlowLayout.RIGHT : FlowLayout.LEFT, 0, 0); + JPanel northPane = GUICoreUtils.createFlowPane(new Component[]{emptyPane, imagePane}, FlowLayout.LEADING, 0, 0); northPane.setBorder(BorderFactory.createEmptyBorder(0, FIVE, 0, 0)); return northPane; } @@ -119,7 +119,7 @@ public class ChartEmptyDataStylePane extends AbstractAttrNoScrollPane { JPanel previewOwnerPane = FRGUIPaneFactory.createTitledBorderPane(Toolkit.i18nText("Fine-Design_Basic_Preview")); previewOwnerPane.setLayout(new BorderLayout()); previewContainerPane.add(previewOwnerPane, BorderLayout.CENTER); - previewContainerPane.add(initSelectFilePane(), BidiUtils.rtl() ? BorderLayout.WEST : BorderLayout.EAST); + previewContainerPane.add(initSelectFilePane(), BorderLayout.LINE_END); previewPane = new ImagePreviewPane(); previewOwnerPane.add(new JScrollPane(previewPane)); diff --git a/designer-chart/src/main/java/com/fr/design/module/ChartPreFillStylePane.java b/designer-chart/src/main/java/com/fr/design/module/ChartPreFillStylePane.java index b7db5e9787..58a6c9c7dd 100644 --- a/designer-chart/src/main/java/com/fr/design/module/ChartPreFillStylePane.java +++ b/designer-chart/src/main/java/com/fr/design/module/ChartPreFillStylePane.java @@ -79,7 +79,7 @@ public class ChartPreFillStylePane extends BasicBeanPane { }; this.setLayout(new BorderLayout()); - this.add(TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize), BidiUtils.rtl() ? BorderLayout.EAST : BorderLayout.WEST); + this.add(TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize), BorderLayout.LINE_START); } private void initListener() { diff --git a/designer-chart/src/main/java/com/fr/design/module/ChartPreStylePane.java b/designer-chart/src/main/java/com/fr/design/module/ChartPreStylePane.java index d9720d1957..5a3ed05e5f 100644 --- a/designer-chart/src/main/java/com/fr/design/module/ChartPreStylePane.java +++ b/designer-chart/src/main/java/com/fr/design/module/ChartPreStylePane.java @@ -37,7 +37,7 @@ public class ChartPreStylePane extends BasicBeanPane { fillStylePane = new ChartPreFillStylePane(); JPanel pane = new JPanel(); - pane.setLayout(new FlowLayout(BidiUtils.rtl() ? FlowLayout.RIGHT : FlowLayout.LEFT)); + pane.setLayout(new FlowLayout(FlowLayout.LEADING)); pane.add(new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Preview"))); diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/style/VanChartTitlePane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/style/VanChartTitlePane.java index 9b72dc5529..8cbe21f7fc 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/style/VanChartTitlePane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/style/VanChartTitlePane.java @@ -159,7 +159,7 @@ public class VanChartTitlePane extends AbstractVanChartScrollPane { UIComponentUtils.setLineWrap(useHtml); Component[][] components = new Component[][]{ new Component[]{null, null}, - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Text"), BidiUtils.rtl() ? SwingConstants.RIGHT : SwingConstants.LEFT), titleContent}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Text"), SwingConstants.LEADING), titleContent}, new Component[]{null, useHtml}, }; JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(components, row, col); @@ -179,7 +179,7 @@ public class VanChartTitlePane extends AbstractVanChartScrollPane { Component[][] components = new Component[][]{ new Component[]{null, null}, - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_BorderLayout_Constraints"), BidiUtils.rtl() ? SwingConstants.RIGHT : SwingConstants.LEFT), alignmentPane}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_BorderLayout_Constraints"), SwingConstants.LEADING), alignmentPane}, new Component[]{null, customFloatPositionButton} }; diff --git a/designer-realize/src/main/java/com/fr/design/cell/editor/RichTextToolBar.java b/designer-realize/src/main/java/com/fr/design/cell/editor/RichTextToolBar.java index 1b641a34a8..5e5030eab7 100644 --- a/designer-realize/src/main/java/com/fr/design/cell/editor/RichTextToolBar.java +++ b/designer-realize/src/main/java/com/fr/design/cell/editor/RichTextToolBar.java @@ -147,7 +147,7 @@ public class RichTextToolBar extends BasicPane { } private void addToToolBar() { - this.setLayout(new FlowLayout(BidiUtils.rtl() ? FlowLayout.RIGHT : FlowLayout.LEFT)); + this.setLayout(new FlowLayout(FlowLayout.LEADING)); this.add(fontNameComboBox); this.add(fontSizeComboBox); diff --git a/designer-realize/src/main/java/com/fr/design/dscolumn/DSColumnAdvancedPane.java b/designer-realize/src/main/java/com/fr/design/dscolumn/DSColumnAdvancedPane.java index ae57483192..af9fd4f158 100644 --- a/designer-realize/src/main/java/com/fr/design/dscolumn/DSColumnAdvancedPane.java +++ b/designer-realize/src/main/java/com/fr/design/dscolumn/DSColumnAdvancedPane.java @@ -249,7 +249,7 @@ public class DSColumnAdvancedPane extends BasicPane { private static class SortPane extends CellDSColumnSortPane { SortPane() { - this.setLayout(new FlowLayout(BidiUtils.rtl() ? FlowLayout.RIGHT : FlowLayout.LEFT)); + this.setLayout(new FlowLayout(FlowLayout.LEADING)); } protected boolean needSortHeaderPane() { @@ -306,14 +306,14 @@ public class DSColumnAdvancedPane extends BasicPane { //not define pane - JPanel undefinedPane = GUICoreUtils.createFlowPane(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Undefined")), BidiUtils.rtl() ? FlowLayout.RIGHT : FlowLayout.LEFT); + JPanel undefinedPane = GUICoreUtils.createFlowPane(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Undefined")), FlowLayout.LEADING); topFormulaPane = new JFormulaField("-1"); bottomFormulaPane = new JFormulaField("-1"); serialTextField = new UITextField(18); JPanel oddPane = GUICoreUtils.createFlowPane(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Bind_Column_Result_Serial_Number_Start_From_1") - + " " + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Bind_Column_Odd_Selected_(1,3,5...)")), BidiUtils.rtl() ? FlowLayout.RIGHT : FlowLayout.LEFT); + + " " + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Bind_Column_Odd_Selected_(1,3,5...)")), FlowLayout.LEADING); JPanel evenPane = GUICoreUtils.createFlowPane(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Bind_Column_Result_Serial_Number_Start_From_1") - + " " + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Bind_Column_Even_Selected_(2,4,6...)")), BidiUtils.rtl() ? FlowLayout.RIGHT : FlowLayout.LEFT); + + " " + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Bind_Column_Even_Selected_(2,4,6...)")), FlowLayout.LEADING); JPanel specifyPane = GUICoreUtils.createFlowPane(new JComponent[]{ serialTextField, new UILabel( com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_DSColumn_Result_Group_Format", "1,2-3,5,8", "$__count__") diff --git a/designer-realize/src/main/java/com/fr/design/dscolumn/DSColumnConditionsPane.java b/designer-realize/src/main/java/com/fr/design/dscolumn/DSColumnConditionsPane.java index 68ff6a381e..32f9ac339f 100644 --- a/designer-realize/src/main/java/com/fr/design/dscolumn/DSColumnConditionsPane.java +++ b/designer-realize/src/main/java/com/fr/design/dscolumn/DSColumnConditionsPane.java @@ -55,7 +55,7 @@ public class DSColumnConditionsPane extends BasicPane { pane.add(reselectExpandCheckBox); reselectExpandCheckBox.setSelected(true); BidiUtils.setOrientationByLocale(reselectExpandCheckBox); - JPanel reSelectPane = GUICoreUtils.createFlowPane(pane, BidiUtils.rtl() ? FlowLayout.RIGHT : FlowLayout.LEFT); + JPanel reSelectPane = GUICoreUtils.createFlowPane(pane, FlowLayout.LEADING); this.add(reSelectPane, BorderLayout.NORTH); reSelectPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Bind_Column_The_Conditions_Of_Father_Cell"), null)); } diff --git a/designer-realize/src/main/java/com/fr/design/dscolumn/ResultSetGroupPopUpPane.java b/designer-realize/src/main/java/com/fr/design/dscolumn/ResultSetGroupPopUpPane.java index 0823642197..f2c10a34de 100644 --- a/designer-realize/src/main/java/com/fr/design/dscolumn/ResultSetGroupPopUpPane.java +++ b/designer-realize/src/main/java/com/fr/design/dscolumn/ResultSetGroupPopUpPane.java @@ -58,20 +58,20 @@ public class ResultSetGroupPopUpPane extends ResultSetGroupPane { advancedButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Custom")); advancedButton.addActionListener(groupAdvancedListener); this.add(GUICoreUtils.createFlowPane( - new JComponent[]{new UILabel(InsertText), groupRadioButton, groupComboBox, advancedButton}, BidiUtils.rtl() ? FlowLayout.RIGHT : FlowLayout.LEFT)); + new JComponent[]{new UILabel(InsertText), groupRadioButton, groupComboBox, advancedButton}, FlowLayout.LEADING)); // 列表 listRadioButton = new UIRadioButton(Toolkit.i18nText("Fine-Design_Report_Bind_Column_Select(Regardless_of_Having_the_Same_Value,Display_All_Item_in_Column)")); listRadioButton.addActionListener(checkEnabledActionListener); this.add(GUICoreUtils.createFlowPane( - new JComponent[]{new UILabel(InsertText), listRadioButton}, BidiUtils.rtl() ? FlowLayout.RIGHT : FlowLayout.LEFT)); + new JComponent[]{new UILabel(InsertText), listRadioButton}, FlowLayout.LEADING)); // 汇总 summaryRadioButton = new UIRadioButton(Toolkit.i18nText("Fine-Design_Report_Bind_Column_Summary(Including_SUM_,_AVERAGE_,_MAX_,_MIN_And_So_On)"), true); summaryRadioButton.addActionListener(checkEnabledActionListener); functionComboBox = new FunctionComboBox(GUICoreUtils.getFunctionArray()); this.add(GUICoreUtils.createFlowPane( - new JComponent[]{new UILabel(InsertText), summaryRadioButton, functionComboBox}, BidiUtils.rtl() ? FlowLayout.RIGHT : FlowLayout.LEFT)); + new JComponent[]{new UILabel(InsertText), summaryRadioButton, functionComboBox}, FlowLayout.LEADING)); ButtonGroup resultSetGroupButtonGroup = new ButtonGroup(); diff --git a/designer-realize/src/main/java/com/fr/design/expand/ConditionParentPane.java b/designer-realize/src/main/java/com/fr/design/expand/ConditionParentPane.java index 749a90b765..f2c1a28392 100644 --- a/designer-realize/src/main/java/com/fr/design/expand/ConditionParentPane.java +++ b/designer-realize/src/main/java/com/fr/design/expand/ConditionParentPane.java @@ -40,12 +40,12 @@ public class ConditionParentPane extends JPanel { eastPane.add(GUICoreUtils.createFlowPane(new JComponent[] { new UILabel(BidiUtils.reverseConcatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Left_Parent"), ": ")), - leftParentPane = new ParentPane(ParentPane.LEFT, listener) }, BidiUtils.rtl() ? FlowLayout.RIGHT : FlowLayout.LEFT)); + leftParentPane = new ParentPane(ParentPane.LEFT, listener) }, FlowLayout.LEADING)); eastPane.add(GUICoreUtils.createFlowPane( new JComponent[] { new UILabel(BidiUtils.reverseConcatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Up_Parent"), ": ")), - upParentPane = new ParentPane(ParentPane.UP, listener) }, BidiUtils.rtl() ? FlowLayout.RIGHT : FlowLayout.LEFT)); + upParentPane = new ParentPane(ParentPane.UP, listener) }, FlowLayout.LEADING)); } public void putElementcase(ElementCasePane t){ leftParentPane.putElementcase(t); diff --git a/designer-realize/src/main/java/com/fr/design/headerfooter/HeaderFooterEditPane.java b/designer-realize/src/main/java/com/fr/design/headerfooter/HeaderFooterEditPane.java index c0e0b6633b..aef3106e79 100644 --- a/designer-realize/src/main/java/com/fr/design/headerfooter/HeaderFooterEditPane.java +++ b/designer-realize/src/main/java/com/fr/design/headerfooter/HeaderFooterEditPane.java @@ -225,7 +225,7 @@ public class HeaderFooterEditPane extends JPanel { UILabel titleLabel = new UILabel(containerTitle); sectionPane.add(titleLabel, BorderLayout.NORTH); - titleLabel.setHorizontalAlignment(BidiUtils.rtl() ? SwingConstants.RIGHT : SwingConstants.LEFT); + titleLabel.setHorizontalAlignment(SwingConstants.LEADING); sectionPane.add(new JScrollPane(hfContainer), BorderLayout.CENTER); diff --git a/designer-realize/src/main/java/com/fr/design/headerfooter/HeaderFooterPane.java b/designer-realize/src/main/java/com/fr/design/headerfooter/HeaderFooterPane.java index f1c3034cff..e0e5e5958d 100644 --- a/designer-realize/src/main/java/com/fr/design/headerfooter/HeaderFooterPane.java +++ b/designer-realize/src/main/java/com/fr/design/headerfooter/HeaderFooterPane.java @@ -47,7 +47,7 @@ public abstract class HeaderFooterPane extends BasicPane { this.setLayout(new BorderLayout(0, 4)); // Left pane JPanel leftPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); - this.add(leftPane, BidiUtils.rtl() ? BorderLayout.EAST : BorderLayout.WEST); + this.add(leftPane, BorderLayout.LINE_START); DefaultListModel defaultListModel = new DefaultListModel(); reportHFYypeList = new JList(defaultListModel); reportHFYypeList.setCellRenderer(reportPageTypeRenderer); diff --git a/designer-realize/src/main/java/com/fr/design/javascript/ListenerEditPane.java b/designer-realize/src/main/java/com/fr/design/javascript/ListenerEditPane.java index a56231c2e4..54fa3ca488 100644 --- a/designer-realize/src/main/java/com/fr/design/javascript/ListenerEditPane.java +++ b/designer-realize/src/main/java/com/fr/design/javascript/ListenerEditPane.java @@ -84,7 +84,7 @@ public class ListenerEditPane extends BasicBeanPane { nameText, new UILabel(BidiUtils.reverseConcatenateStrings(" ", Toolkit.i18nText("Fine-Design_Report_Event_Type"), ":")), styleBox}, - BidiUtils.rtl() ? FlowLayout.RIGHT : FlowLayout.LEFT); + FlowLayout.LEADING); namePane.setBorder(BidiUtils.applyTitledBorderJustification(BorderFactory.createTitledBorder(Toolkit.i18nText("Fine-Design_Report_Event_Name_Type")))); this.add(namePane, BorderLayout.NORTH); card = new CardLayout(); diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/desensitization/CellDesensitizationGroupsPane.java b/designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/desensitization/CellDesensitizationGroupsPane.java index 4ef09ceb00..a8f3b5f34b 100644 --- a/designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/desensitization/CellDesensitizationGroupsPane.java +++ b/designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/desensitization/CellDesensitizationGroupsPane.java @@ -98,7 +98,7 @@ public class CellDesensitizationGroupsPane extends JPanel { JPanel controlPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); controlPane.setBackground(Color.WHITE); - controlPane.add(getbuttonPane(), BidiUtils.rtl() ? BorderLayout.EAST : BorderLayout.WEST); + controlPane.add(getbuttonPane(), BorderLayout.LINE_START); JPanel pane = new JPanel(new BorderLayout(4, 4)); pane.add(editTable, BorderLayout.CENTER); diff --git a/designer-realize/src/main/java/com/fr/design/present/CurrencyLinePane.java b/designer-realize/src/main/java/com/fr/design/present/CurrencyLinePane.java index 99afa10d8a..6494a5564e 100644 --- a/designer-realize/src/main/java/com/fr/design/present/CurrencyLinePane.java +++ b/designer-realize/src/main/java/com/fr/design/present/CurrencyLinePane.java @@ -101,7 +101,7 @@ public class CurrencyLinePane extends FurtherBasicBeanPane int[][] rowCount = {{1, 1}, {1, 1}, {1, 1}, {1, 1}}; Component[][] components = new Component[][]{ - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Data"), BidiUtils.rtl() ? UILabel.RIGHT : UILabel.LEFT), textField}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Data"), UILabel.LEADING), textField}, new Component[]{borderPane, null}, new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_IntPart"), UILabel.LEFT), groupPane(intPartSpinner)}, new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Deci_Part"), UILabel.LEFT), groupPane(deciPartSpinner)} diff --git a/designer-realize/src/main/java/com/fr/design/report/NewReportBackgroundPane.java b/designer-realize/src/main/java/com/fr/design/report/NewReportBackgroundPane.java index 7dfb167507..a2de5db17e 100644 --- a/designer-realize/src/main/java/com/fr/design/report/NewReportBackgroundPane.java +++ b/designer-realize/src/main/java/com/fr/design/report/NewReportBackgroundPane.java @@ -146,7 +146,7 @@ public class NewReportBackgroundPane extends BasicPane { contentContainer.setBorder(BorderFactory.createEmptyBorder()); contentContainer.setPreferredSize(new Dimension(600, 540)); contentContainer.add(createLeftPane(), BorderLayout.CENTER); - contentContainer.add(createRightPane(), BidiUtils.rtl() ? BorderLayout.WEST : BorderLayout.EAST); + contentContainer.add(createRightPane(), BorderLayout.LINE_END); addAttributeChangeListener(new AttributeChangeListener() { @Override diff --git a/designer-realize/src/main/java/com/fr/design/report/ReportColumnsPane.java b/designer-realize/src/main/java/com/fr/design/report/ReportColumnsPane.java index a4e59600d7..bd27e62f6f 100644 --- a/designer-realize/src/main/java/com/fr/design/report/ReportColumnsPane.java +++ b/designer-realize/src/main/java/com/fr/design/report/ReportColumnsPane.java @@ -115,10 +115,10 @@ public class ReportColumnsPane extends BasicPane{ int uiLabelWidth = GraphHelper.getWidth(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_ReportColumns_Columns"), uiLableFont); uiLabel.setPreferredSize(new Dimension(uiLabelWidth, 20)); - north.add(uiLabel, BidiUtils.rtl() ? BorderLayout.EAST : BorderLayout.WEST); + north.add(uiLabel, BorderLayout.LINE_START); JPanel buttonGroupPane = new JPanel(new FlowLayout(FlowLayout.CENTER, 23,11)); buttonGroupPane.add(onOffButtonGroup); - north.add(buttonGroupPane, BidiUtils.rtl() ? BorderLayout.WEST : BorderLayout.EAST); + north.add(buttonGroupPane, BorderLayout.LINE_END); this.add(north, BorderLayout.NORTH); this.add(createRowColumnPane(), BorderLayout.CENTER); } @@ -186,7 +186,7 @@ public class ReportColumnsPane extends BasicPane{ north.add(createRowMaxOrSetPane()); center.add(createRowPane(), BorderLayout.NORTH); - JPanel xx = new JPanel(new FlowLayout(BidiUtils.rtl() ? FlowLayout.LEFT : FlowLayout.RIGHT,0,0)); + JPanel xx = new JPanel(new FlowLayout(FlowLayout.TRAILING,0,0)); showBlankCheckBox = new UICheckBox(SHOW_BLANK[rowOrColumn]); xx.add(showBlankCheckBox); center.add(xx, BorderLayout.CENTER); diff --git a/designer-realize/src/main/java/com/fr/design/report/SubReportPane.java b/designer-realize/src/main/java/com/fr/design/report/SubReportPane.java index e5c4ccced2..653c526422 100644 --- a/designer-realize/src/main/java/com/fr/design/report/SubReportPane.java +++ b/designer-realize/src/main/java/com/fr/design/report/SubReportPane.java @@ -46,7 +46,7 @@ public class SubReportPane extends BasicPane { JPanel northPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); // northPane.setLayout(FRGUIPaneFactory.createM_BorderLayout()); northPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Sub_Report_Path"),null)); - northPane.add(new UILabel(BidiUtils.reverseConcatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Location"), ":")), BidiUtils.rtl() ? BorderLayout.EAST : BorderLayout.WEST); + northPane.add(new UILabel(BidiUtils.reverseConcatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Location"), ":")), BorderLayout.LINE_START); northPane.add(pathTextField = new UITextField(), BorderLayout.CENTER); pathTextField.setEditable(false); UIButton browseButton = new UIButton("..."); @@ -84,7 +84,7 @@ public class SubReportPane extends BasicPane { kcPane.add(kvPane); extend = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Hyperlink_Extends_Report_Parameters")); JPanel extendPanel = new JPanel(new BorderLayout(0, 0)); - extendPanel.add(extend, BidiUtils.rtl() ? BorderLayout.EAST : BorderLayout.WEST); + extendPanel.add(extend, BorderLayout.LINE_START); kcPane.add(extendPanel, BorderLayout.SOUTH); centerPane.add(kcPane, BorderLayout.CENTER); UITextArea description = new UITextArea(2, 1); diff --git a/designer-realize/src/main/java/com/fr/design/webattr/DragToolBarPane.java b/designer-realize/src/main/java/com/fr/design/webattr/DragToolBarPane.java index ddbb61d092..7d47fe460a 100644 --- a/designer-realize/src/main/java/com/fr/design/webattr/DragToolBarPane.java +++ b/designer-realize/src/main/java/com/fr/design/webattr/DragToolBarPane.java @@ -74,13 +74,13 @@ public class DragToolBarPane extends WidgetToolBarPane { southToolBar.setBackground(Color.lightGray); JPanel northContentPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); SettingToolBar top = new SettingToolBar(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_ToolBar_Top"), northToolBar); - northContentPane.add(top, BidiUtils.rtl() ? BorderLayout.WEST : BorderLayout.EAST); + northContentPane.add(top, BorderLayout.LINE_END); northContentPane.add(northToolBar, BorderLayout.CENTER); northContentPane.setBackground(Color.lightGray); JPanel southContentPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); SettingToolBar bottom = new SettingToolBar(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_ToolBar_Bottom"), southToolBar); - southContentPane.add(bottom, BidiUtils.rtl() ? BorderLayout.WEST : BorderLayout.EAST); + southContentPane.add(bottom, BorderLayout.LINE_END); southContentPane.add(southToolBar, BorderLayout.CENTER); southContentPane.setBackground(Color.lightGray); JPanel movePane = FRGUIPaneFactory.createBorderLayout_S_Pane(); diff --git a/designer-realize/src/main/java/com/fr/design/webattr/PageToolBarPane.java b/designer-realize/src/main/java/com/fr/design/webattr/PageToolBarPane.java index 05a660d165..c634d6a15a 100644 --- a/designer-realize/src/main/java/com/fr/design/webattr/PageToolBarPane.java +++ b/designer-realize/src/main/java/com/fr/design/webattr/PageToolBarPane.java @@ -117,9 +117,9 @@ public class PageToolBarPane extends AbstractEditToolBarPane { double[] columnSize = {p, p, p, p}; double[] rowSize = {p, p, p, p, p}; Component[][] components = new Component[][]{ - new Component[]{new UILabel(BidiUtils.reverseConcatenateStrings(Toolkit.i18nText("Fine-Design_Report_Show_Location"), ":"), BidiUtils.rtl() ? UILabel.LEFT : UILabel.RIGHT), buttonPane, null, null}, - new Component[]{new UILabel(BidiUtils.reverseConcatenateStrings(Toolkit.i18nText("Fine-Design_Report_PageSetup_Page"), ":"), BidiUtils.rtl() ? UILabel.LEFT : UILabel.RIGHT), isShowAsImageBox, isAutoScaleBox, isTDHeavyBox}, - new Component[]{new UILabel(BidiUtils.reverseConcatenateStrings(Toolkit.i18nText("Fine-Design_Report_Paging_Settings"), ":"), BidiUtils.rtl() ? UILabel.LEFT : UILabel.RIGHT), isPageFixedRowBox, linesPerPagePane, null}, + new Component[]{new UILabel(BidiUtils.reverseConcatenateStrings(Toolkit.i18nText("Fine-Design_Report_Show_Location"), ":"), UILabel.TRAILING), buttonPane, null, null}, + new Component[]{new UILabel(BidiUtils.reverseConcatenateStrings(Toolkit.i18nText("Fine-Design_Report_PageSetup_Page"), ":"), UILabel.TRAILING), isShowAsImageBox, isAutoScaleBox, isTDHeavyBox}, + new Component[]{new UILabel(BidiUtils.reverseConcatenateStrings(Toolkit.i18nText("Fine-Design_Report_Paging_Settings"), ":"), UILabel.TRAILING), isPageFixedRowBox, linesPerPagePane, null}, new Component[]{null, tipLabel, null, null}, new Component[]{isUseToolBarCheckBox, editToolBarButtonPanel, null, null} }; diff --git a/designer-realize/src/main/java/com/fr/design/webattr/PageWebSettingPane.java b/designer-realize/src/main/java/com/fr/design/webattr/PageWebSettingPane.java index 67328087f2..399675225c 100644 --- a/designer-realize/src/main/java/com/fr/design/webattr/PageWebSettingPane.java +++ b/designer-realize/src/main/java/com/fr/design/webattr/PageWebSettingPane.java @@ -122,7 +122,7 @@ public class PageWebSettingPane extends WebSettingPane { } private UILabel createBidiUILabel(String i18nKey) { - return new UILabel(BidiUtils.reverseConcatenateStrings(com.fr.design.i18n.Toolkit.i18nText(i18nKey), ":"), BidiUtils.rtl() ? UILabel.LEFT : UILabel.RIGHT); + return new UILabel(BidiUtils.reverseConcatenateStrings(com.fr.design.i18n.Toolkit.i18nText(i18nKey), ":"), UILabel.TRAILING); } @Override diff --git a/designer-realize/src/main/java/com/fr/design/webattr/ToolBarDragPane.java b/designer-realize/src/main/java/com/fr/design/webattr/ToolBarDragPane.java index efa6505252..42c6e42d24 100644 --- a/designer-realize/src/main/java/com/fr/design/webattr/ToolBarDragPane.java +++ b/designer-realize/src/main/java/com/fr/design/webattr/ToolBarDragPane.java @@ -83,7 +83,7 @@ public class ToolBarDragPane extends WidgetToolBarPane { } }); BidiUtils.setOrientationByLocale(isUseToolBarCheckBox); - north.add(isUseToolBarCheckBox, BidiUtils.rtl() ? BorderLayout.EAST : BorderLayout.WEST); + north.add(isUseToolBarCheckBox, BorderLayout.LINE_START); JPanel aa = FRGUIPaneFactory.createRightFlowInnerContainer_S_Pane(); aa.add(defaultButton); north.add(aa, BorderLayout.CENTER); @@ -159,13 +159,13 @@ public class ToolBarDragPane extends WidgetToolBarPane { JPanel movePane = FRGUIPaneFactory.createBorderLayout_S_Pane(); JPanel northContentPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); SettingToolBar top = new SettingToolBar(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_ToolBar_Top"), northToolBar); - northContentPane.add(top, BidiUtils.rtl() ? BorderLayout.WEST : BorderLayout.EAST); + northContentPane.add(top, BorderLayout.LINE_END); northContentPane.add(northToolBar, BorderLayout.CENTER); northContentPane.setBackground(Color.lightGray); JPanel southContentPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); SettingToolBar bottom = new SettingToolBar(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_ToolBar_Bottom"), southToolBar); - southContentPane.add(bottom, BidiUtils.rtl() ? BorderLayout.WEST : BorderLayout.EAST); + southContentPane.add(bottom, BorderLayout.LINE_END); southContentPane.add(southToolBar, BorderLayout.CENTER); southContentPane.setBackground(Color.lightGray); diff --git a/designer-realize/src/main/java/com/fr/design/webattr/ViewToolBarPane.java b/designer-realize/src/main/java/com/fr/design/webattr/ViewToolBarPane.java index f20e64b3c6..d8a66b0dab 100644 --- a/designer-realize/src/main/java/com/fr/design/webattr/ViewToolBarPane.java +++ b/designer-realize/src/main/java/com/fr/design/webattr/ViewToolBarPane.java @@ -57,9 +57,9 @@ public class ViewToolBarPane extends AbstractEditToolBarPane { sortCheckBox.setSelected(false); conditonFilterBox.setSelected(false); listFilterBox.setSelected(false); - northPane.add(GUICoreUtils.createFlowPane(new Component[]{sortCheckBox, conditonFilterBox, listFilterBox}, BidiUtils.rtl() ? FlowLayout.RIGHT : FlowLayout.LEFT, 6)); - northPane.add(GUICoreUtils.createFlowPane(new Component[] {isUseToolBarCheckBox, editToolBarButton}, BidiUtils.rtl() ? FlowLayout.RIGHT : FlowLayout.LEFT)); - northPane.add(GUICoreUtils.createFlowPane(showListenersLabel, BidiUtils.rtl() ? FlowLayout.RIGHT : FlowLayout.LEFT)); + northPane.add(GUICoreUtils.createFlowPane(new Component[]{sortCheckBox, conditonFilterBox, listFilterBox}, FlowLayout.LEADING, 6)); + northPane.add(GUICoreUtils.createFlowPane(new Component[] {isUseToolBarCheckBox, editToolBarButton}, FlowLayout.LEADING)); + northPane.add(GUICoreUtils.createFlowPane(showListenersLabel, FlowLayout.LEADING)); eventPane = new EventPane(new WebView().supportedEvents()); JPanel center = FRGUIPaneFactory.createBorderLayout_S_Pane(); center.add(eventPane, BorderLayout.CENTER); diff --git a/designer-realize/src/main/java/com/fr/design/webattr/ViewWebSettingPane.java b/designer-realize/src/main/java/com/fr/design/webattr/ViewWebSettingPane.java index 4916f44ef3..398275ea54 100644 --- a/designer-realize/src/main/java/com/fr/design/webattr/ViewWebSettingPane.java +++ b/designer-realize/src/main/java/com/fr/design/webattr/ViewWebSettingPane.java @@ -36,7 +36,7 @@ public class ViewWebSettingPane extends WebSettingPane { conditionFilterBox.setSelected(true); listFilterBox.setSelected(true); return GUICoreUtils.createFlowPane(new Component[]{new UILabel(BidiUtils.reverseConcatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Engine_ViewPreview"), ":")), - sortCheckBox, conditionFilterBox, listFilterBox}, BidiUtils.rtl() ? FlowLayout.RIGHT : FlowLayout.LEFT, 6); + sortCheckBox, conditionFilterBox, listFilterBox}, FlowLayout.LEADING, 6); } @Override diff --git a/designer-realize/src/main/java/com/fr/design/webattr/WebCssPane.java b/designer-realize/src/main/java/com/fr/design/webattr/WebCssPane.java index 3cb889fff1..793c0dd1c2 100644 --- a/designer-realize/src/main/java/com/fr/design/webattr/WebCssPane.java +++ b/designer-realize/src/main/java/com/fr/design/webattr/WebCssPane.java @@ -38,7 +38,7 @@ public class WebCssPane extends BasicPane { this.setBorder(BorderFactory.createEmptyBorder(10, 5, 0, 0)); JPanel outnorth = new JPanel(new BorderLayout(0, 5)); - JPanel northPane = new JPanel(new FlowLayout(BidiUtils.rtl() ? FlowLayout.RIGHT : FlowLayout.LEFT,8,0)); + JPanel northPane = new JPanel(new FlowLayout(FlowLayout.LEADING,8,0)); localText = new UITextField(); localText.setPreferredSize(DesignSizeI18nManager.getInstance().i18nDimension("com.fr.design.web.pane.text.field")); localText.setEditable(false); diff --git a/designer-realize/src/main/java/com/fr/design/webattr/WebSettingPane.java b/designer-realize/src/main/java/com/fr/design/webattr/WebSettingPane.java index aac547b7ec..b3779d5a63 100644 --- a/designer-realize/src/main/java/com/fr/design/webattr/WebSettingPane.java +++ b/designer-realize/src/main/java/com/fr/design/webattr/WebSettingPane.java @@ -47,7 +47,7 @@ public abstract class WebSettingPane extends BasicBeanPane private static final long LONGZERO = 0L; public WebSettingPane() { - JPanel buttonPane = new JPanel(new FlowLayout(BidiUtils.rtl() ? FlowLayout.RIGHT : FlowLayout.LEFT, 0, 6)); + JPanel buttonPane = new JPanel(new FlowLayout(FlowLayout.LEADING, 0, 6)); choseComboBox = new UIComboBox(CHOOSEITEM); choseComboBox.addItemListener(itemListener); buttonPane.add(new UILabel(BidiUtils.reverseConcatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Blow_Set"), ":"))); diff --git a/designer-realize/src/main/java/com/fr/design/webattr/WriteToolBarPane.java b/designer-realize/src/main/java/com/fr/design/webattr/WriteToolBarPane.java index 8872d95c0f..ac61638b7e 100644 --- a/designer-realize/src/main/java/com/fr/design/webattr/WriteToolBarPane.java +++ b/designer-realize/src/main/java/com/fr/design/webattr/WriteToolBarPane.java @@ -46,7 +46,7 @@ public class WriteToolBarPane extends AbstractEditToolBarPane { private UILabel sheetShowLocationLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Sheet_Label_Page_Display_Position")); private UIRadioButton centerRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Center_Display")); private UIRadioButton leftRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Left_Display")); - private UILabel rptShowLocationLabel = new UILabel(BidiUtils.reverseConcatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Show_Location"), ":"), BidiUtils.rtl() ? UILabel.RIGHT : UILabel.LEFT); + private UILabel rptShowLocationLabel = new UILabel(BidiUtils.reverseConcatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Show_Location"), ":"), UILabel.LEADING); private UICheckBox isUseToolBarCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Use_ToolBar")); private UIButton editToolBarButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Edit")); private UILabel showListenersLabel = new UILabel(BidiUtils.reverseConcatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Editing_Listeners"), ":")); diff --git a/designer-realize/src/main/java/com/fr/design/webattr/WriteWebSettingPane.java b/designer-realize/src/main/java/com/fr/design/webattr/WriteWebSettingPane.java index 1e99eb7009..9a23d2ba26 100644 --- a/designer-realize/src/main/java/com/fr/design/webattr/WriteWebSettingPane.java +++ b/designer-realize/src/main/java/com/fr/design/webattr/WriteWebSettingPane.java @@ -52,27 +52,27 @@ public class WriteWebSettingPane extends WebSettingPane { } }); - JPanel backgroundPane = GUICoreUtils.createFlowPane(new Component[]{colorBox, colorButton}, BidiUtils.rtl() ? FlowLayout.RIGHT : FlowLayout.LEFT); + JPanel backgroundPane = GUICoreUtils.createFlowPane(new Component[]{colorBox, colorButton}, FlowLayout.LEADING); //sheet标签页显示位置 topRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Top")); bottomRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Bottom")); - sheetShowLocationLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Sheet_Label_Page_Display_Position"), BidiUtils.rtl() ? UILabel.RIGHT : UILabel.LEFT); + sheetShowLocationLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Sheet_Label_Page_Display_Position"), UILabel.LEADING); ButtonGroup buttonGroup = new ButtonGroup(); bottomRadioButton.setSelected(true); buttonGroup.add(topRadioButton); buttonGroup.add(bottomRadioButton); - JPanel sheetPane = GUICoreUtils.createFlowPane(new Component[]{sheetShowLocationLabel, topRadioButton, bottomRadioButton}, BidiUtils.rtl() ? FlowLayout.RIGHT : FlowLayout.LEFT); + JPanel sheetPane = GUICoreUtils.createFlowPane(new Component[]{sheetShowLocationLabel, topRadioButton, bottomRadioButton}, FlowLayout.LEADING); //Sean: 报表显示位置since 706 - rptShowLocationLabel = new UILabel(BidiUtils.reverseConcatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Show_Location"), ":"), BidiUtils.rtl() ? UILabel.RIGHT : UILabel.LEFT); + rptShowLocationLabel = new UILabel(BidiUtils.reverseConcatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Show_Location"), ":"), UILabel.LEADING); centerRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Center_Display")); leftRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Left_Display")); ButtonGroup rptShowButtonGroup = new ButtonGroup(); leftRadioButton.setSelected(true); rptShowButtonGroup.add(centerRadioButton); rptShowButtonGroup.add(leftRadioButton); - JPanel showLocPane = GUICoreUtils.createFlowPane(new Component[]{rptShowLocationLabel, centerRadioButton, leftRadioButton}, BidiUtils.rtl() ? FlowLayout.RIGHT : FlowLayout.LEFT); + JPanel showLocPane = GUICoreUtils.createFlowPane(new Component[]{rptShowLocationLabel, centerRadioButton, leftRadioButton}, FlowLayout.LEADING); unloadCheck = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Unload_Check")); unloadCheck.setSelected(true); @@ -81,7 +81,7 @@ public class WriteWebSettingPane extends WebSettingPane { showWidgets.setSelected(false); isAutoStash = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Write_Auto_Stash")); isAutoStash.setSelected(false); - JPanel unloadCheckPane = GUICoreUtils.createFlowPane(new Component[]{unloadCheck, showWidgets, isAutoStash}, BidiUtils.rtl() ? FlowLayout.RIGHT : FlowLayout.LEFT); + JPanel unloadCheckPane = GUICoreUtils.createFlowPane(new Component[]{unloadCheck, showWidgets, isAutoStash}, FlowLayout.LEADING); JPanel northPane = FRGUIPaneFactory.createNColumnGridInnerContainer_S_Pane(2); northPane.add(sheetPane); northPane.add(showLocPane); diff --git a/designer-realize/src/main/java/com/fr/design/webattr/printsettings/AbstractNativePrintSettingPane.java b/designer-realize/src/main/java/com/fr/design/webattr/printsettings/AbstractNativePrintSettingPane.java index b07b78bfb8..ddf47770bf 100644 --- a/designer-realize/src/main/java/com/fr/design/webattr/printsettings/AbstractNativePrintSettingPane.java +++ b/designer-realize/src/main/java/com/fr/design/webattr/printsettings/AbstractNativePrintSettingPane.java @@ -105,13 +105,13 @@ public abstract class AbstractNativePrintSettingPane extends JPanel { showDialogCheck = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Engine_Show_Print_Setting_Window_When_Printing")); UILabel showDialogCheckTip = GUICoreUtils.createTipLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Tip_Use_Default_Settings")); JPanel showDialogCheckPane = GUICoreUtils.createFlowPane(new Component[]{ - showDialogCheck, Box.createHorizontalStrut(20),showDialogCheckTip}, BidiUtils.rtl() ? FlowLayout.RIGHT : FlowLayout.LEFT); + showDialogCheck, Box.createHorizontalStrut(20),showDialogCheckTip}, FlowLayout.LEADING); // 打印需要指定 sheet needSelectSheetCheck = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Engine_Need_Select_Sheet_When_Printing")); UILabel needSelectSheetCheckTip = GUICoreUtils.createTipLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Tip_Invalid_In_Page_View")); JPanel needSelectSheetCheckPane = GUICoreUtils.createFlowPane(new Component[]{ - needSelectSheetCheck, Box.createHorizontalStrut(20), needSelectSheetCheckTip}, BidiUtils.rtl() ? FlowLayout.RIGHT :FlowLayout.LEFT); + needSelectSheetCheck, Box.createHorizontalStrut(20), needSelectSheetCheckTip}, FlowLayout.LEADING); return createHeaderPane(tipDownload, showDialogCheckPane, needSelectSheetCheckPane); } diff --git a/designer-realize/src/main/java/com/fr/design/webattr/printsettings/NoClientPrintSettingPane.java b/designer-realize/src/main/java/com/fr/design/webattr/printsettings/NoClientPrintSettingPane.java index 6edf6cd9fe..f06d80d973 100644 --- a/designer-realize/src/main/java/com/fr/design/webattr/printsettings/NoClientPrintSettingPane.java +++ b/designer-realize/src/main/java/com/fr/design/webattr/printsettings/NoClientPrintSettingPane.java @@ -71,14 +71,14 @@ public class NoClientPrintSettingPane extends JPanel { setMarginWhenPrintCheck = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Engine_Set_Margin_When_Printing")); UILabel marginTip = GUICoreUtils.createTipLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Tip_Use_Default_Print_Margin")); JPanel setMarginWhenPrintPane = GUICoreUtils.createFlowPane(new Component[] { - setMarginWhenPrintCheck, Box.createHorizontalStrut(20), marginTip}, BidiUtils.rtl() ? FlowLayout.RIGHT : FlowLayout.LEFT); + setMarginWhenPrintCheck, Box.createHorizontalStrut(20), marginTip}, FlowLayout.LEADING); ieQuietPrintCheck = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_No_Print_Settings_In_IE")); needlePrinterOptimizeCheck = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Needle_Printer_Optimize")); UILabel needleTip = GUICoreUtils.createTipLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Needle_Printer_Optimize_Tip")); JPanel needlePrinterOptimizePane = GUICoreUtils.createFlowPane(new Component[] { - needlePrinterOptimizeCheck, Box.createHorizontalStrut(20), needleTip}, BidiUtils.rtl() ? FlowLayout.RIGHT : FlowLayout.LEFT); + needlePrinterOptimizeCheck, Box.createHorizontalStrut(20), needleTip}, FlowLayout.LEADING); JPanel headerPane = GUICoreUtils.createHeaderLayoutPane(setMarginWhenPrintPane, ieQuietPrintCheck, needlePrinterOptimizePane); headerPane.setBorder(BorderFactory.createEmptyBorder(2, 12, 12, 0)); diff --git a/designer-realize/src/main/java/com/fr/design/webattr/printsettings/PrintSettingPane.java b/designer-realize/src/main/java/com/fr/design/webattr/printsettings/PrintSettingPane.java index ca98f8f904..c9d97158c1 100644 --- a/designer-realize/src/main/java/com/fr/design/webattr/printsettings/PrintSettingPane.java +++ b/designer-realize/src/main/java/com/fr/design/webattr/printsettings/PrintSettingPane.java @@ -51,7 +51,7 @@ public class PrintSettingPane extends BasicPane { buttonGroup.add(noClientPrintRadioButton); buttonGroup.add(nativePrintRadioButton); JPanel radioGroupPane = GUICoreUtils.createFlowPane(new Component[] { - noClientPrintRadioButton, Box.createHorizontalStrut(50), nativePrintRadioButton}, BidiUtils.rtl() ? FlowLayout.RIGHT : FlowLayout.LEFT, 0, 0); + noClientPrintRadioButton, Box.createHorizontalStrut(50), nativePrintRadioButton}, FlowLayout.LEADING, 0, 0); north.add(radioGroupPane); BidiUtils.applyOrientationByLocale(noClientPrintRadioButton, nativePrintRadioButton); noClientPrintSettingPane = new NoClientPrintSettingPane(); diff --git a/designer-realize/src/main/java/com/fr/design/write/submit/SubmitVisitorListPane.java b/designer-realize/src/main/java/com/fr/design/write/submit/SubmitVisitorListPane.java index dfe4ba18a9..19656a3742 100644 --- a/designer-realize/src/main/java/com/fr/design/write/submit/SubmitVisitorListPane.java +++ b/designer-realize/src/main/java/com/fr/design/write/submit/SubmitVisitorListPane.java @@ -188,7 +188,7 @@ public class SubmitVisitorListPane extends ObjectJControlPane { csjConfigComboBox = new UIComboBox(configTypes.toArray()); JPanel typePane = GUICoreUtils.createFlowPane(new Component[]{new UILabel(BidiUtils.reverseConcatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Write_Choose_Submit_Type"), ":")), csjConfigComboBox}, - BidiUtils.rtl() ? FlowLayout.RIGHT : FlowLayout.LEFT, 10); + FlowLayout.LEADING, 10); typePane.setBorder(BidiUtils.applyTitledBorderJustification(BorderFactory.createTitledBorder(new ModLineBorder(ModLineBorder.TOP), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Write_Submit_Type")))); this.add(typePane, BorderLayout.NORTH);