Hi,
gcjh cannot handle a static field and a method of a class having the
same name. I am surprized we didn't hit this earlier. Since it is a
little clearer to have the field and the method not have the same name
and the static field name is private anyway I have renamed it.
2006-07-29 Mark Wielaard <[EMAIL PROTECTED]>
* javax/swing/JComponent.java (paintingDoubleBuffered): Renamed
static field isPaintingDoubleBuffered to not have the same name
as a method.
Committed to trunk, 0.92 and generics branch.
Cheers,
Mark
Index: javax/swing/JComponent.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/JComponent.java,v
retrieving revision 1.141
diff -u -r1.141 JComponent.java
--- javax/swing/JComponent.java 26 Jul 2006 09:34:10 -0000 1.141
+++ javax/swing/JComponent.java 29 Jul 2006 22:30:58 -0000
@@ -681,7 +681,7 @@
* Indicates whether the current paint call is already double buffered or
* not.
*/
- static boolean isPaintingDoubleBuffered = false;
+ static boolean paintingDoubleBuffered = false;
/**
* Indicates whether we are calling paintDoubleBuffered() from
@@ -1846,7 +1846,7 @@
// buffer. When this method completes, the call stack unwinds back to
// paintDoubleBuffered, where the buffer contents is finally drawn to the
// screen.
- if (!isPaintingDoubleBuffered && isDoubleBuffered()
+ if (!paintingDoubleBuffered && isDoubleBuffered()
&& rm.isDoubleBufferingEnabled())
{
Rectangle clip = g.getClipBounds();
@@ -2145,7 +2145,7 @@
clipAndTranslateGraphics(root, this, g2);
g2.clipRect(r.x, r.y, r.width, r.height);
g2 = getComponentGraphics(g2);
- isPaintingDoubleBuffered = true;
+ paintingDoubleBuffered = true;
try
{
if (isRepainting) // Called from paintImmediately, go through paint().
@@ -2159,7 +2159,7 @@
}
finally
{
- isPaintingDoubleBuffered = false;
+ paintingDoubleBuffered = false;
g2.dispose();
}
