Hey,

The application JabRef was not even starting on Classpath.  This patch
enables it to start up.  However, it seems to freeze once that happens.
It still needs some work.

Could someone kindly approve this patch so that I may commit it.

Thanks!
Tania

2006-08-21  Tania Bento  <[EMAIL PROTECTED]>

        * javax/swing/plaf/basic/BasicToolBarUI.java:
        (setBorderToNonRollover): If border == null, then the
        insets should be used when saving the old border in the
hastable.
        * javax/swing/JTree.java:
        (setLeadSelectionPath): Need to make sure that path != null when
        determining if path.equals(oldValue). This avoid a Null Pointer
        Exception.

Index: javax/swing/JTree.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/JTree.java,v
retrieving revision 1.73
diff -u -r1.73 JTree.java
--- javax/swing/JTree.java	13 Aug 2006 20:34:03 -0000	1.73
+++ javax/swing/JTree.java	21 Aug 2006 18:47:10 -0000
@@ -2355,7 +2355,7 @@
     if (selectionModel != null)
       {
         TreePath oldValue = selectionModel.getLeadSelectionPath();
-        if (path.equals(oldValue))
+        if (path != null && path.equals(oldValue))
           return;
        
         // Repaint the previous and current rows with the lead selection path.
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	21 Aug 2006 18:47:10 -0000
@@ -898,7 +898,10 @@
 	b.setRolloverEnabled(false);
 
         // Save old border in hashtable.
-        borders.put(b, b.getBorder());
+        if (b.getBorder() == null)
+          borders.put(b, b.getInsets());
+        else
+          borders.put(b, b.getBorder());
         
 	b.setBorder(nonRolloverBorder);
       }

Reply via email to