From 5ff5fac0eea210a2f80e404a85fbd0eb42b5f75f Mon Sep 17 00:00:00 2001
From: alexp <unknown>
Date: Mon, 7 Feb 2011 21:34:31 +0300
Subject: [PATCH] 6979537: closed/javax/swing/JSplitPane/UnitTest/UnitTest.java
 fails Reviewed-by: rupashka

---
 .../javax/swing/plaf/basic/BasicSplitPaneUI.java       | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/share/classes/javax/swing/plaf/basic/BasicSplitPaneUI.java b/src/share/classes/javax/swing/plaf/basic/BasicSplitPaneUI.java
index bf97bff88..e4e82b1bf 100644
--- a/src/share/classes/javax/swing/plaf/basic/BasicSplitPaneUI.java
+++ b/src/share/classes/javax/swing/plaf/basic/BasicSplitPaneUI.java
@@ -342,12 +342,10 @@ public class BasicSplitPaneUI extends SplitPaneUI
 
         setOrientation(splitPane.getOrientation());
 
-        // This plus 2 here is to provide backwards consistancy. Previously,
-        // the old size did not include the 2 pixel border around the divider,
-        // it now does.
-        Integer dividerSize = (Integer)UIManager.get("SplitPane.dividerSize");
-        if (divider == null) dividerSize = 10;
-        LookAndFeel.installProperty(splitPane, "dividerSize", dividerSize);
+        // note: don't rename this temp variable to dividerSize
+        // since it will conflict with "this.dividerSize" field
+        Integer temp = (Integer)UIManager.get("SplitPane.dividerSize");
+        LookAndFeel.installProperty(splitPane, "dividerSize", temp == null? 10: temp);
 
         divider.setDividerSize(splitPane.getDividerSize());
         dividerSize = divider.getDividerSize();
-- 
GitLab