Repository: groovy Updated Branches: refs/heads/GROOVY_2_6_X f7b19f729 -> 59c261fb9
Minor refactoring (cherry picked from commit 852c85e) Project: http://git-wip-us.apache.org/repos/asf/groovy/repo Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/19fc000f Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/19fc000f Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/19fc000f Branch: refs/heads/GROOVY_2_6_X Commit: 19fc000faa0be7da6b5fc7b33fca250272de8fd4 Parents: f7b19f7 Author: sunlan <[email protected]> Authored: Sat Jun 24 15:18:30 2017 +0800 Committer: sunlan <[email protected]> Committed: Sat Jun 24 16:40:20 2017 +0800 ---------------------------------------------------------------------- src/main/org/codehaus/groovy/runtime/DefaultGroovyMethods.java | 2 +- .../codehaus/groovy/runtime/metaclass/MetaClassRegistryImpl.java | 2 +- .../codehaus/groovy/transform/stc/StaticTypeCheckingSupport.java | 2 +- .../src/main/groovy/org/codehaus/groovy/tools/DocGenerator.groovy | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/groovy/blob/19fc000f/src/main/org/codehaus/groovy/runtime/DefaultGroovyMethods.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/runtime/DefaultGroovyMethods.java b/src/main/org/codehaus/groovy/runtime/DefaultGroovyMethods.java index 36c2453..e504371 100644 --- a/src/main/org/codehaus/groovy/runtime/DefaultGroovyMethods.java +++ b/src/main/org/codehaus/groovy/runtime/DefaultGroovyMethods.java @@ -104,7 +104,7 @@ public class DefaultGroovyMethods extends DefaultGroovyMethodsSupport { private static final BigInteger BI_LONG_MAX = BigInteger.valueOf(Long.MAX_VALUE); private static final BigInteger BI_LONG_MIN = BigInteger.valueOf(Long.MIN_VALUE); - public static final Class [] additionals = { + public static final Class [] ADDITIONAL_CLASSES = { NumberNumberPlus.class, NumberNumberMultiply.class, NumberNumberMinus.class, http://git-wip-us.apache.org/repos/asf/groovy/blob/19fc000f/src/main/org/codehaus/groovy/runtime/metaclass/MetaClassRegistryImpl.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/runtime/metaclass/MetaClassRegistryImpl.java b/src/main/org/codehaus/groovy/runtime/metaclass/MetaClassRegistryImpl.java index c8692a0..8c39102 100644 --- a/src/main/org/codehaus/groovy/runtime/metaclass/MetaClassRegistryImpl.java +++ b/src/main/org/codehaus/groovy/runtime/metaclass/MetaClassRegistryImpl.java @@ -94,7 +94,7 @@ public class MetaClassRegistryImpl implements MetaClassRegistry{ // let's register the default methods registerMethods(null, true, true, map); - final Class[] additionals = DefaultGroovyMethods.additionals; + final Class[] additionals = DefaultGroovyMethods.ADDITIONAL_CLASSES; for (int i = 0; i != additionals.length; ++i) { createMetaMethodFromClass(map, additionals[i]); } http://git-wip-us.apache.org/repos/asf/groovy/blob/19fc000f/src/main/org/codehaus/groovy/transform/stc/StaticTypeCheckingSupport.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/transform/stc/StaticTypeCheckingSupport.java b/src/main/org/codehaus/groovy/transform/stc/StaticTypeCheckingSupport.java index 1aebf93..98fb157 100644 --- a/src/main/org/codehaus/groovy/transform/stc/StaticTypeCheckingSupport.java +++ b/src/main/org/codehaus/groovy/transform/stc/StaticTypeCheckingSupport.java @@ -2112,7 +2112,7 @@ public abstract class StaticTypeCheckingSupport { } Map<String, List<MethodNode>> methods = new HashMap<String, List<MethodNode>>(); Collections.addAll(instanceExtClasses, DefaultGroovyMethods.DGM_LIKE_CLASSES); - Collections.addAll(instanceExtClasses, DefaultGroovyMethods.additionals); + Collections.addAll(instanceExtClasses, DefaultGroovyMethods.ADDITIONAL_CLASSES); staticExtClasses.add(DefaultGroovyStaticMethods.class); instanceExtClasses.add(ObjectArrayStaticTypesHelper.class); http://git-wip-us.apache.org/repos/asf/groovy/blob/19fc000f/subprojects/groovy-docgenerator/src/main/groovy/org/codehaus/groovy/tools/DocGenerator.groovy ---------------------------------------------------------------------- diff --git a/subprojects/groovy-docgenerator/src/main/groovy/org/codehaus/groovy/tools/DocGenerator.groovy b/subprojects/groovy-docgenerator/src/main/groovy/org/codehaus/groovy/tools/DocGenerator.groovy index 5315b12..2053f3e 100644 --- a/subprojects/groovy-docgenerator/src/main/groovy/org/codehaus/groovy/tools/DocGenerator.groovy +++ b/subprojects/groovy-docgenerator/src/main/groovy/org/codehaus/groovy/tools/DocGenerator.groovy @@ -243,7 +243,7 @@ class DocGenerator { def srcFiles = options.arguments().collect { DocUtil.sourceFileOf(it) } try { - DefaultGroovyMethods.additionals.each { aClass -> + DefaultGroovyMethods.ADDITIONAL_CLASSES.each { aClass -> def className = aClass.name.replaceAll(/\$.*/, '') def additionalFile = DocUtil.sourceFileOf(className) if (srcFiles.every { it.canonicalPath != additionalFile.canonicalPath }) {
