2007-04-06 Mark Wielaard <mark@klomp.org>

        * lib/mkcollections.pl.in: Add externalclasses.
        * java/util/Collections.java: Unroll enhanced for loops.
        * java/util/HashMap.java: Likewise.
        * java/util/Hashtable.java: Likewise.
        * java/util/TreeMap.java: Likewise.

1 files changed, 17 insertions, 0 deletions

diff --git a/lib/mkcollections.pl.in b/lib/mkcollections.pl.in
index 3d2d3c78a..2c80aa1de 100755
--- a/lib/mkcollections.pl.in
+++ b/lib/mkcollections.pl.in
@@ -55,6 +55,12 @@ my @javautilclasses=qw(AbstractCollection
 		       TreeMap
 		       TreeSet
 		       Vector);
+my @externalclasses=qw(AbstractQueue
+		       ArrayDeque
+		       Deque
+		       NavigableMap
+		       NavigableSet
+		       Queue);
 
 my $destPkg = $destpath;
 $destPkg  =~ s!/!.!g;
@@ -109,6 +115,9 @@ EOF
 	for $clazz (@javautilclasses) {
 	    $_ =~ s/java.util.$clazz/$clazz/g;
 	}
+	for $clazz (@externalclasses) {
+	    $_ =~ s/java.util.$clazz/$clazz/g;
+	}
 
 	$_ =~ s/abstract (interface)/$1/g;
 
@@ -139,3 +148,11 @@ for $file (@javautilclasses) {
     print "$outfile\n";
     convert ($file, $infile, $outfile);
 }
+
+for $file (@externalclasses) {
+    my $infile = "$classpath/external/jsr166/java/util/$file.java";
+    my $outfile = "$destpath/$file.java";
+    print "$outfile\n";
+    convert ($file, $infile, $outfile);
+}
+