You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@groovy.apache.org by pa...@apache.org on 2016/07/16 03:45:15 UTC
[1/3] groovy git commit: trivial refactor - use consistent naming for
iterator usage
Repository: groovy
Updated Branches:
refs/heads/GROOVY_2_4_X 58aef7a94 -> 8127d47a8
trivial refactor - use consistent naming for iterator usage
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/ab2b0ae3
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/ab2b0ae3
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/ab2b0ae3
Branch: refs/heads/GROOVY_2_4_X
Commit: ab2b0ae36ecf1c21f7f7417e8cb22af8abe61d7d
Parents: 56dfa5c
Author: paulk <pa...@asert.com.au>
Authored: Fri Jul 8 12:58:05 2016 +1000
Committer: paulk <pa...@asert.com.au>
Committed: Fri Jul 8 13:27:07 2016 +1000
----------------------------------------------------------------------
src/main/groovy/lang/ObjectRange.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/groovy/blob/ab2b0ae3/src/main/groovy/lang/ObjectRange.java
----------------------------------------------------------------------
diff --git a/src/main/groovy/lang/ObjectRange.java b/src/main/groovy/lang/ObjectRange.java
index 71839eb..1df0576 100644
--- a/src/main/groovy/lang/ObjectRange.java
+++ b/src/main/groovy/lang/ObjectRange.java
@@ -346,13 +346,13 @@ public class ObjectRange extends AbstractList implements Range {
*/
@Override
public boolean contains(Object value) {
- final Iterator it = iterator();
+ final Iterator iter = iterator();
if (value == null) {
return false;
}
- while (it.hasNext()) {
+ while (iter.hasNext()) {
try {
- if (DefaultTypeTransformation.compareEqual(value, it.next())) return true;
+ if (DefaultTypeTransformation.compareEqual(value, iter.next())) return true;
} catch (ClassCastException e) {
return false;
}
[2/3] groovy git commit: Merge branch 'GROOVY_2_4_X' of
http://git-wip-us.apache.org/repos/asf/groovy into GROOVY_2_4_X
Posted by pa...@apache.org.
Merge branch 'GROOVY_2_4_X' of http://git-wip-us.apache.org/repos/asf/groovy into GROOVY_2_4_X
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/25a460f1
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/25a460f1
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/25a460f1
Branch: refs/heads/GROOVY_2_4_X
Commit: 25a460f1f7a19a4bdc04ca8f7b936bde0f77d8ec
Parents: ab2b0ae 58aef7a
Author: paulk <pa...@asert.com.au>
Authored: Wed Jul 13 19:28:17 2016 +1000
Committer: paulk <pa...@asert.com.au>
Committed: Wed Jul 13 19:28:17 2016 +1000
----------------------------------------------------------------------
.../src/main/java/groovy/json/internal/LazyMap.java | 4 ++--
.../src/main/java/groovy/json/internal/LazyValueMap.java | 2 +-
.../groovy-json/src/main/java/groovy/json/internal/Sys.java | 6 ++++++
3 files changed, 9 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
[3/3] groovy git commit: GROOVY-7887: Typo s/now/know/ in
core-domain-specific-languages
Posted by pa...@apache.org.
GROOVY-7887: Typo s/now/know/ in core-domain-specific-languages
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/8127d47a
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/8127d47a
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/8127d47a
Branch: refs/heads/GROOVY_2_4_X
Commit: 8127d47a8e385bd523c7859de8ee35398e4e0f3e
Parents: 25a460f
Author: paulk <pa...@asert.com.au>
Authored: Sat Jul 16 11:39:08 2016 +1000
Committer: paulk <pa...@asert.com.au>
Committed: Sat Jul 16 13:44:55 2016 +1000
----------------------------------------------------------------------
src/spec/doc/core-domain-specific-languages.adoc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/groovy/blob/8127d47a/src/spec/doc/core-domain-specific-languages.adoc
----------------------------------------------------------------------
diff --git a/src/spec/doc/core-domain-specific-languages.adoc b/src/spec/doc/core-domain-specific-languages.adoc
index 6c0b16d..77c26c2 100644
--- a/src/spec/doc/core-domain-specific-languages.adoc
+++ b/src/spec/doc/core-domain-specific-languages.adoc
@@ -476,7 +476,7 @@ include::{projectdir}/src/spec/test/DelegatesToSpecTest.groovy[tags=delegatesto_
Remember that this works out of the box�*without* having to annotate
with�`@DelegatesTo`. However, to make the IDE aware of the delegate
type, or the�*type checker* aware of it, we need to add�`@DelegatesTo`.
-And in this case, it will now that the�`Greeter` variable is of
+And in this case, it will know that the�`Greeter` variable is of
type�`Greeter`, so it will not report errors on the�_sayHello_
method�*even if the exec method doesn\u2019t explicitly define the target as
of type Greeter*. This is a very powerful feature, because it prevents