Author: kinow Date: Sat Aug 24 16:33:02 2013 New Revision: 1517162 URL: http://svn.apache.org/r1517162 Log: Move Iterable and Iterator to Range interface
Modified: commons/proper/functor/branches/generators-FUNCTOR-14/src/main/java/org/apache/commons/functor/range/CharacterRange.java commons/proper/functor/branches/generators-FUNCTOR-14/src/main/java/org/apache/commons/functor/range/DoubleRange.java commons/proper/functor/branches/generators-FUNCTOR-14/src/main/java/org/apache/commons/functor/range/FloatRange.java commons/proper/functor/branches/generators-FUNCTOR-14/src/main/java/org/apache/commons/functor/range/IntegerRange.java commons/proper/functor/branches/generators-FUNCTOR-14/src/main/java/org/apache/commons/functor/range/LongRange.java commons/proper/functor/branches/generators-FUNCTOR-14/src/main/java/org/apache/commons/functor/range/Range.java Modified: commons/proper/functor/branches/generators-FUNCTOR-14/src/main/java/org/apache/commons/functor/range/CharacterRange.java URL: http://svn.apache.org/viewvc/commons/proper/functor/branches/generators-FUNCTOR-14/src/main/java/org/apache/commons/functor/range/CharacterRange.java?rev=1517162&r1=1517161&r2=1517162&view=diff ============================================================================== --- commons/proper/functor/branches/generators-FUNCTOR-14/src/main/java/org/apache/commons/functor/range/CharacterRange.java (original) +++ commons/proper/functor/branches/generators-FUNCTOR-14/src/main/java/org/apache/commons/functor/range/CharacterRange.java Sat Aug 24 16:33:02 2013 @@ -29,7 +29,7 @@ import org.apache.commons.lang3.Validate * @since 1.0 * @version $Revision: $ $Date: $ */ -public final class CharacterRange implements Range<Character, Integer>, Iterable<Character>, Iterator<Character> { +public final class CharacterRange implements Range<Character, Integer> { // attributes // --------------------------------------------------------------- Modified: commons/proper/functor/branches/generators-FUNCTOR-14/src/main/java/org/apache/commons/functor/range/DoubleRange.java URL: http://svn.apache.org/viewvc/commons/proper/functor/branches/generators-FUNCTOR-14/src/main/java/org/apache/commons/functor/range/DoubleRange.java?rev=1517162&r1=1517161&r2=1517162&view=diff ============================================================================== --- commons/proper/functor/branches/generators-FUNCTOR-14/src/main/java/org/apache/commons/functor/range/DoubleRange.java (original) +++ commons/proper/functor/branches/generators-FUNCTOR-14/src/main/java/org/apache/commons/functor/range/DoubleRange.java Sat Aug 24 16:33:02 2013 @@ -28,7 +28,7 @@ import org.apache.commons.lang3.Validate * @since 1.0 * @version $Revision: $ $Date: $ */ -public class DoubleRange extends NumericRange<Double> implements Iterable<Double>, Iterator<Double> { +public class DoubleRange extends NumericRange<Double> { // attributes // --------------------------------------------------------------- Modified: commons/proper/functor/branches/generators-FUNCTOR-14/src/main/java/org/apache/commons/functor/range/FloatRange.java URL: http://svn.apache.org/viewvc/commons/proper/functor/branches/generators-FUNCTOR-14/src/main/java/org/apache/commons/functor/range/FloatRange.java?rev=1517162&r1=1517161&r2=1517162&view=diff ============================================================================== --- commons/proper/functor/branches/generators-FUNCTOR-14/src/main/java/org/apache/commons/functor/range/FloatRange.java (original) +++ commons/proper/functor/branches/generators-FUNCTOR-14/src/main/java/org/apache/commons/functor/range/FloatRange.java Sat Aug 24 16:33:02 2013 @@ -28,7 +28,7 @@ import org.apache.commons.lang3.Validate * @since 1.0 * @version $Revision: $ $Date: $ */ -public class FloatRange extends NumericRange<Float> implements Iterable<Float>, Iterator<Float> { +public class FloatRange extends NumericRange<Float> { // attributes // --------------------------------------------------------------- Modified: commons/proper/functor/branches/generators-FUNCTOR-14/src/main/java/org/apache/commons/functor/range/IntegerRange.java URL: http://svn.apache.org/viewvc/commons/proper/functor/branches/generators-FUNCTOR-14/src/main/java/org/apache/commons/functor/range/IntegerRange.java?rev=1517162&r1=1517161&r2=1517162&view=diff ============================================================================== --- commons/proper/functor/branches/generators-FUNCTOR-14/src/main/java/org/apache/commons/functor/range/IntegerRange.java (original) +++ commons/proper/functor/branches/generators-FUNCTOR-14/src/main/java/org/apache/commons/functor/range/IntegerRange.java Sat Aug 24 16:33:02 2013 @@ -28,7 +28,7 @@ import org.apache.commons.lang3.Validate * @since 1.0 * @version $Revision: 1385335 $ $Date: 2012-09-16 15:08:31 -0300 (Sun, 16 Sep 2012) $ */ -public class IntegerRange extends NumericRange<Integer> implements Iterable<Integer>, Iterator<Integer> { +public class IntegerRange extends NumericRange<Integer> { // attributes // --------------------------------------------------------------- Modified: commons/proper/functor/branches/generators-FUNCTOR-14/src/main/java/org/apache/commons/functor/range/LongRange.java URL: http://svn.apache.org/viewvc/commons/proper/functor/branches/generators-FUNCTOR-14/src/main/java/org/apache/commons/functor/range/LongRange.java?rev=1517162&r1=1517161&r2=1517162&view=diff ============================================================================== --- commons/proper/functor/branches/generators-FUNCTOR-14/src/main/java/org/apache/commons/functor/range/LongRange.java (original) +++ commons/proper/functor/branches/generators-FUNCTOR-14/src/main/java/org/apache/commons/functor/range/LongRange.java Sat Aug 24 16:33:02 2013 @@ -25,7 +25,7 @@ import org.apache.commons.lang3.Validate * @since 1.0 * @version $Revision: 1385335 $ $Date: 2012-09-16 15:08:31 -0300 (Sun, 16 Sep 2012) $ */ -public final class LongRange extends NumericRange<Long> implements Iterable<Long>, Iterator<Long> { +public final class LongRange extends NumericRange<Long> { // attributes //--------------------------------------------------------------- Modified: commons/proper/functor/branches/generators-FUNCTOR-14/src/main/java/org/apache/commons/functor/range/Range.java URL: http://svn.apache.org/viewvc/commons/proper/functor/branches/generators-FUNCTOR-14/src/main/java/org/apache/commons/functor/range/Range.java?rev=1517162&r1=1517161&r2=1517162&view=diff ============================================================================== --- commons/proper/functor/branches/generators-FUNCTOR-14/src/main/java/org/apache/commons/functor/range/Range.java (original) +++ commons/proper/functor/branches/generators-FUNCTOR-14/src/main/java/org/apache/commons/functor/range/Range.java Sat Aug 24 16:33:02 2013 @@ -14,6 +14,7 @@ package org.apache.commons.functor.range; import java.util.Collection; +import java.util.Iterator; /** @@ -33,7 +34,7 @@ import java.util.Collection; * @since 1.0 * @version $Revision: $ $Date: $ */ -public interface Range<T extends Comparable<?>, S extends Comparable<?>> { +public interface Range<T extends Comparable<?>, S extends Comparable<?>> extends Iterable<T>, Iterator<T> { /** * Default left bound type.