4710675: JTextArea.setComponentOrientation does not work with correct timing

Reviewed-by: serb, pbansal

src/java.desktop/share/classes/javax/swing/plaf/basic/BasicTextUI.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2021, 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
@@ -1908,6 +1908,14 @@ public abstract class BasicTextUI extends TextUI implements ViewFactory {
             } else if ("componentOrientation" == propertyName) {
                 // Changes in ComponentOrientation require the views to be
                 // rebuilt.
+                Document document = editor.getDocument();
+                final String I18NProperty = "i18n";
+                // if a default direction of right-to-left has been specified,
+                // we want complex layout even if the text is all left to right.
+                if (ComponentOrientation.RIGHT_TO_LEFT == newValue
+                    && ! Boolean.TRUE.equals(document.getProperty(I18NProperty))) {
+                    document.putProperty(I18NProperty, Boolean.TRUE);
+                }
                 modelChanged();
             } else if ("font" == propertyName) {
                 modelChanged();

test/jdk/javax/swing/JTextArea/JTextAreaOrientationTest.java

@@ -0,0 +1,120 @@
+/*
+ * Copyright (c) 2021, 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 4710675
+ * @key headful
+ * @summary Verify JTextArea.setComponentOrientation honours RIGHT_TO_LEFT orientation.
+ * @run main JTextAreaOrientationTest
+ */
+import java.awt.ComponentOrientation;
+import java.awt.Graphics;
+import java.awt.Rectangle;
+import java.awt.image.BufferedImage;
+import java.io.File;
+import javax.imageio.ImageIO;
+import javax.swing.JFrame;
+import javax.swing.JTextArea;
+import javax.swing.SwingUtilities;
+import javax.swing.UIManager;
+import javax.swing.UnsupportedLookAndFeelException;
+
+import static java.awt.image.BufferedImage.TYPE_INT_RGB;
+
+public class JTextAreaOrientationTest  {
+
+    static JFrame frame;
+    static Rectangle bounds;
+
+    public static boolean compareBufferedImages(BufferedImage bufferedImage0, BufferedImage bufferedImage1) {
+        int width = bufferedImage0.getWidth();
+        int height = bufferedImage0.getHeight();
+
+        if (width != bufferedImage1.getWidth() || height != bufferedImage1.getHeight()) {
+            return false;
+        }
+
+        for (int y = 0; y < height; y++) {
+            for (int x = 0; x < width; x++) {
+                if (bufferedImage0.getRGB(x, y) != bufferedImage1.getRGB(x, y)) {
+                    return false;
+                }
+            }
+        }
+
+        return true;
+    }
+
+    private static void setLookAndFeel(UIManager.LookAndFeelInfo laf) {
+        try {
+            UIManager.setLookAndFeel(laf.getClassName());
+        } catch (UnsupportedLookAndFeelException ignored) {
+            System.out.println("Unsupported L&F: " + 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 L&F: " + laf.getClassName());
+            SwingUtilities.invokeAndWait(() -> setLookAndFeel(laf));
+
+            BufferedImage left = test(ComponentOrientation.LEFT_TO_RIGHT);
+            ImageIO.write(left, "png", new File("JTextAreaTest-left.png"));
+            BufferedImage right = test(ComponentOrientation.RIGHT_TO_LEFT);
+            ImageIO.write(right, "png", new File("JTextAreaTest-right.png"));
+            if (compareBufferedImages(left, right)) {
+                throw new RuntimeException("Orientation change is not effected");
+            }
+        }
+    }
+
+    private static BufferedImage test(ComponentOrientation orientation) throws Exception {
+        SwingUtilities.invokeAndWait(() -> {
+            frame = new JFrame("Swing JTextArea component");
+            JTextArea ta = new JTextArea();
+            ta.setText("Swing JTextArea component");
+            ta.setName("jtext");
+            ta.setComponentOrientation(orientation);
+            frame.getContentPane().add(ta);
+            frame.setSize(300, 100);
+            frame.setUndecorated(true);
+            frame.setLocationRelativeTo(null);
+            frame.setVisible(true);
+        });
+        Thread.sleep(1000);
+        SwingUtilities.invokeAndWait(() -> {
+            bounds = frame.getBounds();
+        });
+        BufferedImage img = new BufferedImage(bounds.width, bounds.height, TYPE_INT_RGB);
+        Graphics g = img.getGraphics();
+        frame.paint(g);
+        g.dispose();
+        Thread.sleep(1000);
+        SwingUtilities.invokeAndWait(() -> frame.dispose());
+        return img;
+    }
+}