[cp-patches] FYI: JComponent fix

[Roman Kennke]

The painting in JComponent was slighly wrong. See ChangeLog entries and 
diff for details.

2005-06-29  Roman Kennke  <address@hidden>

       * javax/swing/JComponent.java
       (getComponentGraphics): Do not replicate the Graphics at this
       point. This is moved into paintComponent.
       (paintComponent): Replicate the Graphics object before going into
       the tree. This makes sure that the state is preserved and is
       what is specified in the JDKs API docs.

/Roman

Index: javax/swing/JComponent.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/JComponent.java,v
retrieving revision 1.48
diff -u -r1.48 JComponent.java
--- javax/swing/JComponent.java 27 Jun 2005 22:35:55 -0000      1.48
+++ javax/swing/JComponent.java 29 Jun 2005 14:38:11 -0000
@@ -872,19 +872,9 @@
    */
   protected Graphics getComponentGraphics(Graphics g)
   {    
-    if (g instanceof Graphics2D)
-      {
-       g.setFont (this.getFont());
-       g.setColor (this.getForeground());
-       return g;
-      }
-    else
-      {
-        Graphics g2 = g.create ();
-        g2.setFont (this.getFont());
-        g2.setColor (this.getForeground());
-        return g2;
-      }
+    g.setFont (this.getFont());
+    g.setColor (this.getForeground());
+    return g;
   }
 
   /**
@@ -1510,7 +1500,14 @@
   protected void paintComponent(Graphics g)
   {
     if (ui != null)
-      ui.update(g, this);
+      {
+        Graphics g2 = g;
+        if (!(g instanceof Graphics2D))
+          g2 = g.create();
+        ui.update(getComponentGraphics(g2), this);
+        if (!(g instanceof Graphics2D))
+          g2.dispose();
+      }
   }
 
   /**