Repository: groovy Updated Branches: refs/heads/GROOVY_2_5_X 7c669b46d -> 9f9c6625b
Refine tuples (cherry picked from commit d6b0cb4) Project: http://git-wip-us.apache.org/repos/asf/groovy/repo Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/4da35cde Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/4da35cde Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/4da35cde Branch: refs/heads/GROOVY_2_5_X Commit: 4da35cded2f15765a142bd0fc2f7a5e89f0a1ddc Parents: 7c669b4 Author: sunlan <[email protected]> Authored: Sat Sep 16 15:38:43 2017 +0800 Committer: sunlan <[email protected]> Committed: Sat Sep 16 16:44:06 2017 +0800 ---------------------------------------------------------------------- src/main/groovy/lang/Tuple1.java | 4 +++- src/main/groovy/lang/Tuple2.java | 4 +++- src/main/groovy/lang/Tuple3.java | 4 +++- src/main/groovy/lang/Tuple4.java | 4 +++- src/main/groovy/lang/Tuple5.java | 4 +++- src/main/groovy/lang/Tuple6.java | 4 +++- src/main/groovy/lang/Tuple7.java | 4 +++- src/main/groovy/lang/Tuple8.java | 4 +++- src/main/groovy/lang/Tuple9.java | 4 +++- 9 files changed, 27 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/groovy/blob/4da35cde/src/main/groovy/lang/Tuple1.java ---------------------------------------------------------------------- diff --git a/src/main/groovy/lang/Tuple1.java b/src/main/groovy/lang/Tuple1.java index f57bc3b..1506bb0 100644 --- a/src/main/groovy/lang/Tuple1.java +++ b/src/main/groovy/lang/Tuple1.java @@ -23,10 +23,12 @@ package groovy.lang; * * @since 2.5.0 */ -public class Tuple1<T1> extends AbstractTuple { +public class Tuple1<T1> extends Tuple { private final T1 first; public Tuple1(T1 first) { + super(first); + this.first = first; } http://git-wip-us.apache.org/repos/asf/groovy/blob/4da35cde/src/main/groovy/lang/Tuple2.java ---------------------------------------------------------------------- diff --git a/src/main/groovy/lang/Tuple2.java b/src/main/groovy/lang/Tuple2.java index fe64d5e..d3a8be7 100644 --- a/src/main/groovy/lang/Tuple2.java +++ b/src/main/groovy/lang/Tuple2.java @@ -21,11 +21,13 @@ package groovy.lang; /** * Represents a list of 2 typed Objects. */ -public class Tuple2<T1, T2> extends AbstractTuple { +public class Tuple2<T1, T2> extends Tuple { private final T1 first; private final T2 second; public Tuple2(T1 first, T2 second) { + super(first, second); + this.first = first; this.second = second; } http://git-wip-us.apache.org/repos/asf/groovy/blob/4da35cde/src/main/groovy/lang/Tuple3.java ---------------------------------------------------------------------- diff --git a/src/main/groovy/lang/Tuple3.java b/src/main/groovy/lang/Tuple3.java index 59b06f5..de539ec 100644 --- a/src/main/groovy/lang/Tuple3.java +++ b/src/main/groovy/lang/Tuple3.java @@ -24,12 +24,14 @@ package groovy.lang; * * @since 2.5.0 */ -public class Tuple3<T1, T2, T3> extends AbstractTuple { +public class Tuple3<T1, T2, T3> extends Tuple { private final T1 first; private final T2 second; private final T3 third; public Tuple3(T1 first, T2 second, T3 third) { + super(first, second, third); + this.first = first; this.second = second; this.third = third; http://git-wip-us.apache.org/repos/asf/groovy/blob/4da35cde/src/main/groovy/lang/Tuple4.java ---------------------------------------------------------------------- diff --git a/src/main/groovy/lang/Tuple4.java b/src/main/groovy/lang/Tuple4.java index b3cf839..069f3af 100644 --- a/src/main/groovy/lang/Tuple4.java +++ b/src/main/groovy/lang/Tuple4.java @@ -24,13 +24,15 @@ package groovy.lang; * * @since 2.5.0 */ -public class Tuple4<T1, T2, T3, T4> extends AbstractTuple { +public class Tuple4<T1, T2, T3, T4> extends Tuple { private final T1 first; private final T2 second; private final T3 third; private final T4 fourth; public Tuple4(T1 first, T2 second, T3 third, T4 fourth) { + super(first, second, third, fourth); + this.first = first; this.second = second; this.third = third; http://git-wip-us.apache.org/repos/asf/groovy/blob/4da35cde/src/main/groovy/lang/Tuple5.java ---------------------------------------------------------------------- diff --git a/src/main/groovy/lang/Tuple5.java b/src/main/groovy/lang/Tuple5.java index c83d792..ea61507 100644 --- a/src/main/groovy/lang/Tuple5.java +++ b/src/main/groovy/lang/Tuple5.java @@ -24,7 +24,7 @@ package groovy.lang; * * @since 2.5.0 */ -public class Tuple5<T1, T2, T3, T4, T5> extends AbstractTuple { +public class Tuple5<T1, T2, T3, T4, T5> extends Tuple { private final T1 first; private final T2 second; private final T3 third; @@ -32,6 +32,8 @@ public class Tuple5<T1, T2, T3, T4, T5> extends AbstractTuple { private final T5 fifth; public Tuple5(T1 first, T2 second, T3 third, T4 fourth, T5 fifth) { + super(first, second, third, fourth, fifth); + this.first = first; this.second = second; this.third = third; http://git-wip-us.apache.org/repos/asf/groovy/blob/4da35cde/src/main/groovy/lang/Tuple6.java ---------------------------------------------------------------------- diff --git a/src/main/groovy/lang/Tuple6.java b/src/main/groovy/lang/Tuple6.java index 9dce3fb..6982aa2 100644 --- a/src/main/groovy/lang/Tuple6.java +++ b/src/main/groovy/lang/Tuple6.java @@ -24,7 +24,7 @@ package groovy.lang; * * @since 2.5.0 */ -public class Tuple6<T1, T2, T3, T4, T5, T6> extends AbstractTuple { +public class Tuple6<T1, T2, T3, T4, T5, T6> extends Tuple { private final T1 first; private final T2 second; private final T3 third; @@ -33,6 +33,8 @@ public class Tuple6<T1, T2, T3, T4, T5, T6> extends AbstractTuple { private final T6 sixth; public Tuple6(T1 first, T2 second, T3 third, T4 fourth, T5 fifth, T6 sixth) { + super(first, second, third, fourth, fifth, sixth); + this.first = first; this.second = second; this.third = third; http://git-wip-us.apache.org/repos/asf/groovy/blob/4da35cde/src/main/groovy/lang/Tuple7.java ---------------------------------------------------------------------- diff --git a/src/main/groovy/lang/Tuple7.java b/src/main/groovy/lang/Tuple7.java index c799335..126c215 100644 --- a/src/main/groovy/lang/Tuple7.java +++ b/src/main/groovy/lang/Tuple7.java @@ -24,7 +24,7 @@ package groovy.lang; * * @since 2.5.0 */ -public class Tuple7<T1, T2, T3, T4, T5, T6, T7> extends AbstractTuple { +public class Tuple7<T1, T2, T3, T4, T5, T6, T7> extends Tuple { private final T1 first; private final T2 second; private final T3 third; @@ -34,6 +34,8 @@ public class Tuple7<T1, T2, T3, T4, T5, T6, T7> extends AbstractTuple { private final T7 seventh; public Tuple7(T1 first, T2 second, T3 third, T4 fourth, T5 fifth, T6 sixth, T7 seventh) { + super(first, second, third, fourth, fifth, sixth, seventh); + this.first = first; this.second = second; this.third = third; http://git-wip-us.apache.org/repos/asf/groovy/blob/4da35cde/src/main/groovy/lang/Tuple8.java ---------------------------------------------------------------------- diff --git a/src/main/groovy/lang/Tuple8.java b/src/main/groovy/lang/Tuple8.java index b95ea83..1881213 100644 --- a/src/main/groovy/lang/Tuple8.java +++ b/src/main/groovy/lang/Tuple8.java @@ -24,7 +24,7 @@ package groovy.lang; * * @since 2.5.0 */ -public class Tuple8<T1, T2, T3, T4, T5, T6, T7, T8> extends AbstractTuple { +public class Tuple8<T1, T2, T3, T4, T5, T6, T7, T8> extends Tuple { private final T1 first; private final T2 second; private final T3 third; @@ -35,6 +35,8 @@ public class Tuple8<T1, T2, T3, T4, T5, T6, T7, T8> extends AbstractTuple { private final T8 eighth; public Tuple8(T1 first, T2 second, T3 third, T4 fourth, T5 fifth, T6 sixth, T7 seventh, T8 eighth) { + super(first, second, third, fourth, fifth, sixth, seventh, eighth); + this.first = first; this.second = second; this.third = third; http://git-wip-us.apache.org/repos/asf/groovy/blob/4da35cde/src/main/groovy/lang/Tuple9.java ---------------------------------------------------------------------- diff --git a/src/main/groovy/lang/Tuple9.java b/src/main/groovy/lang/Tuple9.java index 04fc0aa..7d48073 100644 --- a/src/main/groovy/lang/Tuple9.java +++ b/src/main/groovy/lang/Tuple9.java @@ -25,7 +25,7 @@ package groovy.lang; * * @since 2.5.0 */ -public class Tuple9<T1, T2, T3, T4, T5, T6, T7, T8, T9> extends AbstractTuple { +public class Tuple9<T1, T2, T3, T4, T5, T6, T7, T8, T9> extends Tuple { private final T1 first; private final T2 second; private final T3 third; @@ -37,6 +37,8 @@ public class Tuple9<T1, T2, T3, T4, T5, T6, T7, T8, T9> extends AbstractTuple { private final T9 ninth; public Tuple9(T1 first, T2 second, T3 third, T4 fourth, T5 fifth, T6 sixth, T7 seventh, T8 eighth, T9 ninth) { + super(first, second, third, fourth, fifth, sixth, seventh, eighth, ninth); + this.first = first; this.second = second; this.third = third;
