You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by oh...@apache.org on 2012/01/15 19:40:31 UTC
svn commit: r1231724 - in /commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration: ConfigurationKey.java tree/DefaultConfigurationKey.java

Author: oheger
Date: Sun Jan 15 18:40:31 2012
New Revision: 1231724

URL: http://svn.apache.org/viewvc?rev=1231724&view=rev
Log:
Made KeyIterator implement Iterator<Object> rather than Iterator<String> to restore binary compatibility.

Modified:
    commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/ConfigurationKey.java
    commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/tree/DefaultConfigurationKey.java

Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/ConfigurationKey.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/ConfigurationKey.java?rev=1231724&r1=1231723&r2=1231724&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/ConfigurationKey.java (original)
+++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/ConfigurationKey.java Sun Jan 15 18:40:31 2012
@@ -392,7 +392,7 @@ public class ConfigurationKey implements
      * This class implements the normal iterator interface. In addition it
      * provides some specific methods for configuration keys.
      */
-    public class KeyIterator implements Iterator<String>, Cloneable
+    public class KeyIterator implements Iterator<Object>, Cloneable
     {
         /** Stores the current key name.*/
         private String current;
@@ -586,7 +586,7 @@ public class ConfigurationKey implements
          *
          * @return the next object
          */
-        public String next()
+        public Object next()
         {
             return nextKey();
         }

Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/tree/DefaultConfigurationKey.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/tree/DefaultConfigurationKey.java?rev=1231724&r1=1231723&r2=1231724&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/tree/DefaultConfigurationKey.java (original)
+++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/tree/DefaultConfigurationKey.java Sun Jan 15 18:40:31 2012
@@ -460,7 +460,7 @@ public class DefaultConfigurationKey
      * class implements the normal iterator interface. In addition it provides
      * some specific methods for configuration keys.
      */
-    public class KeyIterator implements Iterator<String>, Cloneable
+    public class KeyIterator implements Iterator<Object>, Cloneable
     {
         /** Stores the current key name. */
         private String current;
@@ -534,7 +534,7 @@ public class DefaultConfigurationKey
          *
          * @return the next object
          */
-        public String next()
+        public Object next()
         {
             return nextKey();
         }