svn commit: r1208788 - /commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/ConfigurationConverter.java

[oh...@apache.org]

Author: oheger
Date: Wed Nov 30 21:15:37 2011
New Revision: 1208788

URL: http://svn.apache.org/viewvc?rev=1208788&view=rev
Log:
Java 1.5 compatibility: Javadocs, raw types, for loops, etc.

Modified:
    commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/ConfigurationConverter.java

Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/ConfigurationConverter.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/ConfigurationConverter.java?rev=1208788&r1=1208787&r2=1208788&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/ConfigurationConverter.java (original)
+++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/ConfigurationConverter.java Wed Nov 30 21:15:37 2011
@@ -17,11 +17,11 @@
 
 package org.apache.commons.configuration;
 
+import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Properties;
-import java.util.Vector;
 
 import org.apache.commons.collections.ExtendedProperties;
 import org.apache.commons.lang.StringUtils;
@@ -31,7 +31,7 @@ import org.apache.commons.lang.StringUti
  * ExtendedProperties and standard Properties.
  *
  * @author <a href="mailto:mpoeschl@marmot.at">Martin Poeschl</a>
- * @version $Revision$, $Date$
+ * @version $Id$
  */
 public final class ConfigurationConverter
 {
@@ -75,17 +75,15 @@ public final class ConfigurationConverte
     {
         ExtendedProperties props = new ExtendedProperties();
 
-        Iterator keys = config.getKeys();
-
-        while (keys.hasNext())
+        for (Iterator<String> keys = config.getKeys(); keys.hasNext();)
         {
-            String key = (String) keys.next();
+            String key = keys.next();
             Object property = config.getProperty(key);
 
             // turn lists into vectors
             if (property instanceof List)
             {
-                property = new Vector((List) property);
+                property = new ArrayList<Object>((List<?>) property);
             }
 
             props.setProperty(key, property);
@@ -109,11 +107,10 @@ public final class ConfigurationConverte
         char delimiter = (config instanceof AbstractConfiguration)
             ? ((AbstractConfiguration) config).getListDelimiter() : ',';
 
-        Iterator keys = config.getKeys();
-        while (keys.hasNext())
+        for (Iterator<String> keys = config.getKeys(); keys.hasNext();)
         {
-            String key = (String) keys.next();
-            List list = config.getList(key);
+            String key = keys.next();
+            List<Object> list = config.getList(key);
 
             // turn the list into a string
             props.setProperty(key, StringUtils.join(list.iterator(), delimiter));
@@ -128,7 +125,7 @@ public final class ConfigurationConverte
      * @param config Configuration object to convert
      * @return Map created from the Configuration
      */
-    public static Map getMap(Configuration config)
+    public static Map<Object, Object> getMap(Configuration config)
     {
         return new ConfigurationMap(config);
     }