From 797b9614846bc2cdbaafcb7a8a32b20facaf33b7 Mon Sep 17 00:00:00 2001
From: Evgeny Gerashchenko <Evgeny.Gerashchenko@jetbrains.com>
Date: Tue, 22 Jan 2013 21:21:43 +0400
Subject: [PATCH] Rearranged methods to follow common structure.

---
 runtime/src/jet/ByteRange.java  | 14 +++++++-------
 runtime/src/jet/CharRange.java  | 14 +++++++-------
 runtime/src/jet/LongRange.java  | 14 +++++++-------
 runtime/src/jet/ShortRange.java | 14 +++++++-------
 4 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/runtime/src/jet/ByteRange.java b/runtime/src/jet/ByteRange.java
index 8b059d73a1a..84f6e7140af 100644
--- a/runtime/src/jet/ByteRange.java
+++ b/runtime/src/jet/ByteRange.java
@@ -79,6 +79,13 @@ public final class ByteRange implements Range<Byte>, ByteIterable {
         return result;
     }
 
+    public ByteIterator step(int step) {
+        if (step < 0)
+            return new ByteIteratorImpl(getEnd(), -count, -step);
+        else
+            return new ByteIteratorImpl(start, count, step);
+    }
+
     public boolean getIsReversed() {
         return count < 0;
     }
@@ -95,13 +102,6 @@ public final class ByteRange implements Range<Byte>, ByteIterable {
         return count < 0 ? -count : count;
     }
 
-    public ByteIterator step(int step) {
-        if (step < 0)
-            return new ByteIteratorImpl(getEnd(), -count, -step);
-        else
-            return new ByteIteratorImpl(start, count, step);
-    }
-
     @Override
     public ByteIterator iterator() {
         return new ByteIteratorImpl(start, count, 1);
diff --git a/runtime/src/jet/CharRange.java b/runtime/src/jet/CharRange.java
index 24cf0929c8b..cc0f9e5e6a2 100644
--- a/runtime/src/jet/CharRange.java
+++ b/runtime/src/jet/CharRange.java
@@ -79,6 +79,13 @@ public final class CharRange implements Range<Character>, CharIterable {
         return result;
     }
 
+    public CharIterator step(int step) {
+        if (step < 0)
+            return new CharIteratorImpl(getEnd(), -count, -step);
+        else
+            return new CharIteratorImpl(start, count, step);
+    }
+
     public boolean getIsReversed() {
         return count < 0;
     }
@@ -95,13 +102,6 @@ public final class CharRange implements Range<Character>, CharIterable {
         return count < 0 ? -count : count;
     }
 
-    public CharIterator step(int step) {
-        if (step < 0)
-            return new CharIteratorImpl(getEnd(), -count, -step);
-        else
-            return new CharIteratorImpl(start, count, step);
-    }
-
     @Override
     public CharIterator iterator() {
         return new CharIteratorImpl(start, count, 1);
diff --git a/runtime/src/jet/LongRange.java b/runtime/src/jet/LongRange.java
index 5ac02919f4e..19adfffcb86 100644
--- a/runtime/src/jet/LongRange.java
+++ b/runtime/src/jet/LongRange.java
@@ -44,13 +44,6 @@ public final class LongRange implements Range<Long>, LongIterable {
     }
 
 
-    public LongIterator step(long step) {
-        if (step < 0)
-            return new LongIteratorImpl(getEnd(), -count, -step);
-        else
-            return new LongIteratorImpl(start, count, step);
-    }
-
     @Override
     public boolean contains(Long item) {
         if (item == null) return false;
@@ -87,6 +80,13 @@ public final class LongRange implements Range<Long>, LongIterable {
         return result;
     }
 
+    public LongIterator step(long step) {
+        if (step < 0)
+            return new LongIteratorImpl(getEnd(), -count, -step);
+        else
+            return new LongIteratorImpl(start, count, step);
+    }
+
     public boolean getIsReversed() {
         return count < 0;
     }
diff --git a/runtime/src/jet/ShortRange.java b/runtime/src/jet/ShortRange.java
index cc251f56710..c3468928a06 100644
--- a/runtime/src/jet/ShortRange.java
+++ b/runtime/src/jet/ShortRange.java
@@ -43,13 +43,6 @@ public final class ShortRange implements Range<Short>, ShortIterable {
         }
     }
 
-    public ShortIterator step(int step) {
-        if (step < 0)
-            return new ShortIteratorImpl(getEnd(), -count, -step);
-        else
-            return new ShortIteratorImpl(start, count, step);
-    }
-
     @Override
     public boolean contains(Short item) {
         if (item == null) return false;
@@ -86,6 +79,13 @@ public final class ShortRange implements Range<Short>, ShortIterable {
         return result;
     }
 
+    public ShortIterator step(int step) {
+        if (step < 0)
+            return new ShortIteratorImpl(getEnd(), -count, -step);
+        else
+            return new ShortIteratorImpl(start, count, step);
+    }
+
     public boolean getIsReversed() {
         return count < 0;
     }