From 2431b21b67c49620dcd8738f9c14f68cb88443fe Mon Sep 17 00:00:00 2001 From: obo Date: Wed, 7 Aug 2024 11:20:41 +0800 Subject: [PATCH] =?UTF-8?q?=E7=AE=80=E5=8C=96titleBorder=E7=94=9F=E6=88=90?= =?UTF-8?q?=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fr/design/data/datapane/connect/JDBCDefPane.java | 2 +- .../main/java/com/fr/design/layout/FRGUIPaneFactory.java | 2 +- .../main/java/com/fr/design/write/submit/CustomJobPane.java | 6 +++--- .../SeriesCondition/impl/ChartHyperRelateCellLinkPane.java | 2 +- .../com/fr/design/headerfooter/HeaderFooterEditPane.java | 2 +- .../main/java/com/fr/design/report/ReportColumnsPane.java | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/connect/JDBCDefPane.java b/designer-base/src/main/java/com/fr/design/data/datapane/connect/JDBCDefPane.java index 86d7513236..8d10a263be 100644 --- a/designer-base/src/main/java/com/fr/design/data/datapane/connect/JDBCDefPane.java +++ b/designer-base/src/main/java/com/fr/design/data/datapane/connect/JDBCDefPane.java @@ -163,7 +163,7 @@ public class JDBCDefPane extends JPanel { public JDBCDefPane() { initMap(); - this.setBorder(BidiUtils.applyTitledBorderJustification(UITitledBorder.createBorderWithTitle("JDBC" + ":"))); + this.setBorder(UITitledBorder.createBorderWithTitle("JDBC" + ":")); this.setLayout(FRGUIPaneFactory.createLabelFlowLayout()); JPanel innerthis = FRGUIPaneFactory.createY_AXISBoxInnerContainer_L_Pane(); innerthis.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0)); diff --git a/designer-base/src/main/java/com/fr/design/layout/FRGUIPaneFactory.java b/designer-base/src/main/java/com/fr/design/layout/FRGUIPaneFactory.java index 2563492d47..5be1939bd5 100644 --- a/designer-base/src/main/java/com/fr/design/layout/FRGUIPaneFactory.java +++ b/designer-base/src/main/java/com/fr/design/layout/FRGUIPaneFactory.java @@ -209,7 +209,7 @@ public class FRGUIPaneFactory { */ public static JPanel createTitledBorderPane(String string) { JPanel jp = new JPanel(); - UITitledBorder explainBorder = (UITitledBorder) BidiUtils.applyTitledBorderJustification(UITitledBorder.createBorderWithTitle(string)); + UITitledBorder explainBorder = UITitledBorder.createBorderWithTitle(string); jp.setBorder(explainBorder); jp.setLayout(new FlowLayout(BidiUtils.rtl() ? FlowLayout.RIGHT : FlowLayout.LEFT)); return jp; diff --git a/designer-base/src/main/java/com/fr/design/write/submit/CustomJobPane.java b/designer-base/src/main/java/com/fr/design/write/submit/CustomJobPane.java index dd069f9436..daeb408d10 100644 --- a/designer-base/src/main/java/com/fr/design/write/submit/CustomJobPane.java +++ b/designer-base/src/main/java/com/fr/design/write/submit/CustomJobPane.java @@ -87,11 +87,11 @@ public abstract class CustomJobPane extends BasicBeanPane { } }); - reportletNamePane.setBorder(BidiUtils.applyTitledBorderJustification(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Class_Name"), null))); + reportletNamePane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Class_Name"), null)); this.add(reportletNamePane, BorderLayout.NORTH); objectProperiesPane = new ObjectProperiesPane(); - objectProperiesPane.setBorder(BidiUtils.applyTitledBorderJustification(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Property"), null))); + objectProperiesPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Property"), null)); this.add(objectProperiesPane, BorderLayout.CENTER); UITextArea area = new UITextArea(2, 1); @@ -99,7 +99,7 @@ public abstract class CustomJobPane extends BasicBeanPane { BidiUtils.setOrientationByLocale(area); JPanel dsPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); dsPane.add(area); - dsPane.setBorder(BidiUtils.applyTitledBorderJustification(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Custom_Job_Description"), null))); + dsPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Custom_Job_Description"), null)); this.add(dsPane, BorderLayout.SOUTH); checkAddButtonEnable(); } diff --git a/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperRelateCellLinkPane.java b/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperRelateCellLinkPane.java index 5757dff06b..61ee094f84 100644 --- a/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperRelateCellLinkPane.java +++ b/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperRelateCellLinkPane.java @@ -50,7 +50,7 @@ public class ChartHyperRelateCellLinkPane extends AbstractHyperLinkPane