From 2b1f0ce209d4ad312092a0aa83107d83a5f25a37 Mon Sep 17 00:00:00 2001
From: obo <Obo@fanruan.com>
Date: Tue, 6 Aug 2024 10:20:37 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=99=A8-=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E8=BF=9E=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../data/datapane/connect/AdvancePane.java    | 12 ++++++++----
 .../connect/ConnectionManagerPane.java        |  2 ++
 .../connect/DatabaseConnectionPane.java       |  4 +++-
 .../data/datapane/connect/JDBCDefPane.java    | 19 ++++++++++---------
 .../data/datapane/connect/JNDIDefPane.java    | 14 ++++++++++----
 .../gui/controlpane/JListControlPane.java     |  3 ++-
 6 files changed, 35 insertions(+), 19 deletions(-)

diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/connect/AdvancePane.java b/designer-base/src/main/java/com/fr/design/data/datapane/connect/AdvancePane.java
index 7784aa5712..b6ea5a1080 100644
--- a/designer-base/src/main/java/com/fr/design/data/datapane/connect/AdvancePane.java
+++ b/designer-base/src/main/java/com/fr/design/data/datapane/connect/AdvancePane.java
@@ -1,5 +1,6 @@
 package com.fr.design.data.datapane.connect;
 
+import com.fr.base.i18n.BidiUtils;
 import com.fr.data.impl.JDBCDatabaseConnection;
 import com.fr.data.pool.DBCPConnectionPoolAttr;
 import com.fr.design.dialog.BasicPane;
@@ -41,10 +42,10 @@ public class AdvancePane extends BasicPane {
         double[] rowSizeDbcp = {p, p, p, p};
         double[] columnDbcp = {190, p};
         Component[][] comps = {
-                {new UILabel(Toolkit.i18nText("Fine-Design_Basic_Dbcp_Max_Active") + ":", SwingConstants.RIGHT), DBCP_MAX_ACTIVE},
-                {new UILabel(Toolkit.i18nText("Fine-Design_Basic_Dbcp_Validation_Query") + ":", SwingConstants.RIGHT), DBCP_VALIDATION_QUERY},
-                {new UILabel(Toolkit.i18nText("Fine-Design_Basic_Dbcp_Test_On_Borrow") + ":", SwingConstants.RIGHT), DBCP_TESTONBORROW},
-                {new UILabel(Toolkit.i18nText("Fine-Design_Basic_Connection_Pool_Max_Wait_Time") + ":", SwingConstants.RIGHT), DBCP_MAX_WAIT}
+                {createUILabel("Fine-Design_Basic_Dbcp_Max_Active"), DBCP_MAX_ACTIVE},
+                {createUILabel("Fine-Design_Basic_Dbcp_Validation_Query"), DBCP_VALIDATION_QUERY},
+                {createUILabel("Fine-Design_Basic_Dbcp_Test_On_Borrow"), DBCP_TESTONBORROW},
+                {createUILabel("Fine-Design_Basic_Connection_Pool_Max_Wait_Time"), DBCP_MAX_WAIT}
         };
 
         JPanel contextPane = TableLayoutHelper.createGapTableLayoutPane(comps, rowSizeDbcp, columnDbcp, 11, 11);
@@ -52,6 +53,9 @@ public class AdvancePane extends BasicPane {
         this.add(jPanel);
     }
 
+    private UILabel createUILabel(String i18nKey) {
+        return new UILabel(BidiUtils.reverseConcatenateStrings(Toolkit.i18nText(i18nKey), ":"), BidiUtils.rtl() ? SwingConstants.LEFT : SwingConstants.RIGHT);
+    }
 
     public void populate(JDBCDatabaseConnection jdbcDatabase) {
         DBCPConnectionPoolAttr dbcpAttr = jdbcDatabase.getDbcpAttr();
diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/connect/ConnectionManagerPane.java b/designer-base/src/main/java/com/fr/design/data/datapane/connect/ConnectionManagerPane.java
index eadf456e09..dcbd1f6bb5 100644
--- a/designer-base/src/main/java/com/fr/design/data/datapane/connect/ConnectionManagerPane.java
+++ b/designer-base/src/main/java/com/fr/design/data/datapane/connect/ConnectionManagerPane.java
@@ -1,5 +1,6 @@
 package com.fr.design.data.datapane.connect;
 
+import com.fr.base.i18n.BidiUtils;
 import com.fr.design.gui.frpane.LoadingBasicPane;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.file.ConnectionConfig;
@@ -21,6 +22,7 @@ public class ConnectionManagerPane extends LoadingBasicPane implements Connectio
             }
         };
         container.add(connectionListPane, BorderLayout.CENTER);
