From 413256eb19d02e7dcfae3031cee0535da6f277ed Mon Sep 17 00:00:00 2001 From: obo Date: Mon, 19 Aug 2024 10:37:44 +0800 Subject: [PATCH] =?UTF-8?q?INO-21074=20=E6=9C=8D=E5=8A=A1=E5=99=A8?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E8=BF=9E=E6=8E=A5ssl=E9=9D=A2=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fr/design/data/datapane/connect/AdvancePane.java | 3 ++- .../java/com/fr/design/data/datapane/connect/SslPane.java | 6 +++++- 2 files changed, 7 insertions(+), 2 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 26543691f3..fa7323586f 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; @@ -49,7 +50,7 @@ public class AdvancePane extends BasicPane { JPanel contextPane = TableLayoutHelper.createGapTableLayoutPane(comps, rowSizeDbcp, columnDbcp, 11, 11); jPanel.add(contextPane, BorderLayout.CENTER); - this.add(jPanel); + this.add(BidiUtils.applyOrientationByLocale(jPanel)); } diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/connect/SslPane.java b/designer-base/src/main/java/com/fr/design/data/datapane/connect/SslPane.java index 8789a39a18..4188fdf105 100644 --- a/designer-base/src/main/java/com/fr/design/data/datapane/connect/SslPane.java +++ b/designer-base/src/main/java/com/fr/design/data/datapane/connect/SslPane.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.security.ssl.Ssl; import com.fr.data.security.ssl.SslException; @@ -84,9 +85,12 @@ public class SslPane extends BasicPane { }; usingSsl.setSelected(true); contextPane = TableLayoutHelper.createGapTableLayoutPane(usingComps, new double[]{p, p, p, p}, columnSize, 11, 11); - jPanel.add(usingSsl, BorderLayout.NORTH); + JPanel sslPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); + sslPane.add(usingSsl, BorderLayout.LINE_START); + jPanel.add(sslPane, BorderLayout.NORTH); jPanel.add(contextPane, BorderLayout.CENTER); this.add(jPanel); + BidiUtils.applyOrientationByLocale(this); usingSsl.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent e) {