8299123: [BACKOUT] 4512626 Non-editable JTextArea provides no visual indication of keyboard focus

Reviewed-by: tschatzl

Author: Daniel D. Daugherty

src/java.desktop/share/classes/javax/swing/text/DefaultCaret.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2022, 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
@@ -366,8 +366,6 @@ protected void moveCaret(MouseEvent e) {
         }
     }
 
-    private int savedBlinkRate = 0;
-    private boolean isBlinkRateSaved = false;
     // --- FocusListener methods --------------------------
 
     /**
@@ -381,21 +379,8 @@ protected void moveCaret(MouseEvent e) {
     public void focusGained(FocusEvent e) {
         if (component.isEnabled()) {
             if (component.isEditable()) {
-                if (isBlinkRateSaved) {
-                    setBlinkRate(savedBlinkRate);
-                    savedBlinkRate = 0;
-                    isBlinkRateSaved = false;
-                }
-            } else {
-                if (getBlinkRate() != 0) {
-                    if (!isBlinkRateSaved) {
-                        savedBlinkRate = getBlinkRate();
-                        isBlinkRateSaved = true;
-                    }
-                    setBlinkRate(0);
-                }
+                setVisible(true);
             }
-            setVisible(true);
             setSelectionVisible(true);
             updateSystemSelection();
         }
@@ -1046,34 +1031,17 @@ public void setVisible(boolean e) {
      * @see Caret#setBlinkRate
      */
     public void setBlinkRate(int rate) {
-        if (rate < 0) {
-            throw new IllegalArgumentException("Invalid blink rate: " + rate);
-        }
         if (rate != 0) {
-            if (component.isEditable()) {
-                if (flasher == null) {
-                    flasher = new Timer(rate, handler);
-                }
-                flasher.setDelay(rate);
-                if (!flasher.isRunning()){
-                    flasher.restart();
-                }
-            } else {
-                savedBlinkRate = rate;
-                isBlinkRateSaved = true;
+            if (flasher == null) {
+                flasher = new Timer(rate, handler);
             }
+            flasher.setDelay(rate);
         } else {
             if (flasher != null) {
                 flasher.stop();
                 flasher.removeActionListener(handler);
                 flasher = null;
             }
-            if (component.isEditable()) {
-                if (isBlinkRateSaved) {
-                    savedBlinkRate = 0;
-                    isBlinkRateSaved = false;
-                }
-            }
         }
     }
 
@@ -1085,9 +1053,6 @@ public void setBlinkRate(int rate) {
      * @see Caret#getBlinkRate
      */
     public int getBlinkRate() {
-        if (isBlinkRateSaved) {
-            return savedBlinkRate;
-        }
         return (flasher == null) ? 0 : flasher.getDelay();
     }
 

test/jdk/ProblemList.txt

@@ -657,6 +657,8 @@ javax/swing/JPopupMenu/6800513/bug6800513.java 7184956 macosx-all
 javax/swing/JTabbedPane/8007563/Test8007563.java 8051591 generic-all
 javax/swing/JTabbedPane/4624207/bug4624207.java 8064922 macosx-all
 javax/swing/SwingUtilities/TestBadBreak/TestBadBreak.java 8160720 generic-all
+javax/swing/text/DefaultCaret/HidingSelection/HidingSelectionTest.java 8194048 windows-all
+javax/swing/text/DefaultCaret/HidingSelection/MultiSelectionTest.java 8213562 linux-all
 javax/swing/JFileChooser/6798062/bug6798062.java 8146446 windows-all
 javax/swing/JPopupMenu/4870644/bug4870644.java 8194130 macosx-all,linux-all
 javax/swing/dnd/8139050/NativeErrorsInTableDnD.java 8202765  macosx-all,linux-all

test/jdk/javax/swing/text/DefaultCaret/HidingSelection/HidingSelectionTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 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
@@ -21,17 +21,10 @@
  * questions.
  */
 
-import javax.swing.JFrame;
-import javax.swing.JMenu;
-import javax.swing.JMenuBar;
-import javax.swing.JMenuItem;
-import javax.swing.JTextField;
-import javax.swing.MenuSelectionManager;
-import javax.swing.SwingUtilities;
-import java.awt.FlowLayout;
-import java.awt.Point;
-import java.awt.Robot;
+import javax.swing.*;
+import java.awt.*;
 import java.awt.event.InputEvent;
+import java.awt.image.BufferedImage;
 
 /**
  * @test
@@ -46,6 +39,7 @@ public class HidingSelectionTest {
     private static JTextField field1;
     private static JTextField field2;
     private static JFrame frame;
+    private static Rectangle bounds;
     private static JMenu menu;
     private static JTextField anotherWindow;
     private static Point menuLoc;
@@ -73,9 +67,17 @@ public static void main(String[] args) throws Exception {
         Robot robot = new Robot();
         robot.waitForIdle();
         robot.delay(200);
+        SwingUtilities.invokeAndWait(() -> {
+            bounds = field2.getBounds();
+            bounds.setLocation(field2.getLocationOnScreen());
+        });
+        BufferedImage nosel = robot.createScreenCapture(bounds);
 
         SwingUtilities.invokeAndWait(field2::requestFocus);
         SwingUtilities.invokeAndWait(field2::selectAll);
+        robot.waitForIdle();
+        robot.delay(200);
+        BufferedImage sel = robot.createScreenCapture(bounds);
 
         SwingUtilities.invokeAndWait(() -> {
             menuLoc = menu.getLocationOnScreen();
@@ -87,7 +89,7 @@ public static void main(String[] args) throws Exception {
         robot.mouseRelease(InputEvent.BUTTON1_DOWN_MASK);
         robot.waitForIdle();
         robot.delay(200);
-        if (!field2.getCaret().isSelectionVisible()) {
+        if (!biEqual(robot.createScreenCapture(bounds), sel)) {
             throw new RuntimeException("Test fails: menu hides selection");
         }
 
@@ -96,7 +98,7 @@ public static void main(String[] args) throws Exception {
         SwingUtilities.invokeAndWait(field1::requestFocus);
         robot.waitForIdle();
         robot.delay(200);
-        if (field2.getCaret().isSelectionVisible()) {
+        if (!biEqual(robot.createScreenCapture(bounds), nosel)) {
             throw new RuntimeException(
                     "Test fails: focus lost doesn't hide selection");
         }
@@ -117,12 +119,35 @@ public static void main(String[] args) throws Exception {
         SwingUtilities.invokeAndWait(anotherWindow::requestFocus);
         robot.waitForIdle();
         robot.delay(200);
-        if (!field2.getCaret().isSelectionVisible()) {
+        if (biEqual(robot.createScreenCapture(bounds), nosel)) {
             throw new RuntimeException(
                     "Test fails: switch window hides selection");
         }
 
+        SwingUtilities.invokeAndWait(anotherWindow::selectAll);
+        robot.waitForIdle();
+        robot.delay(200);
+        if (biEqual(robot.createScreenCapture(bounds), sel)) {
+            throw new RuntimeException(
+                "Test fails: selection ownership is lost selection is shown");
+        }
+
         SwingUtilities.invokeLater(frame2::dispose);
         SwingUtilities.invokeLater(frame::dispose);
     }
+
+    static boolean biEqual(BufferedImage i1, BufferedImage i2) {
+        if (i1.getWidth() == i2.getWidth() &&
+                                         i1.getHeight() == i2.getHeight()) {
+            for (int x = 0; x < i1.getWidth(); x++) {
+                for (int y = 0; y < i1.getHeight(); y++) {
+                    if (i1.getRGB(x, y) != i2.getRGB(x, y)) {
+                        return false;
+                    }
+                }
+            }
+            return true;
+        }
+        return false;
+    }
 }