[cp-patches] RFC: MetalScrollBarPropertyChangeHandler.propertyChange() fixes

[Mark Wielaard]

Hi,

This was in my tree after DevJam. Could someone review them to make sure
they make sense?

2005-10-01  Mark Wielaard  <address@hidden>

    * javax/swing/plaf/metal/MetalScrollBarUI.java
    (MetalScrollBarPropertyChangeHandler.propertyChange):
    Only set free standing when increase or decrease button isn't null.
    If not FREE_STANDING_PROP pass up event to super class.

The second part makes the code do what the comment says it does.

Cheers,

Mark

Index: javax/swing/plaf/metal/MetalScrollBarUI.java
===================================================================
RCS file: 
/cvsroot/classpath/classpath/javax/swing/plaf/metal/MetalScrollBarUI.java,v
retrieving revision 1.7
diff -u -r1.7 MetalScrollBarUI.java
--- javax/swing/plaf/metal/MetalScrollBarUI.java        28 Sep 2005 13:16:47 
-0000      1.7
+++ javax/swing/plaf/metal/MetalScrollBarUI.java        1 Oct 2005 19:37:37 
-0000
@@ -90,9 +90,13 @@
         {
           Boolean prop = (Boolean) e.getNewValue();
           isFreeStanding = (prop == null ? true : prop.booleanValue());
-          increaseButton.setFreeStanding(isFreeStanding);
-          decreaseButton.setFreeStanding(isFreeStanding);
+         if (increaseButton != null)
+           increaseButton.setFreeStanding(isFreeStanding);
+         if (decreaseButton != null)
+           decreaseButton.setFreeStanding(isFreeStanding);
         }
+      else
+       super.propertyChange(e);
     }
   }

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