Changeset 1528:5c50b86bf1dd

Timestamp:

10/15/10 21:53:11 (3 years ago)

Author:

tom

Branch:

default

Message:

~ new implementation of keys() without cast check warning

Files:

• src/org/w3c/unicorn/util/UCNProperties.java (modified) (2 diffs)

src/org/w3c/unicorn/util/UCNProperties.java

@@ -4 +4 @@
 package org.w3c.unicorn.util;
 
-import java.util.Collections;
 import java.util.Enumeration;
+import java.util.Iterator;
 import java.util.Properties;
 import java.util.Set;
 import java.util.TreeSet;
-import java.util.Vector;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -57 +56 @@
         }
 
-        @SuppressWarnings("unchecked")
-        public Enumeration keys() {
-                Enumeration keysEnum = super.keys();
-                Vector<String> keyList = new Vector<String>();
-                while(keysEnum.hasMoreElements())
-                        keyList.add((String)keysEnum.nextElement());
-                Collections.sort(keyList);
-                return keyList.elements();
+        public Enumeration<Object> keys() {
+                final Iterator<Object> i = this.keySet().iterator();
+                return new Enumeration<Object>() {
+                        @Override
+                        public boolean hasMoreElements() {
+                                return i.hasNext();
+                        }
+                        @Override
+                        public Object nextElement() {
+                                return i.next();
+                        }
+                };
         }