+        BidiUtils.applyOrientationByLocale(this);
     }
 
     @Override
diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/connect/DatabaseConnectionPane.java b/designer-base/src/main/java/com/fr/design/data/datapane/connect/DatabaseConnectionPane.java
index 11c3f64d64..f60e2bd8fc 100644
--- a/designer-base/src/main/java/com/fr/design/data/datapane/connect/DatabaseConnectionPane.java
+++ b/designer-base/src/main/java/com/fr/design/data/datapane/connect/DatabaseConnectionPane.java
@@ -3,6 +3,7 @@
  */
 package com.fr.design.data.datapane.connect;
 
+import com.fr.base.i18n.BidiUtils;
 import com.fr.data.driver.util.JarFileParseUtil;
 import com.fr.data.impl.Connection;
 import com.fr.data.impl.JDBCDatabaseConnection;
@@ -278,9 +279,10 @@ public abstract class DatabaseConnectionPane<E extends com.fr.data.impl.Connecti
             String[] defaultEncode = new String[]{Toolkit.i18nText("Fine-Design_Encode_Auto")};
             charSetComboBox = new UIComboBox(ArrayUtils.addAll(defaultEncode, EncodeConstants.ENCODING_ARRAY));
             JPanel chartSetPane = FRGUIPaneFactory.createNColumnGridInnerContainer_S_Pane(2);
-            chartSetPane.add(GUICoreUtils.createNamedPane(charSetComboBox, Toolkit.i18nText("Fine-Design_Basic_Datasource_Charset") + ":"));
+            chartSetPane.add(GUICoreUtils.createNamedPane(charSetComboBox, Toolkit.i18nText(BidiUtils.reverseConcatenateStrings("Fine-Design_Basic_Datasource_Charset"), ":")));
             advancedPanel.add(chartSetPane);
         }
+        BidiUtils.applyOrientationByLocale(advancedPanel);
         northPane.add(advancedPanel);
     }
 
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 e8c7c17b8e..86d7513236 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
@@ -1,6 +1,7 @@
 package com.fr.design.data.datapane.connect;
 
 import com.fr.base.GraphHelper;
+import com.fr.base.i18n.BidiUtils;
 import com.fr.data.driver.DriverLoader;
 import com.fr.data.driver.config.DriverLoaderConfig;
 import com.fr.data.impl.JDBCDatabaseConnection;
