8041705: Bugs in DefaultTreeCellRenderer.updateUI()

trebari · trebari · commit 54c017878739 · 2020-07-09T12:59:25.000+05:30
Reviewed-by: psadhukhan, pbansal
diff --git a/src/java.desktop/share/classes/javax/swing/tree/DefaultTreeCellRenderer.java b/src/java.desktop/share/classes/javax/swing/tree/DefaultTreeCellRenderer.java
@@ -32,6 +32,7 @@
 import java.awt.Graphics;
 import java.awt.Insets;
 import java.awt.Rectangle;
+import javax.swing.plaf.BorderUIResource.EmptyBorderUIResource;
 import javax.swing.plaf.ColorUIResource;
 import javax.swing.plaf.FontUIResource;
 import javax.swing.plaf.UIResource;
@@ -245,10 +246,13 @@ public void updateUI() {
                 this, ui, "Tree.drawDashedFocusIndicator", false);
 
         fillBackground = DefaultLookup.getBoolean(this, ui, "Tree.rendererFillBackground", true);
-        Insets margins = DefaultLookup.getInsets(this, ui, "Tree.rendererMargins");
-        if (margins != null) {
-            setBorder(new EmptyBorder(margins.top, margins.left,
-                    margins.bottom, margins.right));
+        if (!inited || getBorder() instanceof UIResource)  {
+            Insets margins = DefaultLookup.getInsets(this, ui, "Tree.rendererMargins");
+            if (margins != null) {
+                setBorder(new EmptyBorderUIResource(margins));
+            } else {
+                setBorder(new EmptyBorderUIResource(0, 0, 0, 0));
+            }
         }
 
         setName("Tree.cellRenderer");
diff --git a/test/jdk/javax/swing/JTree/8041705/DefaultTreeCellRendererBorderTest.java b/test/jdk/javax/swing/JTree/8041705/DefaultTreeCellRendererBorderTest.java
@@ -0,0 +1,98 @@
+/*
+ * Copyright (c) 2020, 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 8041705
+ * @summary  Bugs in DefaultTreeCellRenderer.updateUI()
+ * @key headful
+ * @run main DefaultTreeCellRendererBorderTest
+ */
+
+import java.awt.BorderLayout;
+import java.awt.Insets;
+import java.awt.Robot;
+import javax.swing.JFrame;
+import javax.swing.JTree;
+import javax.swing.SwingUtilities;
+import javax.swing.UIManager;
+import javax.swing.WindowConstants;
+import javax.swing.tree.DefaultTreeCellRenderer;
+
+public class DefaultTreeCellRendererBorderTest {
+    private static JFrame frame;
+    private static JTree tree;
+    private static DefaultTreeCellRenderer treeCellRenderer;
+    private static Robot robot;
+    private static Insets margin1;
+    private static Insets margin2;
+
+    public static void main(String[] args) throws Exception {
+        try{
+            robot = new Robot();
+            robot.setAutoDelay(50);
+            SwingUtilities.invokeAndWait(()-> {
+                frame = new JFrame();
+                tree = new JTree();
+                treeCellRenderer = new DefaultTreeCellRenderer();
+                tree.add(treeCellRenderer);
+                frame.setDefaultCloseOperation(
+                        WindowConstants.DISPOSE_ON_CLOSE);
+                frame.setSize(300,300);
+                frame.setVisible(true);
+                frame.setLayout(new BorderLayout());
+                tree.setRootVisible(true);
+                tree.setShowsRootHandles(true);
+                frame.add(tree, BorderLayout.CENTER);
+            });
+            robot.waitForIdle();
+
+            UIManager.setLookAndFeel(
+                    "javax.swing.plaf.nimbus.NimbusLookAndFeel");
+            UIManager.put("Tree.rendererMargins", new Insets(2, 2, 2, 2));
+            SwingUtilities.invokeAndWait(() -> {
+                SwingUtilities.updateComponentTreeUI(frame);
+                margin1 = treeCellRenderer.getInsets();
+            });
+            robot.waitForIdle();
+
+            UIManager.put("Tree.rendererMargins", null);
+            UIManager.setLookAndFeel(
+                    "javax.swing.plaf.metal.MetalLookAndFeel");
+            SwingUtilities.invokeAndWait(()->{
+                SwingUtilities.updateComponentTreeUI(frame);
+                margin2 = treeCellRenderer.getInsets();
+            });
+            robot.waitForIdle();
+
+            if(margin1.equals(margin2)) {
+                throw new RuntimeException("Test Failed : NimbusLookAndFeel "+
+                        "Border persists for MetalLookAndFeel");
+            }
+        } finally {
+            if(frame != null) {
+                SwingUtilities.invokeAndWait(frame::dispose);
+            }
+        }
+    }
+}
