Simpler toString() in ranges.

JetBrains · Jan 29, 2013 · 8c4abd4 · 8c4abd4
1 parent 0ff3589
commit 8c4abd4
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 63 deletions.
diff --git a/runtime/src/jet/ByteRange.java b/runtime/src/jet/ByteRange.java
@@ -32,15 +32,7 @@ public ByteRange(byte startValue, int count) {
 
     @Override
     public String toString() {
-        if (count == 0) {
-            return "<empty range>";
-        }
-        else if (count > 0) {
-            return getStart() + ".rangeTo(" + getEnd() + ")";
-        }
-        else {
-            return getStart() + ".downTo(" + getEnd() + ")";
-        }
+        return getStart() + ".." + getEnd();
     }
 
     @Override

diff --git a/runtime/src/jet/CharRange.java b/runtime/src/jet/CharRange.java
@@ -32,15 +32,7 @@ public CharRange(char startValue, int count) {
 
     @Override
     public String toString() {
-        if (count == 0) {
-            return "<empty range>";
-        }
-        else if (count > 0) {
-            return getStart() + ".rangeTo(" + getEnd() + ")";
-        }
-        else {
-            return getStart() + ".downTo(" + getEnd() + ")";
-        }
+        return getStart() + ".." + getEnd();
     }
 
     @Override

diff --git a/runtime/src/jet/DoubleRange.java b/runtime/src/jet/DoubleRange.java
@@ -32,15 +32,7 @@ public DoubleRange(double startValue, double size) {
 
     @Override
     public String toString() {
-        if (size == 0.0) {
-            return "<empty range>";
-        }
-        else if (size > 0) {
-            return getStart() + ".rangeTo(" + getEnd() + ")";
-        }
-        else {
-            return getStart() + ".downTo(" + getEnd() + ")";
-        }
+        return getStart() + ".." + getEnd();
     }
 
     @Override

diff --git a/runtime/src/jet/FloatRange.java b/runtime/src/jet/FloatRange.java
@@ -32,15 +32,7 @@ public FloatRange(float startValue, float size) {
 
     @Override
     public String toString() {
-        if (size == 0.0) {
-            return "<empty range>";
-        }
-        else if (size > 0) {
-            return getStart() + ".rangeTo(" + getEnd() + ")";
-        }
-        else {
-            return getStart() + ".downTo(" + getEnd() + ")";
-        }
+        return getStart() + ".." + getEnd();
     }
 
     @Override

diff --git a/runtime/src/jet/IntRange.java b/runtime/src/jet/IntRange.java
@@ -32,15 +32,7 @@ public IntRange(int startValue, int count) {
 
     @Override
     public String toString() {
-        if (count == 0) {
-            return "<empty range>";
-        }
-        else if (count > 0) {
-            return getStart() + ".rangeTo(" + getEnd() + ")";
-        }
-        else {
-            return getStart() + ".downTo(" + getEnd() + ")";
-        }
+        return getStart() + ".." + getEnd();
     }
 
     @Override

diff --git a/runtime/src/jet/LongRange.java b/runtime/src/jet/LongRange.java
@@ -32,15 +32,7 @@ public LongRange(long startValue, long count) {
 
     @Override
     public String toString() {
-        if (count == 0) {
-            return "<empty range>";
-        }
-        else if (count > 0) {
-            return getStart() + ".rangeTo(" + getEnd() + ")";
-        }
-        else {
-            return getStart() + ".downTo(" + getEnd() + ")";
-        }
+        return getStart() + ".." + getEnd();
     }
 
 

diff --git a/runtime/src/jet/ShortRange.java b/runtime/src/jet/ShortRange.java
@@ -32,15 +32,7 @@ public ShortRange(short startValue, int count) {
 
     @Override
     public String toString() {
-        if (count == 0) {
-            return "<empty range>";
-        }
-        else if (count > 0) {
-            return getStart() + ".rangeTo(" + getEnd() + ")";
-        }
-        else {
-            return getStart() + ".downTo(" + getEnd() + ")";
-        }
+        return getStart() + ".." + getEnd();
     }
 
     @Override