diff options
| author | Jeroen Frijters <jeroen@sumatra.nl> | 2007-06-21 05:35:44 +0000 |
|---|---|---|
| committer | Jeroen Frijters <jeroen@sumatra.nl> | 2007-06-21 05:35:44 +0000 |
| commit | a92f7df19114e8e0b524395fe921cf331da85fa5 (patch) | |
| tree | 1b8f52459e31d190dddc05cff5e9097d789e4ffb | |
| parent | 7b2d017d401b2c5c4b1e4dba3ba96a49ab58d5c5 (diff) | |
| download | classpath-a92f7df19114e8e0b524395fe921cf331da85fa5.tar.gz | |
2007-06-21 Jeroen Frijters <jeroen@frijters.net>
* 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.
| -rw-r--r-- | ChangeLog | 13 | ||||
| -rw-r--r-- | gnu/java/net/loader/URLLoader.java | 3 | ||||
| -rw-r--r-- | java/awt/AWTKeyStroke.java | 2 | ||||
| -rw-r--r-- | java/awt/AlphaComposite.java | 2 |
4 files changed, 17 insertions, 3 deletions
@@ -1,5 +1,18 @@ 2007-06-21 Jeroen Frijters <jeroen@frijters.net> + * 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. + +2007-06-21 Jeroen Frijters <jeroen@frijters.net> + * gnu/java/security/Engine.java (getInstance(String,String,Provider,Object[]): Use correctly cased property name. diff --git a/gnu/java/net/loader/URLLoader.java b/gnu/java/net/loader/URLLoader.java index 5228bcac9..5b9b6748b 100644 --- a/gnu/java/net/loader/URLLoader.java +++ b/gnu/java/net/loader/URLLoader.java @@ -42,6 +42,7 @@ import java.net.URL; 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 @@ public abstract class URLLoader this.baseURL = baseURL; this.factory = factory; this.cache = cache; - this.noCertCodeSource = new CodeSource(overrideURL, null); + this.noCertCodeSource = new CodeSource(overrideURL, (Certificate[]) null); } /** diff --git a/java/awt/AWTKeyStroke.java b/java/awt/AWTKeyStroke.java index e0b34e992..0fc44287a 100644 --- a/java/awt/AWTKeyStroke.java +++ b/java/awt/AWTKeyStroke.java @@ -93,7 +93,7 @@ public class AWTKeyStroke implements Serializable 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; diff --git a/java/awt/AlphaComposite.java b/java/awt/AlphaComposite.java index 90df2e66d..addd1e713 100644 --- a/java/awt/AlphaComposite.java +++ b/java/awt/AlphaComposite.java @@ -61,7 +61,7 @@ public final class AlphaComposite implements Composite 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; } |