From 361d746324be9c4bc2efcbb59243f1e59e3d8c2a Mon Sep 17 00:00:00 2001
From: obo <Obo@fanruan.com>
Date: Tue, 6 Aug 2024 16:29:57 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E4=B8=80=E4=B8=8Btitleborder=E7=9A=84?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/fr/base/i18n/BidiUtils.java   | 17 ++++++++++++++++-
 .../design/javascript/JavaScriptImplPane.java   |  4 +---
 .../impl/ChartHyperRelateCellLinkPane.java      |  4 +---
 .../impl/ChartHyperRelateFloatLinkPane.java     |  4 +---
 .../headerfooter/HeaderFooterEditPane.java      |  4 +---
 5 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/designer-base/src/main/java/com/fr/base/i18n/BidiUtils.java b/designer-base/src/main/java/com/fr/base/i18n/BidiUtils.java
index cf7d0f9f43..7e3a4f625c 100644
--- a/designer-base/src/main/java/com/fr/base/i18n/BidiUtils.java
+++ b/designer-base/src/main/java/com/fr/base/i18n/BidiUtils.java
@@ -1,5 +1,6 @@
 package com.fr.base.i18n;
 
+import javax.swing.border.TitledBorder;
 import java.awt.Component;
 import java.awt.ComponentOrientation;
 import java.awt.Container;
@@ -15,7 +16,10 @@ import java.util.Locale;
 public class BidiUtils {
 
     //private static final Locale ar = new Locale("ar", "SA");
-    private static final Locale ar = Locale.CHINA;
+    private static final Locale ar = true ? new Locale("ar", "SA") : Locale.CHINA;
+    //private static final Locale ar = Locale.CHINA;
+
+
 
     private BidiUtils() {
     }
@@ -34,6 +38,12 @@ public class BidiUtils {
         return component;
     }
 
+    public static void setOrientationByLocale(Component... components) {
+        for (Component component : components) {
+            component.setComponentOrientation(ComponentOrientation.getOrientation(ar));
+        }
+    }
+
     public static void applyOrientationByLocale(Component... components) {
         for (Component component : components) {
             component.applyComponentOrientation(ComponentOrientation.getOrientation(ar));
@@ -58,6 +68,11 @@ public class BidiUtils {
         return result.toString();
     }
 
+    public static <T extends TitledBorder> T applyTitledBorderJustification(T titledBorder) {
+        titledBorder.setTitleJustification(BidiUtils.rtl() ? TitledBorder.RIGHT : TitledBorder.LEFT);
+        return titledBorder;
+    }
+
     /**
      * 镜像BoxLayout布局组件
      */
diff --git a/designer-base/src/main/java/com/fr/design/javascript/JavaScriptImplPane.java b/designer-base/src/main/java/com/fr/design/javascript/JavaScriptImplPane.java
index f405efcdfa..6a6d3d6618 100644
--- a/designer-base/src/main/java/com/fr/design/javascript/JavaScriptImplPane.java
+++ b/designer-base/src/main/java/com/fr/design/javascript/JavaScriptImplPane.java
@@ -70,9 +70,7 @@ public class JavaScriptImplPane extends AbstractHyperLinkPane<JavaScriptImpl> {
         importedJsPane.setPreferredSize(new Dimension(265, 150));
 
         jsPane = createJSContentPane(defaultArgs);
-        TitledBorder titledBorder = BorderFactory.createTitledBorder(new ModLineBorder(ModLineBorder.TOP), Toolkit.i18nText("Fine-Design_Report_JavaScript"));
-        titledBorder.setTitleJustification(BidiUtils.rtl() ? TitledBorder.RIGHT : TitledBorder.LEFT);
-        jsPane.setBorder(titledBorder);
+        jsPane.setBorder(BidiUtils.applyTitledBorderJustification(BorderFactory.createTitledBorder(new ModLineBorder(ModLineBorder.TOP), Toolkit.i18nText("Fine-Design_Report_JavaScript"))));
 
         parameterPane.setPreferredSize(new Dimension(265, 150));
         JPanel topPane = new JPanel(new GridLayout(1,2));
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 3f918bab37..5757dff06b 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,9 +50,7 @@ public class ChartHyperRelateCellLinkPane extends AbstractHyperLinkPane<ChartHyp
 
         JPanel centerPane = FRGUIPaneFactory.createBorderLayout_L_Pane();
         this.add(centerPane, BorderLayout.CENTER);
-        TitledBorder titledBorder = GUICoreUtils.createTitledBorder(Toolkit.i18nText("Fine-Design_Chart_Hyper_Related_Cell"));
-        titledBorder.setTitleJustification(BidiUtils.rtl() ? TitledBorder.RIGHT : TitledBorder.LEFT);
-        centerPane.setBorder(titledBorder);
+        centerPane.setBorder(BidiUtils.applyTitledBorderJustification(GUICoreUtils.createTitledBorder(Toolkit.i18nText("Fine-Design_Chart_Hyper_Related_Cell"))));
 
         colRowPane = new ColumnRowVerticalPane();
         centerPane.add(colRowPane, BorderLayout.NORTH);
diff --git a/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperRelateFloatLinkPane.java b/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperRelateFloatLinkPane.java
index ab5064306d..6dccd95aaf 100644
--- a/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperRelateFloatLinkPane.java
+++ b/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperRelateFloatLinkPane.java
@@ -67,10 +67,8 @@ public class ChartHyperRelateFloatLinkPane extends AbstractHyperLinkPane<ChartHy
         BidiUtils.applyOrientationByLocale(pane);
         Border boder = new LineBorder(UIConstants.TITLED_BORDER_COLOR);
         Font font = null;
-        TitledBorder border = new TitledBorder(boder, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Hyper_Related_Float"), 4, 2, font, new Color(1, 159, 222));
-        border.setTitleJustification(BidiUtils.rtl() ? TitledBorder.RIGHT : TitledBorder.LEFT);
         // 圆角不行
-        centerPane.setBorder(border);
+        centerPane.setBorder(BidiUtils.applyTitledBorderJustification(new TitledBorder(boder, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Hyper_Related_Float"), 4, 2, font, new Color(1, 159, 222))));
 
         centerPane.add(pane, BorderLayout.NORTH);
         addPaneInCenter(centerPane);
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 dac8cbde70..a111efd8be 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
@@ -100,9 +100,7 @@ public class HeaderFooterEditPane extends JPanel {
 
 		JPanel hfPreviewContentPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
 		centerPane.add(hfPreviewContentPane, BorderLayout.CENTER);
-		TitledBorder titledBorder = GUICoreUtils.createTitledBorder(Toolkit.i18nText("Fine-Design_Basic_Preview"), null);
-		titledBorder.setTitleJustification(BidiUtils.rtl() ? TitledBorder.RIGHT : TitledBorder.LEFT);
-		hfPreviewContentPane.setBorder(titledBorder);
+		hfPreviewContentPane.setBorder(BidiUtils.applyTitledBorderJustification(GUICoreUtils.createTitledBorder(Toolkit.i18nText("Fine-Design_Basic_Preview"), null)));
 
 		hfPreviewPane = new HFPreviewPane();
 		scrollPreviewPane = new JScrollPane(hfPreviewPane);