[cp-patches] FYI: Compilation errors when mixing with OpenJDK code

[Jeroen Frijters]

Hi,

I committed the patches below to fix some compilation errors when mixing this 
code with OpenJDK code.

Regards,
Jeroen

2007-06-21  Jeroen Frijters  <[EMAIL PROTECTED]>

        * gnu/java/net/loader/URLLoader.java
        (URLLoader(URLClassLoader,URLStreamHandlerCache,
        URLStreamHandlerFactory,URL,URL)): Disabiguate CodeSource constructor
        invocation.
        * java/awt/AWTKeyStroke.java
        (LinkedHashMap.removeEldestEntry): Use Map.Entry to fix compile
        error when compiled against OpenJDK java.util package.
        * java/awt/AlphaComposite.java
        (LinkedHashMap.removeEldestEntry): Use Map.Entry to fix compile
        error when compiled against OpenJDK java.util package.


Index: gnu/java/net/loader/URLLoader.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/net/loader/URLLoader.java,v
retrieving revision 1.3
diff -u -r1.3 URLLoader.java
--- gnu/java/net/loader/URLLoader.java  18 Dec 2006 21:37:39 -0000      1.3
+++ gnu/java/net/loader/URLLoader.java  19 Jun 2007 08:22:26 -0000
@@ -42,6 +42,7 @@
 import java.net.URLClassLoader;
 import java.net.URLStreamHandlerFactory;
 import java.security.CodeSource;
+import java.security.cert.Certificate;
 import java.util.ArrayList;
 import java.util.jar.Manifest;

@@ -95,7 +96,7 @@
     this.baseURL = baseURL;
     this.factory = factory;
     this.cache = cache;
-    this.noCertCodeSource = new CodeSource(overrideURL, null);
+    this.noCertCodeSource = new CodeSource(overrideURL, (Certificate[]) null);
   }

   /**
Index: java/awt/AWTKeyStroke.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/awt/AWTKeyStroke.java,v
retrieving revision 1.14
diff -u -r1.14 AWTKeyStroke.java
--- java/awt/AWTKeyStroke.java  13 Dec 2006 20:29:50 -0000      1.14
+++ java/awt/AWTKeyStroke.java  20 Jun 2007 12:13:41 -0000
@@ -93,7 +93,7 @@
     private static final int MAX_CACHE_SIZE = 2048;

     /** Prune stale entries. */
-    protected boolean removeEldestEntry(Entry<AWTKeyStroke,AWTKeyStroke>
+    protected boolean removeEldestEntry(Map.Entry<AWTKeyStroke,AWTKeyStroke>
                                        eldest)
     {
       return size() > MAX_CACHE_SIZE;
Index: java/awt/AlphaComposite.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/awt/AlphaComposite.java,v
retrieving revision 1.9
diff -u -r1.9 AlphaComposite.java
--- java/awt/AlphaComposite.java        13 Dec 2006 20:29:50 -0000      1.9
+++ java/awt/AlphaComposite.java        20 Jun 2007 12:12:40 -0000
@@ -61,7 +61,7 @@
     private static final int MAX_CACHE_SIZE = 2048;

     /** Prune stale entries. */
-    protected boolean removeEldestEntry(Entry eldest)
+    protected boolean removeEldestEntry(Map.Entry eldest)
     {
       return size() > MAX_CACHE_SIZE;
     }