From 6410135d9238f7d16599773a03faf67ffcfb9779 Mon Sep 17 00:00:00 2001
From: obo <Obo@fanruan.com>
Date: Tue, 6 Aug 2024 10:19:58 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=99=A8-=E5=87=BD=E6=95=B0?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=99=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/fr/design/border/UITitledBorder.java  | 5 +++--
 .../data/tabledata/tabledatapane/ClassNameSelectPane.java   | 4 +++-
 .../java/com/fr/design/formula/FunctionManagerPane.java     | 6 ++++--
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/designer-base/src/main/java/com/fr/design/border/UITitledBorder.java b/designer-base/src/main/java/com/fr/design/border/UITitledBorder.java
index 875ef00833..249f6d277c 100644
--- a/designer-base/src/main/java/com/fr/design/border/UITitledBorder.java
+++ b/designer-base/src/main/java/com/fr/design/border/UITitledBorder.java
@@ -1,5 +1,6 @@
 package com.fr.design.border;
 
+import com.fr.base.i18n.BidiUtils;
 import com.fr.design.constants.UIConstants;
 
 import javax.swing.BorderFactory;
@@ -14,11 +15,11 @@ public class UITitledBorder extends TitledBorder {
     private static final long serialVersionUID = 1L;
 
     public static UITitledBorder createBorderWithTitle(String title) {
-        return new UITitledBorder(title);
+        return BidiUtils.applyTitledBorderJustification(new UITitledBorder(title));
     }
 
     public static UITitledBorder createBorderWithTitle(String title, int roundedCorner) {
-        return new UITitledBorder(title, roundedCorner);
+        return BidiUtils.applyTitledBorderJustification(new UITitledBorder(title, roundedCorner));
     }
 
     private UITitledBorder(String title) {
diff --git a/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/ClassNameSelectPane.java b/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/ClassNameSelectPane.java
index 08f0c1f154..ebb2f448b3 100644
--- a/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/ClassNameSelectPane.java
+++ b/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/ClassNameSelectPane.java
@@ -1,5 +1,6 @@
 package com.fr.design.data.tabledata.tabledatapane;
 
+import com.fr.base.i18n.BidiUtils;
 import com.fr.design.dialog.BasicPane;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.gui.itree.filetree.ClassFileTree;
@@ -20,13 +21,14 @@ public class ClassNameSelectPane extends BasicPane {
         this.add(webDirectoryPane, BorderLayout.NORTH);
         webDirectoryPane.setBorder(BorderFactory.createEmptyBorder(2, 0, 2, 0));
         webDirectoryPane.add(new UILabel(
-                com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Function_Choose_Function_Class") + ":"));
+                BidiUtils.reverseConcatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Function_Choose_Function_Class"), ":")));
 
         classFileTree = new ClassFileTree();
         classFileTree.refreshEnv();
         classFileTree.getSelectionModel().setSelectionMode(
                 TreeSelectionModel.SINGLE_TREE_SELECTION);
         this.add(new JScrollPane(classFileTree), BorderLayout.CENTER);
+        BidiUtils.applyOrientationByLocale(this);
     }
     
     @Override
diff --git a/designer-base/src/main/java/com/fr/design/formula/FunctionManagerPane.java b/designer-base/src/main/java/com/fr/design/formula/FunctionManagerPane.java
index c40a917e39..50716f21e2 100644
--- a/designer-base/src/main/java/com/fr/design/formula/FunctionManagerPane.java
+++ b/designer-base/src/main/java/com/fr/design/formula/FunctionManagerPane.java
@@ -1,5 +1,6 @@
 package com.fr.design.formula;
 
+import com.fr.base.i18n.BidiUtils;
 import com.fr.design.beans.BasicBeanPane;
 import com.fr.design.data.tabledata.tabledatapane.ClassNameSelectPane;
 import com.fr.design.dialog.BasicDialog;
@@ -143,7 +144,7 @@ public class FunctionManagerPane extends BasicPane {
             reportletNamePane.add(editorButton);
             editorButton.addActionListener(createEditorButtonActionListener());
             JPanel classNamePane = FRGUIPaneFactory.createBorderLayout_S_Pane();
-            classNamePane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_DS_Class_Name") + ":"), BorderLayout.NORTH);
+            classNamePane.add(new UILabel(BidiUtils.reverseConcatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_DS_Class_Name"), ":")), BorderLayout.NORTH);
             classNamePane.add(reportletNamePane, BorderLayout.CENTER);
             northPane.add(classNamePane);
             DescriptionTextArea descriptionArea = new DescriptionTextArea();
@@ -158,9 +159,10 @@ public class FunctionManagerPane extends BasicPane {
             JPanel descriptionPane = FRGUIPaneFactory.createBorderLayout_S_Pane();  //Description Pane
             this.add(descriptionPane, BorderLayout.SOUTH);
             descriptionPane.setBorder(BorderFactory.createEmptyBorder(4, 4, 4, 4));
-            descriptionPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Description") + ":"), BorderLayout.NORTH);
+            descriptionPane.add(new UILabel(BidiUtils.reverseConcatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Description"), ":")), BorderLayout.NORTH);
             this.descriptionTextArea = new UITextArea(6, 24);
             descriptionPane.add(new JScrollPane(this.descriptionTextArea), BorderLayout.CENTER);
+            BidiUtils.applyOrientationByLocale(this);
         }
 
         private String getEscapePath(String path) {