Author: sebb
Date: Mon Nov 8 01:51:21 2010
New Revision: 1032442
URL: http://svn.apache.org/viewvc?rev=1032442&view=rev
Log:
Generics
Modified:
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/util/CombinedResources.java
Modified:
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/util/CombinedResources.java
URL:
http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/util/CombinedResources.java?rev=1032442&r1=1032441&r2=1032442&view=diff
==============================================================================
---
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/util/CombinedResources.java
(original)
+++
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/util/CombinedResources.java
Mon Nov 8 01:51:21 2010
@@ -114,13 +114,22 @@ public class CombinedResources extends R
}
@Override
- public Enumeration getKeys()
+ public Enumeration<String> getKeys()
{
if (!inited)
{
init();
}
- return properties.keys();
+ return new Enumeration<String>(){
+ public boolean hasMoreElements() {
+ return properties.keys().hasMoreElements();
+ }
+ public String nextElement() {
+ // We know that our properties will only ever contain Strings
+ return (String) properties.keys().nextElement();
+ }
+
+ };
}
@Override
