Rearranged methods in ranges.

runtime/src/jet/ByteRange.java

@@ -20,21 +20,16 @@ import org.jetbrains.jet.rt.annotation.AssertInvisibleInResolver;
 
 @AssertInvisibleInResolver
 public final class ByteRange implements Range<Byte>, NumberSequence<Byte>, ByteIterable {
+    public static final ByteRange EMPTY = new ByteRange((byte) 1, (byte) 0);
+
     private final byte start;
     private final byte end;
 
-    public static final ByteRange EMPTY = new ByteRange((byte) 1, (byte) 0);
-
     public ByteRange(byte start, byte end) {
         this.start = start;
         this.end = end;
     }
 
-    @Override
-    public String toString() {
-        return getStart() + ".." + getEnd();
-    }
-
     @Override
     public boolean contains(Byte item) {
         return start <= item && item <= end;
@@ -44,26 +39,6 @@ public final class ByteRange implements Range<Byte>, NumberSequence<Byte>, ByteI
         return start <= item && item <= end;
     }
 
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-
-        ByteRange range = (ByteRange) o;
-        return end == range.end && start == range.start;
-    }
-
-    @Override
-    public int hashCode() {
-        int result = (int) start;
-        result = 31 * result + end;
-        return result;
-    }
-
     @Override
     public Byte getStart() {
         return start;
@@ -83,4 +58,29 @@ public final class ByteRange implements Range<Byte>, NumberSequence<Byte>, ByteI
     public ByteIterator iterator() {
         return new ByteSequenceIterator(getStart(), getEnd(), 1);
     }
+
+    @Override
+    public String toString() {
+        return getStart() + ".." + getEnd();
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+
+        ByteRange range = (ByteRange) o;
+        return end == range.end && start == range.start;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = (int) start;
+        result = 31 * result + end;
+        return result;
+    }
 }

runtime/src/jet/CharRange.java

@@ -20,21 +20,16 @@ import org.jetbrains.jet.rt.annotation.AssertInvisibleInResolver;
 
 @AssertInvisibleInResolver
 public final class CharRange implements Range<Character>, NumberSequence<Character>, CharIterable {
+    public static final CharRange EMPTY = new CharRange((char) 1, (char) 0);
+
     private final char start;
     private final char end;
 
-    public static final CharRange EMPTY = new CharRange((char) 1, (char) 0);
-
     public CharRange(char start, char end) {
         this.start = start;
         this.end = end;
     }
 
-    @Override
-    public String toString() {
-        return getStart() + ".." + getEnd();
-    }
-
     @Override
     public boolean contains(Character item) {
         return start <= item && item <= end;
@@ -44,26 +39,6 @@ public final class CharRange implements Range<Character>, NumberSequence<Charact
         return start <= item && item <= end;
     }
 
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-
-        CharRange range = (CharRange) o;
-        return end == range.end && start == range.start;
-    }
-
-    @Override
-    public int hashCode() {
-        int result = (int) start;
-        result = 31 * result + end;
-        return result;
-    }
-
     @Override
     public Character getStart() {
         return start;
@@ -83,4 +58,29 @@ public final class CharRange implements Range<Character>, NumberSequence<Charact
     public CharIterator iterator() {
         return new CharacterSequenceIterator(getStart(), getEnd(), 1);
     }
+
+    @Override
+    public String toString() {
+        return getStart() + ".." + getEnd();
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+
+        CharRange range = (CharRange) o;
+        return end == range.end && start == range.start;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = (int) start;
+        result = 31 * result + end;
+        return result;
+    }
 }

runtime/src/jet/DoubleRange.java

