Re: [gui] [merge] java-gui-merge for may 26

[Mark Wielaard <mark at klomp dot org>]

Hi,

On Thu, 2004-05-27 at 14:28, Michael Koch wrote:
> I have just commited the attached patch with lets libjava bootstrap 
> again. Its not really tested and only to make libjava compile again.
> 
> Graydon: you should really consider to update gcj in java-gui-branch.

> 2004-05-27  Michael Koch  <konqueror@gmx.de>
> 
> 	* javax/swing/JPopupMenu.java
> 	(isVisible): Do not use visible directly.
> 	(setVisible): Likewise.
> 	* javax/swing/JWindow.java
> 	(JWindow): call accessible constructor.
> 	* javax/swing/RepaintManager.java
> 	(paintDirtyRegions): Use public methods to obtain iterator.

That last part is not completely correct.
You want the map entries here, not just the values.
Committed the following to classpath and libgcj HEAD to make testswing
work again.

	2004-06-12  Mark Wielaard  <mark@klomp.org>

	* javax/swing/RepaintManager.java
	(paintDirtyRegions): Use entrySet(), not values().

I believe this (or something similar) is already on the gui branch. If
not then it should probably also go in there.

Cheers,

Mark

Index: javax/swing/RepaintManager.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/RepaintManager.java,v
retrieving revision 1.3
diff -u -r1.3 RepaintManager.java
--- javax/swing/RepaintManager.java	31 May 2004 21:12:02 -0000	1.3
+++ javax/swing/RepaintManager.java	12 Jun 2004 12:58:03 -0000
@@ -438,7 +438,7 @@
     dirtyComponents.clear();
 
     // step 2: paint those roots
-    Iterator i = roots.values().iterator();
+    Iterator i = roots.entrySet().iterator();
     while(i.hasNext())
       {
         Map.Entry ent = (Map.Entry) i.next();

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