You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@groovy.apache.org by su...@apache.org on 2020/01/16 10:07:48 UTC

[groovy] branch master updated: Revert removing `Comparable` for `NumberRange`

This is an automated email from the ASF dual-hosted git repository.

sunlan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/groovy.git


The following commit(s) were added to refs/heads/master by this push:
     new 886aeca  Revert removing `Comparable` for `NumberRange`
886aeca is described below

commit 886aeca15fa8f9b3425085a3a5d7d8a9d839f84c
Author: Daniel Sun <su...@apache.org>
AuthorDate: Thu Jan 16 18:03:54 2020 +0800

    Revert removing `Comparable` for `NumberRange`
---
 src/main/java/groovy/lang/NumberRange.java | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/main/java/groovy/lang/NumberRange.java b/src/main/java/groovy/lang/NumberRange.java
index 74eb4b7..a58dd1b 100644
--- a/src/main/java/groovy/lang/NumberRange.java
+++ b/src/main/java/groovy/lang/NumberRange.java
@@ -96,7 +96,7 @@ public class NumberRange extends AbstractList<Comparable> implements Range<Compa
      * @param from the first value in the range
      * @param to   the last value in the range
      */
-    public <T extends Number, U extends Number>
+    public <T extends Number & Comparable, U extends Number & Comparable>
     NumberRange(T from, U to) {
         this(from, to, null, true);
     }
@@ -109,7 +109,7 @@ public class NumberRange extends AbstractList<Comparable> implements Range<Compa
      * @param to   end of the range
      * @param inclusive whether the range is inclusive
      */
-    public <T extends Number, U extends Number>
+    public <T extends Number & Comparable, U extends Number & Comparable>
     NumberRange(T from, U to, boolean inclusive) {
         this(from, to, null, inclusive);
     }
@@ -122,7 +122,7 @@ public class NumberRange extends AbstractList<Comparable> implements Range<Compa
      * @param to   end of the range
      * @param stepSize the gap between discrete elements in the range
      */
-    public <T extends Number, U extends Number, V extends
+    public <T extends Number & Comparable, U extends Number & Comparable, V extends
             Number & Comparable<? super Number>>
     NumberRange(T from, U to, V stepSize) {
         this(from, to, stepSize, true);
@@ -137,8 +137,8 @@ public class NumberRange extends AbstractList<Comparable> implements Range<Compa
      * @param stepSize the gap between discrete elements in the range
      * @param inclusive whether the range is inclusive
      */
-    public <T extends Number, U extends Number, V extends
-            Number>
+    public <T extends Number & Comparable, U extends Number & Comparable, V extends
+            Number & Comparable>
     NumberRange(T from, U to, V stepSize, boolean inclusive) {
         if (from == null) {
             throw new IllegalArgumentException("Must specify a non-null value for the 'from' index in a Range");
@@ -201,7 +201,7 @@ public class NumberRange extends AbstractList<Comparable> implements Range<Compa
      * @param stepSize the desired step size
      * @return a new NumberRange
      */
-    public <T extends Number> NumberRange by(T stepSize) {
+    public <T extends Number & Comparable> NumberRange by(T stepSize) {
         if (!Integer.valueOf(1).equals(this.stepSize)) {
             throw new IllegalStateException("by only allowed on ranges with original stepSize = 1 but found " + this.stepSize);
         }
@@ -209,12 +209,12 @@ public class NumberRange extends AbstractList<Comparable> implements Range<Compa
     }
 
     @SuppressWarnings("unchecked")
-    /* package private */ static <T extends Number> T comparableNumber(Comparable c) {
+    /* package private */ static <T extends Number & Comparable> T comparableNumber(Comparable c) {
         return (T) c;
     }
 
     @SuppressWarnings("unchecked")
-    /* package private */ static <T extends Number> T comparableNumber(Number n) {
+    /* package private */ static <T extends Number & Comparable> T comparableNumber(Number n) {
         return (T) n;
     }