@@ -20,24 +20,44 @@ import org.jetbrains.jet.rt.annotation.AssertInvisibleInResolver;
 
 @AssertInvisibleInResolver
 public final class DoubleRange implements Range<Double>, NumberSequence<Double>, DoubleIterable {
+    public static final DoubleRange EMPTY = new DoubleRange(1, 0);
+
     private final double start;
     private final double end;
 
-    public static final DoubleRange EMPTY = new DoubleRange(1, 0);
-
     public DoubleRange(double start, double end) {
         this.start = start;
         this.end = end;
     }
 
     @Override
-    public String toString() {
+    public boolean contains(Double item) {
-        return getStart() + ".." + getEnd();
+        return start <= item && item <= end;
     }
 
     @Override
-    public boolean contains(Double item) {
+    public Double getStart() {
-        return start <= item && item <= end;
+        return start;
+    }
+
+    @Override
+    public Double getEnd() {
+        return end;
+    }
+
+    @Override
+    public Double getIncrement() {
+        return 1.0;
+    }
+
+    @Override
+    public DoubleIterator iterator() {
+        return new DoubleSequenceIterator(getStart(), getEnd(), 1);
+    }
+
+    @Override
+    public String toString() {
+        return getStart() + ".." + getEnd();
     }
 
     @Override
@@ -64,24 +84,4 @@ public final class DoubleRange implements Range<Double>, NumberSequence<Double>,
         result = 31 * result + (int) (temp ^ (temp >>> 32));
         return result;
     }
-
-    @Override
-    public Double getStart() {
-        return start;
-    }
-
-    @Override
-    public Double getEnd() {
-        return end;
-    }
-
-    @Override
-    public Double getIncrement() {
-        return 1.0;
-    }
-
-    @Override
-    public DoubleIterator iterator() {
-        return new DoubleSequenceIterator(getStart(), getEnd(), 1);
-    }
 }

runtime/src/jet/FloatRange.java

@@ -20,24 +20,44 @@ import org.jetbrains.jet.rt.annotation.AssertInvisibleInResolver;
 
 @AssertInvisibleInResolver
 public final class FloatRange implements Range<Float>, NumberSequence<Float>, FloatIterable {
+    public static final FloatRange EMPTY = new FloatRange(1, 0);
+
     private final float start;
     private final float end;
 
-    public static final FloatRange EMPTY = new FloatRange(1, 0);
-
     public FloatRange(float start, float end) {
         this.start = start;
         this.end = end;
     }
 
     @Override
-    public String toString() {
+    public boolean contains(Float item) {
-        return getStart() + ".." + getEnd();
+        return start <= item && item <= end;
     }
 
     @Override
-    public boolean contains(Float item) {
+    public Float getStart() {
-        return start <= item && item <= end;
+        return start;
+    }
+
+    @Override
+    public Float getEnd() {
+        return end;
+    }
+
+    @Override
+    public Float getIncrement() {
+        return 1.0f;
+    }
+
+    @Override
+    public FloatIterator iterator() {
+        return new FloatSequenceIterator(getStart(), getEnd(), 1);
+    }
+
+    @Override
+    public String toString() {
+        return getStart() + ".." + getEnd();
     }
 
     @Override
@@ -60,24 +80,4 @@ public final class FloatRange implements Range<Float>, NumberSequence<Float>, Fl
         result = 31 * result + (end != +0.0f ? Float.floatToIntBits(end) : 0);
         return result;
     }
-
-    @Override
-    public Float getStart() {
-        return start;
-    }
-
-    @Override
-    public Float getEnd() {
-        return end;
-    }
-
-    @Override
-    public Float getIncrement() {
-        return 1.0f;
-    }
-
-    @Override
-    public FloatIterator iterator() {
-        return new FloatSequenceIterator(getStart(), getEnd(), 1);
-    }
 }

runtime/src/jet/IntRange.java

@@ -20,21 +20,16 @@ import org.jetbrains.jet.rt.annotation.AssertInvisibleInResolver;
 
 @AssertInvisibleInResolver
 public final class IntRange implements Range<Integer>, NumberSequence<Integer>, IntIterable {
+    public static final IntRange EMPTY = new IntRange(1, 0);
+
     private final int start;
     private final int end;
 
-    public static final IntRange EMPTY = new IntRange(1, 0);
-
     public IntRange(int start, int end) {
         this.start = start;
         this.end = end;
     }
 
-    @Override
-    public String toString() {
-        return getStart() + ".." + getEnd();
-    }
-
     @Override
     public boolean contains(Integer item) {
         return start <= item && item <= end;
@@ -44,26 +39,6 @@ public final class IntRange implements Range<Integer>, NumberSequence<Integer>,
         return start <= item && item <= end;
     }
 
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-
-        IntRange range = (IntRange) o;
-        return end == range.end && start == range.start;
-    }
-
-    @Override
-    public int hashCode() {
-        int result = start;
-        result = 31 * result + end;
-        return result;
-    }
-
     @Override
     public Integer getStart() {
         return start;
@@ -83,4 +58,29 @@ public final class IntRange implements Range<Integer>, NumberSequence<Integer>,
     public IntIterator iterator() {
         return new IntSequenceIterator(getStart(), getEnd(), 1);
     }
+
+    @Override
+    public String toString() {
+        return getStart() + ".." + getEnd();
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+
+        IntRange range = (IntRange) o;
+        return end == range.end && start == range.start;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = start;
+        result = 31 * result + end;
+        return result;
+    }
 }

runtime/src/jet/LongRange.java

@@ -20,21 +20,16 @@ import org.jetbrains.jet.rt.annotation.AssertInvisibleInResolver;
 
 @AssertInvisibleInResolver
 public final class LongRange implements Range<Long>, NumberSequence<Long>, LongIterable {
+    public static final LongRange EMPTY = new LongRange(1, 0);
+
     private final long start;
     private final long end;
 
-    public static final LongRange EMPTY = new LongRange(1, 0);
-
     public LongRange(long start, long end) {
         this.start = start;
         this.end = end;
     }
 
-    @Override
-    public String toString() {
-        return getStart() + ".." + getEnd();
-    }
-
     @Override
     public boolean contains(Long item) {
         return start <= item && item <= end;
@@ -44,26 +39,6 @@ public final class LongRange implements Range<Long>, NumberSequence<Long>, LongI
         return start <= item && item <= end;
     }
 
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-
-        LongRange range = (LongRange) o;
-        return end == range.end && start == range.start;
-    }
-
-    @Override
-    public int hashCode() {
-        int result = (int) (start ^ (start >>> 32));
-        result = 31 * result + (int) (end ^ (end >>> 32));
-        return result;
-    }
-
     @Override
     public Long getStart() {
         return start;
@@ -83,4 +58,29 @@ public final class LongRange implements Range<Long>, NumberSequence<Long>, LongI
     public LongIterator iterator() {
         return new LongSequenceIterator(getStart(), getEnd(), 1);
     }
+
+    @Override
+    public String toString() {
+        return getStart() + ".." + getEnd();
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+
+        LongRange range = (LongRange) o;
+        return end == range.end && start == range.start;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = (int) (start ^ (start >>> 32));
+        result = 31 * result + (int) (end ^ (end >>> 32));
+        return result;
+    }
 }

runtime/src/jet/ShortRange.java

@@ -20,21 +20,16 @@ import org.jetbrains.jet.rt.annotation.AssertInvisibleInResolver;
 
 @AssertInvisibleInResolver
 public final class ShortRange implements Range<Short>, NumberSequence<Short>, ShortIterable {
+    public static final ShortRange EMPTY = new ShortRange((short) 1, (short) 0);
+
     private final short start;
     private final short end;
 
-    public static final ShortRange EMPTY = new ShortRange((short) 1, (short) 0);
-
     public ShortRange(short start, short end) {
         this.start = start;
         this.end = end;
     }
 
-    @Override
-    public String toString() {
-        return getStart() + ".." + getEnd();
-    }
-
     @Override
     public boolean contains(Short item) {
         return start <= item && item <= end;
@@ -44,26 +39,6 @@ public final class ShortRange implements Range<Short>, NumberSequence<Short>, Sh
         return start <= item && item <= end;
     }
 
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-
-        ShortRange range = (ShortRange) o;
-        return end == range.end && start == range.start;
-    }
-
-    @Override
-    public int hashCode() {
-        int result = (int) start;
-        result = 31 * result + end;
-        return result;
-    }
-
     @Override
     public Short getStart() {
         return start;
@@ -83,4 +58,29 @@ public final class ShortRange implements Range<Short>, NumberSequence<Short>, Sh
     public ShortIterator iterator() {
         return new ShortSequenceIterator(getStart(), getEnd(), 1);
     }
+
+    @Override
+    public String toString() {
+        return getStart() + ".." + getEnd();
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+
+        ShortRange range = (ShortRange) o;
+        return end == range.end && start == range.start;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = (int) start;
+        result = 31 * result + end;
+        return result;
+    }
 }