[commit-cp] classpath/javax/swing/plaf/metal MetalMenuBarUI...

[Robert Schuster]

CVSROOT:        /cvsroot/classpath
Module name:    classpath
Changes by:     Robert Schuster <rschuster>     06/06/16 12:54:48

Modified files:
        javax/swing/plaf/metal: MetalMenuBarUI.java 
        .              : ChangeLog 

Log message:
        2006-06-16  Robert Schuster  <address@hidden>
        
                * javax/swing/plaf/metal/MetalMenuBarUI.java:
                (update): Added subexpression to if-statement.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/plaf/metal/MetalMenuBarUI.java?cvsroot=classpath&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7840&r2=1.7841

Patches:

Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7840
retrieving revision 1.7841
diff -u -b -r1.7840 -r1.7841
--- ChangeLog   16 Jun 2006 12:37:04 -0000      1.7840
+++ ChangeLog   16 Jun 2006 12:54:47 -0000      1.7841
@@ -1,5 +1,10 @@
 2006-06-16  Robert Schuster  <address@hidden>
 
+       * javax/swing/plaf/metal/MetalMenuBarUI.java:
+       (update): Added subexpression to if-statement.
+
+2006-06-16  Robert Schuster  <address@hidden>
+
        * javax/swing/plaf/basic/BasicRadioButtonUI.java:
        (installDefaults): Removed unneccessary code.
        (paint): Removed complex if-cascade, revert to default icon if
@@ -162,6 +167,7 @@
        Added serialization UID and changed to extend
        javax.management.JMException.
        
+>>>>>>> 1.7826
 2006-06-14  Lillian Angel  <address@hidden>
 
        * java/awt/Component.java
@@ -340,6 +346,7 @@
        compatibility with filters.
        (getParameter): Modified to allow access to above. 
 
+>>>>>>> 1.7824
 2006-06-13  Sven de Marothy  <address@hidden>
 
        * gnu/java/awt/peer/gtk/CairoSurface.java
@@ -361,6 +368,7 @@
        or not the labels are visible,
        (paintTrack): Shift track down one pixel.
 
+>>>>>>> 1.7799
 2006-06-13  Lillian Angel  <address@hidden>
 
        * java/awt/image/PixelGrabber.java
@@ -1131,6 +1139,7 @@
        (TreeIncrementAction.actionPerformed): Use action name as command.
        (TreeIncrementAction.isEnabled): Implemented.
 
+>>>>>>> 1.7796
 2006-06-08  Mark Wielaard  <address@hidden>
 
        PR 27917