@@ -162,7 +163,7 @@ public class JDBCDefPane extends JPanel {
 
     public JDBCDefPane() {
         initMap();
-        this.setBorder(UITitledBorder.createBorderWithTitle("JDBC" + ":"));
+        this.setBorder(BidiUtils.applyTitledBorderJustification(UITitledBorder.createBorderWithTitle("JDBC" + ":")));
         this.setLayout(FRGUIPaneFactory.createLabelFlowLayout());
         JPanel innerthis = FRGUIPaneFactory.createY_AXISBoxInnerContainer_L_Pane();
         innerthis.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
@@ -206,14 +207,14 @@ public class JDBCDefPane extends JPanel {
         double p = TableLayout.PREFERRED;
         double f = TableLayout.FILL;
         JPanel dbtypePane = FRGUIPaneFactory.createRightFlowInnerContainer_S_Pane();
-        dbtypePane.add(new UILabel((Toolkit.i18nText("Fine-Design_Basic_Database") + ":")));
+        dbtypePane.add(new UILabel(BidiUtils.reverseConcatenateStrings(Toolkit.i18nText("Fine-Design_Basic_Database"), ":")));
         Component[][] dbtypeComComponents = {{dbtypeComboBox}};
         double[] dbtypeRowSize = {p};
         double[] dbtypeColumnSize = {p};
         JPanel dbtypeComPane = TableLayoutHelper.createTableLayoutPane(dbtypeComComponents, dbtypeRowSize, dbtypeColumnSize);
 
         JPanel driverPane = FRGUIPaneFactory.createRightFlowInnerContainer_S_Pane();
-        driverPane.add(new UILabel(Toolkit.i18nText("Fine-Design_Basic_Driver") + ":"));
+        driverPane.add(new UILabel(BidiUtils.reverseConcatenateStrings(Toolkit.i18nText("Fine-Design_Basic_Driver"), ":")));
         // 选择ODBC数据源的时候的提示链接
         JPanel odbcTipsPane = FRGUIPaneFactory.createRightFlowInnerContainer_S_Pane();
         odbcTipsLink = new ActionLabel(Toolkit.i18nText("Fine-Design_Basic_Odbc_Tips")) {
@@ -262,21 +263,21 @@ public class JDBCDefPane extends JPanel {
         driverComboBoxAndTips.add(odbcTipsPane, BorderLayout.CENTER);
 
         JPanel hostPane = FRGUIPaneFactory.createRightFlowInnerContainer_S_Pane();
-        hostPane.add(new UILabel(Toolkit.i18nText("Fine-Design_Basic_Host") + ":"));
+        hostPane.add(new UILabel(BidiUtils.reverseConcatenateStrings(Toolkit.i18nText("Fine-Design_Basic_Host"), ":")));
         Component[][] hostComComponents = {{hostTextField}};
         double[] hostRowSize = {p};
         double[] hostColumnSize = {p};
         JPanel hostComPane = TableLayoutHelper.createTableLayoutPane(hostComComponents, hostRowSize, hostColumnSize);
 
         JPanel portPane = FRGUIPaneFactory.createRightFlowInnerContainer_S_Pane();
-        portPane.add(new UILabel(Toolkit.i18nText("Fine-Design_Basic_Port") + ":"));
+        portPane.add(new UILabel(BidiUtils.reverseConcatenateStrings(Toolkit.i18nText("Fine-Design_Basic_Port"), ":")));
         Component[][] portComComponents = {{portTextField}};
         double[] portRowSize = {p};
         double[] portColumnSize = {p};
         JPanel portComPane = TableLayoutHelper.createTableLayoutPane(portComComponents, portRowSize, portColumnSize);
 
         JPanel dbNamePane = FRGUIPaneFactory.createRightFlowInnerContainer_S_Pane();
-        dbNamePane.add(new UILabel(Toolkit.i18nText("Fine-Design_Basic_DatabaseName") + ":"));
+        dbNamePane.add(new UILabel(BidiUtils.reverseConcatenateStrings(Toolkit.i18nText("Fine-Design_Basic_DatabaseName"), ":")));
         Component[][] dbNameComComponents = {{dbNameTextField}};
         double[] dbNameRowSize = {p};
         double[] dbNameColumnSize = {p};
@@ -290,8 +291,8 @@ public class JDBCDefPane extends JPanel {
         JPanel urlComPane = TableLayoutHelper.createCommonTableLayoutPane(urlComComponents, urlRowSize, urlColumnSize, 4);
 
         JPanel userPane = FRGUIPaneFactory.createRightFlowInnerContainer_S_Pane();
-        userPane.add(new UILabel(Toolkit.i18nText("Fine-Design_Report_UserName") + ":"));
-        Component[][] userComComponents = {{userNameTextField, new UILabel(Toolkit.i18nText("Fine-Design_Basic_Password") + ":"), passwordTextField}};
+        userPane.add(new UILabel(BidiUtils.reverseConcatenateStrings(Toolkit.i18nText("Fine-Design_Report_UserName"), ":")));
+        Component[][] userComComponents = {{userNameTextField, new UILabel(BidiUtils.reverseConcatenateStrings(Toolkit.i18nText("Fine-Design_Basic_Password"), ":")), passwordTextField}};
         double[] userRowSize = {p};
         double[] userColumnSize = {f, p, f};
         JPanel userComPane = TableLayoutHelper.createCommonTableLayoutPane(userComComponents, userRowSize, userColumnSize, 4);
@@ -299,7 +300,7 @@ public class JDBCDefPane extends JPanel {
         String[] defaultEncode = new String[]{Toolkit.i18nText("Fine-Design_Encode_Auto")};
         charSetComboBox = new UIComboBox(ArrayUtils.addAll(defaultEncode, EncodeConstants.ENCODING_ARRAY));
         JPanel chartSetPane = FRGUIPaneFactory.createRightFlowInnerContainer_S_Pane();
-        chartSetPane.add(new UILabel(Toolkit.i18nText("Fine-Design_Basic_Datasource_Charset") + ":"));
+        chartSetPane.add(new UILabel(BidiUtils.reverseConcatenateStrings(Toolkit.i18nText("Fine-Design_Basic_Datasource_Charset"), ":")));
         Component[][] charSetComComponents = {{charSetComboBox}};
         double[] charSetRowSize = {p};
         double[] charSetColumnSize = {f};
diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/connect/JNDIDefPane.java b/designer-base/src/main/java/com/fr/design/data/datapane/connect/JNDIDefPane.java
index e99d99ca4d..cbf29aa22d 100644
--- a/designer-base/src/main/java/com/fr/design/data/datapane/connect/JNDIDefPane.java
+++ b/designer-base/src/main/java/com/fr/design/data/datapane/connect/JNDIDefPane.java
@@ -3,6 +3,7 @@ package com.fr.design.data.datapane.connect;
 import java.awt.BorderLayout;
 import java.awt.Component;
 import java.awt.Dimension;
+import java.awt.FlowLayout;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.util.HashMap;
@@ -13,6 +14,8 @@ import java.util.Properties;
 import javax.naming.Context;
 import javax.swing.BorderFactory;
 import javax.swing.JDialog;
+
+import com.fr.base.i18n.BidiUtils;
 import com.fr.design.gui.ilable.UILabel;
 import javax.swing.JPanel;
 import javax.swing.JScrollPane;
@@ -73,9 +76,11 @@ public class JNDIDefPane extends JPanel {
 		// NorthPane
 		JPanel nContentPane = FRGUIPaneFactory.createNormalFlowInnerContainer_M_Pane();
 		innerthis.add(nContentPane);
-		nContentPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Datasource_JNDI_Name") + ":"));
+
+		nContentPane.add(new UILabel(BidiUtils.reverseConcatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Datasource_JNDI_Name"), ":")));
 		jndiNameTextField = new UITextField(20);
 		nContentPane.add(jndiNameTextField, BorderLayout.NORTH);
+		BidiUtils.applyOrientationByLocale(nContentPane);
 
 		// CenterPane
 		JPanel outcenterPane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Datasource_Context"));
@@ -95,9 +100,10 @@ public class JNDIDefPane extends JPanel {
 		double p = TableLayout.PREFERRED;
 		double[] rowSize = { p, p, p, p };
 		double[] columnSize = { f, f };
-		Component[][] comps = { { new UILabel("INITIAL_CONTEXT_FACTORY:", SwingConstants.RIGHT), JNDIFactoryComboBox },
-				{ new UILabel("PROVIDER_URL:", SwingConstants.RIGHT), PROVIDER_URL_TF }, { new UILabel("SECURITY_PRINCIPAL:", SwingConstants.RIGHT), SECURITY_PRINCIPAL_TF },
-				{ new UILabel("SECURITY_CREDENTIALS:", SwingConstants.RIGHT), SECURITY_CREDENTIALS_TF } };
+		Component[][] comps = { { new UILabel(BidiUtils.reverseConcatenateStrings("INITIAL_CONTEXT_FACTORY", ":"), BidiUtils.rtl() ? SwingConstants.LEFT : SwingConstants.RIGHT), JNDIFactoryComboBox },
+				{ new UILabel(BidiUtils.reverseConcatenateStrings("PROVIDER_URL", ":"), BidiUtils.rtl() ? SwingConstants.LEFT : SwingConstants.RIGHT), PROVIDER_URL_TF },
+				{ new UILabel(BidiUtils.reverseConcatenateStrings("SECURITY_PRINCIPAL", ":"), BidiUtils.rtl() ? SwingConstants.LEFT : SwingConstants.RIGHT), SECURITY_PRINCIPAL_TF },
+				{ new UILabel(BidiUtils.reverseConcatenateStrings("SECURITY_CREDENTIALS", ":"), BidiUtils.rtl() ? SwingConstants.LEFT : SwingConstants.RIGHT), SECURITY_CREDENTIALS_TF } };
 		centerPane.add(TableLayoutHelper.createCommonTableLayoutPane(comps, rowSize, columnSize, 2));
 
 		// ActionLabel
diff --git a/designer-base/src/main/java/com/fr/design/gui/controlpane/JListControlPane.java b/designer-base/src/main/java/com/fr/design/gui/controlpane/JListControlPane.java
index dfece2e133..de4fa102ae 100644
--- a/designer-base/src/main/java/com/fr/design/gui/controlpane/JListControlPane.java
+++ b/designer-base/src/main/java/com/fr/design/gui/controlpane/JListControlPane.java
@@ -1,5 +1,6 @@
 package com.fr.design.gui.controlpane;
 
+import com.fr.base.i18n.BidiUtils;
 import com.fr.design.beans.BasicBeanPane;
 import com.fr.design.dialog.FineJOptionPane;
 import com.fr.design.gui.icontainer.UIScrollPane;
@@ -363,7 +364,7 @@ public abstract class JListControlPane extends JControlPane implements ListContr
             this.textLabel.setBorder(BorderFactory.createEmptyBorder(1, 0, 1, 1));
             this.iconLabel.setBorder(BorderFactory.createEmptyBorder(1, 1, 1, 0));
             add(this.textLabel, BorderLayout.CENTER);
-            add(this.iconLabel, BorderLayout.WEST);
+            add(this.iconLabel, BidiUtils.rtl() ? BorderLayout.EAST : BorderLayout.WEST);
             this.iconLabel.setBackground(Color.WHITE);
             //iconLabel和textLabel的背景颜色不会被JList背景颜色覆盖,开发者自定义
             this.textLabel.setOpaque(true);