diff options
| author | Andrew John Hughes <gnu_andrew@member.fsf.org> | 2008-07-06 00:47:45 +0000 |
|---|---|---|
| committer | Andrew John Hughes <gnu_andrew@member.fsf.org> | 2008-07-06 00:47:45 +0000 |
| commit | b06c998865b0572825eacd17b00072874a9f5892 (patch) | |
| tree | a9877ea760fd224675ca3c27c4d06d071cb1dad6 | |
| parent | 256eb63d10a0fa402e44ca5cb42a4d9220cff762 (diff) | |
| download | classpath-b06c998865b0572825eacd17b00072874a9f5892.tar.gz | |
2008-07-06 Andrew John Hughes <gnu_andrew@member.fsf.org>
* java/util/ResourceBundle.java:
Fix generic warnings.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | java/util/ResourceBundle.java | 7 |
2 files changed, 9 insertions, 3 deletions
@@ -1,5 +1,10 @@ 2008-07-06 Andrew John Hughes <gnu_andrew@member.fsf.org> + * java/util/ResourceBundle.java: + Fix generic warnings. + +2008-07-06 Andrew John Hughes <gnu_andrew@member.fsf.org> + * java/util/Properties.java: (load(Reader)): Implemented. (load(InputStream)): Fixed to use load(Reader). diff --git a/java/util/ResourceBundle.java b/java/util/ResourceBundle.java index bbca937a8..cb5579eeb 100644 --- a/java/util/ResourceBundle.java +++ b/java/util/ResourceBundle.java @@ -123,9 +123,10 @@ public abstract class ResourceBundle * * @see BundleKey */ - private static Map bundleCache = new LinkedHashMap(CACHE_SIZE + 1, 0.75F, true) + private static Map<BundleKey,Object> bundleCache = + new LinkedHashMap<BundleKey,Object>(CACHE_SIZE + 1, 0.75F, true) { - public boolean removeEldestEntry(Map.Entry entry) + public boolean removeEldestEntry(Map.Entry<BundleKey,Object> entry) { return size() > CACHE_SIZE; } @@ -454,7 +455,7 @@ public abstract class ResourceBundle ResourceBundle bundle = null; try { - Class rbClass; + Class<?> rbClass; if (classloader == null) rbClass = Class.forName(localizedName); else |