From 7ddd02599c4cb85fdc0a1f0a7c4ce37a09efe16e Mon Sep 17 00:00:00 2001
From: Prasanta Sadhukhan <psadhukhan@openjdk.org>
Date: Mon, 22 Jul 2024 13:19:30 +0000
Subject: [PATCH] 4265389: JSplitPane does not support ComponentOrientation

Reviewed-by: tr, abhiscxk
---
 .../share/classes/javax/swing/JSplitPane.java | 27 +++++++
 .../TestSplitPaneOrientationTest.java         | 71 +++++++++++++++++++
 2 files changed, 98 insertions(+)
 create mode 100644 test/jdk/javax/swing/JSplitPane/TestSplitPaneOrientationTest.java

diff --git a/src/java.desktop/share/classes/javax/swing/JSplitPane.java b/src/java.desktop/share/classes/javax/swing/JSplitPane.java
index 7d4482af07e..90f3efb3e69 100644
--- a/src/java.desktop/share/classes/javax/swing/JSplitPane.java
+++ b/src/java.desktop/share/classes/javax/swing/JSplitPane.java
@@ -26,6 +26,7 @@
 package javax.swing;
 
 import java.awt.Component;
+import java.awt.ComponentOrientation;
 import java.awt.Graphics;
 import java.beans.BeanProperty;
 import java.beans.ConstructorProperties;
@@ -362,6 +363,32 @@ public class JSplitPane extends JComponent implements Accessible
 
     }
 
+    /**
+     * {@inheritDoc}
+     * @param orientation {@inheritDoc}
+     */
+    @Override
+    public void setComponentOrientation(ComponentOrientation orientation) {
+        super.setComponentOrientation(orientation);
+        Component leftComponent = this.getLeftComponent();
+        Component rightComponent = this.getRightComponent();
+        if (!this.getComponentOrientation().isLeftToRight()) {
+            if (rightComponent != null) {
+                setLeftComponent(rightComponent);
+            }
+            if (leftComponent != null) {
+                setRightComponent(leftComponent);
+            }
+        } else {
+            if (leftComponent != null) {
+                setLeftComponent(leftComponent);
+            }
+            if (rightComponent != null) {
+                setRightComponent(rightComponent);
+            }
+        }
+    }
+
     /**
      * {@inheritDoc}
      * @param enabled {@inheritDoc}
diff --git a/test/jdk/javax/swing/JSplitPane/TestSplitPaneOrientationTest.java b/test/jdk/javax/swing/JSplitPane/TestSplitPaneOrientationTest.java
new file mode 100644
index 00000000000..01dfebcb5c2
--- /dev/null
+++ b/test/jdk/javax/swing/JSplitPane/TestSplitPaneOrientationTest.java
@@ -0,0 +1,71 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 4265389
+ * @summary  Verifies JSplitPane support ComponentOrientation
+ * @run main TestSplitPaneOrientationTest
+ */
+
+import java.awt.ComponentOrientation;
+import javax.swing.JButton;
+import javax.swing.JSplitPane;
+import javax.swing.SwingUtilities;
+import javax.swing.UIManager;
+import javax.swing.UnsupportedLookAndFeelException;
+
+public class TestSplitPaneOrientationTest {
+
+    private static void setLookAndFeel(UIManager.LookAndFeelInfo laf) {
+        try {
+            UIManager.setLookAndFeel(laf.getClassName());
+        } catch (UnsupportedLookAndFeelException ignored) {
+            System.out.println("Unsupported LAF: " + laf.getClassName());
+        } catch (ClassNotFoundException | InstantiationException
+                 | IllegalAccessException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    public static void main(String[] args) throws Exception {
+        for (UIManager.LookAndFeelInfo laf : UIManager.getInstalledLookAndFeels()) {
+            System.out.println("Testing LAF : " + laf.getClassName());
+
+            SwingUtilities.invokeAndWait(() -> {
+                setLookAndFeel(laf);
+                JSplitPane jsp = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT,
+                                                new JButton("Left"), new JButton("Right"));
+                jsp.setComponentOrientation(ComponentOrientation.RIGHT_TO_LEFT);
+                if (jsp.getRightComponent() instanceof JButton button) {
+                    System.out.println(button.getText());
+                    if (!button.getText().equals("Left")) {
+                        throw new RuntimeException("JSplitPane did not support ComponentOrientation");
+                    }
+                }
+            });
+        }
+    }
+
+}
+