[cp-patches] FYI: Handle null border in BasicToolBarUI

[Mark Wielaard]

Hi,

We were handling null border in BasicToolBarUI for most methods, but
forgot the following two:

2006-09-17  Mark Wielaard  <[EMAIL PROTECTED]>

    * javax/swing/plaf/basic/BasicToolBarUI.java
    (setBorderToNonRollover): Check whether border is null.
    (setBorderToRollover): Likewise.

This get JabRef again a little further.

Committed,

Mark

Index: javax/swing/plaf/basic/BasicToolBarUI.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/plaf/basic/BasicToolBarUI.java,v
retrieving revision 1.28
diff -u -r1.28 BasicToolBarUI.java
--- javax/swing/plaf/basic/BasicToolBarUI.java	26 Jul 2006 13:39:39 -0000	1.28
+++ javax/swing/plaf/basic/BasicToolBarUI.java	17 Sep 2006 23:03:32 -0000
@@ -898,7 +898,8 @@
 	b.setRolloverEnabled(false);
 
         // Save old border in hashtable.
-        borders.put(b, b.getBorder());
+	if (b.getBorder() != null)
+          borders.put(b, b.getBorder());
         
 	b.setBorder(nonRolloverBorder);
       }
@@ -932,7 +933,8 @@
         b.setRolloverEnabled(false);
         
         // Save old border in hashtable.
-        borders.put(b, b.getBorder());
+        if (b.getBorder() != null)
+	  borders.put(b, b.getBorder());
         
         b.setBorder(rolloverBorder);
       }

signature.asc
Description: This is a digitally signed message part