http://git-wip-us.apache.org/repos/asf/groovy/blob/0cfb0d91/src/main/org/codehaus/groovy/runtime/ResourceGroovyMethods.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/runtime/ResourceGroovyMethods.java b/src/main/org/codehaus/groovy/runtime/ResourceGroovyMethods.java index 7d85f61..039dc62 100644 --- a/src/main/org/codehaus/groovy/runtime/ResourceGroovyMethods.java +++ b/src/main/org/codehaus/groovy/runtime/ResourceGroovyMethods.java @@ -29,11 +29,31 @@ import groovy.transform.stc.ClosureParams; import groovy.transform.stc.FromString; import groovy.transform.stc.SimpleType; import groovy.util.CharsetToolkit; - import org.codehaus.groovy.runtime.callsite.BooleanReturningMethodInvoker; import org.codehaus.groovy.runtime.typehandling.DefaultTypeTransformation; -import java.io.*; +import java.io.BufferedInputStream; +import java.io.BufferedOutputStream; +import java.io.BufferedReader; +import java.io.BufferedWriter; +import java.io.DataInputStream; +import java.io.DataOutputStream; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.io.FileOutputStream; +import java.io.FileWriter; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.io.ObjectInputStream; +import java.io.ObjectOutputStream; +import java.io.OutputStream; +import java.io.OutputStreamWriter; +import java.io.PrintWriter; +import java.io.Reader; +import java.io.UnsupportedEncodingException; +import java.io.Writer; import java.net.MalformedURLException; import java.net.URI; import java.net.URISyntaxException;
http://git-wip-us.apache.org/repos/asf/groovy/blob/0cfb0d91/src/main/org/codehaus/groovy/runtime/ScriptBytecodeAdapter.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/runtime/ScriptBytecodeAdapter.java b/src/main/org/codehaus/groovy/runtime/ScriptBytecodeAdapter.java index 840be3c..a35a94b 100644 --- a/src/main/org/codehaus/groovy/runtime/ScriptBytecodeAdapter.java +++ b/src/main/org/codehaus/groovy/runtime/ScriptBytecodeAdapter.java @@ -18,8 +18,18 @@ */ package org.codehaus.groovy.runtime; -import groovy.lang.*; - +import groovy.lang.Closure; +import groovy.lang.EmptyRange; +import groovy.lang.GroovyInterceptable; +import groovy.lang.GroovyObject; +import groovy.lang.GroovyRuntimeException; +import groovy.lang.GroovySystem; +import groovy.lang.IntRange; +import groovy.lang.MetaClass; +import groovy.lang.MissingMethodException; +import groovy.lang.MissingPropertyException; +import groovy.lang.ObjectRange; +import groovy.lang.Tuple; import org.codehaus.groovy.runtime.metaclass.MissingMethodExceptionNoStack; import org.codehaus.groovy.runtime.metaclass.MissingMethodExecutionFailed; import org.codehaus.groovy.runtime.metaclass.MissingPropertyExceptionNoStack; @@ -28,7 +38,10 @@ import org.codehaus.groovy.runtime.wrappers.GroovyObjectWrapper; import org.codehaus.groovy.runtime.wrappers.PojoWrapper; import org.codehaus.groovy.runtime.wrappers.Wrapper; -import java.util.*; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; +import java.util.Map; import java.util.regex.Matcher; import java.util.regex.Pattern; http://git-wip-us.apache.org/repos/asf/groovy/blob/0cfb0d91/src/main/org/codehaus/groovy/runtime/StackTraceUtils.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/runtime/StackTraceUtils.java b/src/main/org/codehaus/groovy/runtime/StackTraceUtils.java index dfc0f50..41b5d04 100644 --- a/src/main/org/codehaus/groovy/runtime/StackTraceUtils.java +++ b/src/main/org/codehaus/groovy/runtime/StackTraceUtils.java @@ -19,6 +19,7 @@ package org.codehaus.groovy.runtime; import groovy.lang.Closure; +import org.codehaus.groovy.runtime.typehandling.DefaultTypeTransformation; import java.io.PrintWriter; import java.util.ArrayList; @@ -28,8 +29,6 @@ import java.util.logging.Level; import java.util.logging.LogManager; import java.util.logging.Logger; -import org.codehaus.groovy.runtime.typehandling.DefaultTypeTransformation; - /** * Originally was grails.utils.GrailsUtils, removed some grails specific stuff. * Utility methods removing internal lines from stack traces http://git-wip-us.apache.org/repos/asf/groovy/blob/0cfb0d91/src/main/org/codehaus/groovy/runtime/StringGroovyMethods.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/runtime/StringGroovyMethods.java b/src/main/org/codehaus/groovy/runtime/StringGroovyMethods.java index 707af50..2dd1335 100644 --- a/src/main/org/codehaus/groovy/runtime/StringGroovyMethods.java +++ b/src/main/org/codehaus/groovy/runtime/StringGroovyMethods.java @@ -23,7 +23,6 @@ import groovy.lang.EmptyRange; import groovy.lang.GString; import groovy.lang.IntRange; import groovy.lang.Range; - import groovy.transform.stc.ClosureParams; import groovy.transform.stc.FromString; import groovy.transform.stc.SimpleType; http://git-wip-us.apache.org/repos/asf/groovy/blob/0cfb0d91/src/main/org/codehaus/groovy/runtime/callsite/AbstractCallSite.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/runtime/callsite/AbstractCallSite.java b/src/main/org/codehaus/groovy/runtime/callsite/AbstractCallSite.java index a40543c..d85e445 100644 --- a/src/main/org/codehaus/groovy/runtime/callsite/AbstractCallSite.java +++ b/src/main/org/codehaus/groovy/runtime/callsite/AbstractCallSite.java @@ -18,8 +18,11 @@ */ package org.codehaus.groovy.runtime.callsite; -import groovy.lang.*; - +import groovy.lang.GroovyObject; +import groovy.lang.GroovyRuntimeException; +import groovy.lang.MetaClass; +import groovy.lang.MetaClassImpl; +import groovy.lang.MetaProperty; import org.codehaus.groovy.reflection.CachedClass; import org.codehaus.groovy.reflection.CachedField; import org.codehaus.groovy.reflection.ParameterTypes; http://git-wip-us.apache.org/repos/asf/groovy/blob/0cfb0d91/src/main/org/codehaus/groovy/runtime/callsite/BooleanClosureWrapper.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/runtime/callsite/BooleanClosureWrapper.java b/src/main/org/codehaus/groovy/runtime/callsite/BooleanClosureWrapper.java index fa7dcc3..28d0f0a 100644 --- a/src/main/org/codehaus/groovy/runtime/callsite/BooleanClosureWrapper.java +++ b/src/main/org/codehaus/groovy/runtime/callsite/BooleanClosureWrapper.java @@ -18,11 +18,11 @@ */ package org.codehaus.groovy.runtime.callsite; +import groovy.lang.Closure; + import java.util.Map; import java.util.Map.Entry; -import groovy.lang.Closure; - /** * Helper class for internal use only. This allows to call a {@link Closure} and * convert the result to a boolean. It will do this by caching the possible "doCall" http://git-wip-us.apache.org/repos/asf/groovy/blob/0cfb0d91/src/main/org/codehaus/groovy/runtime/callsite/CallSiteArray.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/runtime/callsite/CallSiteArray.java b/src/main/org/codehaus/groovy/runtime/callsite/CallSiteArray.java index 0f82e84..c2c2cf2 100644 --- a/src/main/org/codehaus/groovy/runtime/callsite/CallSiteArray.java +++ b/src/main/org/codehaus/groovy/runtime/callsite/CallSiteArray.java @@ -18,14 +18,13 @@ */ package org.codehaus.groovy.runtime.callsite; -import groovy.lang.MetaClass; -import groovy.lang.MetaClassImpl; import groovy.lang.GroovyInterceptable; import groovy.lang.GroovyObject; - +import groovy.lang.MetaClass; +import groovy.lang.MetaClassImpl; +import org.codehaus.groovy.reflection.ClassInfo; import org.codehaus.groovy.runtime.GroovyCategorySupport; import org.codehaus.groovy.runtime.InvokerHelper; -import org.codehaus.groovy.reflection.ClassInfo; import java.security.AccessController; import java.security.PrivilegedAction; http://git-wip-us.apache.org/repos/asf/groovy/blob/0cfb0d91/src/main/org/codehaus/groovy/runtime/callsite/CallSiteClassLoader.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/runtime/callsite/CallSiteClassLoader.java b/src/main/org/codehaus/groovy/runtime/callsite/CallSiteClassLoader.java index 3faab54..ad62e5f 100644 --- a/src/main/org/codehaus/groovy/runtime/callsite/CallSiteClassLoader.java +++ b/src/main/org/codehaus/groovy/runtime/callsite/CallSiteClassLoader.java @@ -20,9 +20,9 @@ package org.codehaus.groovy.runtime.callsite; import org.codehaus.groovy.reflection.ClassLoaderForClassArtifacts; -import java.util.Set; -import java.util.HashSet; import java.util.Collections; +import java.util.HashSet; +import java.util.Set; public class CallSiteClassLoader extends ClassLoaderForClassArtifacts { http://git-wip-us.apache.org/repos/asf/groovy/blob/0cfb0d91/src/main/org/codehaus/groovy/runtime/callsite/CallSiteGenerator.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/runtime/callsite/CallSiteGenerator.java b/src/main/org/codehaus/groovy/runtime/callsite/CallSiteGenerator.java index 10cb05f..7b616c9 100644 --- a/src/main/org/codehaus/groovy/runtime/callsite/CallSiteGenerator.java +++ b/src/main/org/codehaus/groovy/runtime/callsite/CallSiteGenerator.java @@ -18,6 +18,7 @@ */ package org.codehaus.groovy.runtime.callsite; +import groovy.lang.GroovyRuntimeException; import org.codehaus.groovy.ast.ClassHelper; import org.codehaus.groovy.classgen.GeneratorContext; import org.codehaus.groovy.classgen.asm.BytecodeHelper; @@ -29,8 +30,6 @@ import org.objectweb.asm.Label; import org.objectweb.asm.MethodVisitor; import org.objectweb.asm.Opcodes; -import groovy.lang.GroovyRuntimeException; - import java.lang.reflect.Constructor; import java.lang.reflect.Method; import java.lang.reflect.Modifier; http://git-wip-us.apache.org/repos/asf/groovy/blob/0cfb0d91/src/main/org/codehaus/groovy/runtime/callsite/ClassMetaClassGetPropertySite.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/runtime/callsite/ClassMetaClassGetPropertySite.java b/src/main/org/codehaus/groovy/runtime/callsite/ClassMetaClassGetPropertySite.java index 77c4417..749c7bb 100644 --- a/src/main/org/codehaus/groovy/runtime/callsite/ClassMetaClassGetPropertySite.java +++ b/src/main/org/codehaus/groovy/runtime/callsite/ClassMetaClassGetPropertySite.java @@ -20,7 +20,6 @@ package org.codehaus.groovy.runtime.callsite; import groovy.lang.GroovyRuntimeException; import groovy.lang.MetaClass; - import org.codehaus.groovy.reflection.ClassInfo; import org.codehaus.groovy.runtime.ScriptBytecodeAdapter; http://git-wip-us.apache.org/repos/asf/groovy/blob/0cfb0d91/src/main/org/codehaus/groovy/runtime/callsite/ConstructorMetaClassSite.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/runtime/callsite/ConstructorMetaClassSite.java b/src/main/org/codehaus/groovy/runtime/callsite/ConstructorMetaClassSite.java index a1329f1..2309fe6 100644 --- a/src/main/org/codehaus/groovy/runtime/callsite/ConstructorMetaClassSite.java +++ b/src/main/org/codehaus/groovy/runtime/callsite/ConstructorMetaClassSite.java @@ -18,10 +18,9 @@ */ package org.codehaus.groovy.runtime.callsite; -import org.codehaus.groovy.runtime.ScriptBytecodeAdapter; - import groovy.lang.GroovyRuntimeException; import groovy.lang.MetaClass; +import org.codehaus.groovy.runtime.ScriptBytecodeAdapter; public class ConstructorMetaClassSite extends MetaClassSite { public ConstructorMetaClassSite(CallSite site, MetaClass metaClass) { http://git-wip-us.apache.org/repos/asf/groovy/blob/0cfb0d91/src/main/org/codehaus/groovy/runtime/callsite/GetEffectivePogoFieldSite.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/runtime/callsite/GetEffectivePogoFieldSite.java b/src/main/org/codehaus/groovy/runtime/callsite/GetEffectivePogoFieldSite.java index 7e2d125..e8d7816 100644 --- a/src/main/org/codehaus/groovy/runtime/callsite/GetEffectivePogoFieldSite.java +++ b/src/main/org/codehaus/groovy/runtime/callsite/GetEffectivePogoFieldSite.java @@ -18,15 +18,14 @@ */ package org.codehaus.groovy.runtime.callsite; -import groovy.lang.MetaClass; import groovy.lang.GroovyObject; import groovy.lang.GroovyRuntimeException; - -import java.lang.reflect.Field; - +import groovy.lang.MetaClass; import org.codehaus.groovy.reflection.CachedField; import org.codehaus.groovy.runtime.GroovyCategorySupport; +import java.lang.reflect.Field; + public class GetEffectivePogoFieldSite extends AbstractCallSite { private final MetaClass metaClass; private final Field effective; http://git-wip-us.apache.org/repos/asf/groovy/blob/0cfb0d91/src/main/org/codehaus/groovy/runtime/callsite/GetEffectivePogoPropertySite.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/runtime/callsite/GetEffectivePogoPropertySite.java b/src/main/org/codehaus/groovy/runtime/callsite/GetEffectivePogoPropertySite.java index 2020e0f..d5114e0 100644 --- a/src/main/org/codehaus/groovy/runtime/callsite/GetEffectivePogoPropertySite.java +++ b/src/main/org/codehaus/groovy/runtime/callsite/GetEffectivePogoPropertySite.java @@ -18,10 +18,10 @@ */ package org.codehaus.groovy.runtime.callsite; +import groovy.lang.GroovyObject; import groovy.lang.GroovyRuntimeException; import groovy.lang.MetaClass; import groovy.lang.MetaProperty; -import groovy.lang.GroovyObject; import org.codehaus.groovy.runtime.GroovyCategorySupport; import org.codehaus.groovy.runtime.ScriptBytecodeAdapter; http://git-wip-us.apache.org/repos/asf/groovy/blob/0cfb0d91/src/main/org/codehaus/groovy/runtime/callsite/GetEffectivePojoFieldSite.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/runtime/callsite/GetEffectivePojoFieldSite.java b/src/main/org/codehaus/groovy/runtime/callsite/GetEffectivePojoFieldSite.java index fd0be3e..68f7342 100644 --- a/src/main/org/codehaus/groovy/runtime/callsite/GetEffectivePojoFieldSite.java +++ b/src/main/org/codehaus/groovy/runtime/callsite/GetEffectivePojoFieldSite.java @@ -20,12 +20,11 @@ package org.codehaus.groovy.runtime.callsite; import groovy.lang.GroovyRuntimeException; import groovy.lang.MetaClassImpl; - -import java.lang.reflect.Field; - import org.codehaus.groovy.reflection.CachedField; import org.codehaus.groovy.runtime.GroovyCategorySupport; +import java.lang.reflect.Field; + class GetEffectivePojoFieldSite extends AbstractCallSite { private final MetaClassImpl metaClass; private final Field effective; http://git-wip-us.apache.org/repos/asf/groovy/blob/0cfb0d91/src/main/org/codehaus/groovy/runtime/callsite/GetEffectivePojoPropertySite.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/runtime/callsite/GetEffectivePojoPropertySite.java b/src/main/org/codehaus/groovy/runtime/callsite/GetEffectivePojoPropertySite.java index 875fbc4..5399d99 100644 --- a/src/main/org/codehaus/groovy/runtime/callsite/GetEffectivePojoPropertySite.java +++ b/src/main/org/codehaus/groovy/runtime/callsite/GetEffectivePojoPropertySite.java @@ -21,7 +21,6 @@ package org.codehaus.groovy.runtime.callsite; import groovy.lang.GroovyRuntimeException; import groovy.lang.MetaClassImpl; import groovy.lang.MetaProperty; - import org.codehaus.groovy.runtime.GroovyCategorySupport; import org.codehaus.groovy.runtime.ScriptBytecodeAdapter; http://git-wip-us.apache.org/repos/asf/groovy/blob/0cfb0d91/src/main/org/codehaus/groovy/runtime/callsite/GroovySunClassLoader.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/runtime/callsite/GroovySunClassLoader.java b/src/main/org/codehaus/groovy/runtime/callsite/GroovySunClassLoader.java index 4400ecb..f4e9050 100644 --- a/src/main/org/codehaus/groovy/runtime/callsite/GroovySunClassLoader.java +++ b/src/main/org/codehaus/groovy/runtime/callsite/GroovySunClassLoader.java @@ -18,10 +18,10 @@ */ package org.codehaus.groovy.runtime.callsite; +import org.codehaus.groovy.reflection.SunClassLoader; import org.objectweb.asm.ClassReader; import org.objectweb.asm.ClassVisitor; import org.objectweb.asm.ClassWriter; -import org.codehaus.groovy.reflection.SunClassLoader; import java.io.IOException; import java.io.InputStream; http://git-wip-us.apache.org/repos/asf/groovy/blob/0cfb0d91/src/main/org/codehaus/groovy/runtime/callsite/MetaClassConstructorSite.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/runtime/callsite/MetaClassConstructorSite.java b/src/main/org/codehaus/groovy/runtime/callsite/MetaClassConstructorSite.java index 8877450..edbe3b9 100644 --- a/src/main/org/codehaus/groovy/runtime/callsite/MetaClassConstructorSite.java +++ b/src/main/org/codehaus/groovy/runtime/callsite/MetaClassConstructorSite.java @@ -18,11 +18,10 @@ */ package org.codehaus.groovy.runtime.callsite; -import org.codehaus.groovy.reflection.ClassInfo; -import org.codehaus.groovy.runtime.ScriptBytecodeAdapter; - import groovy.lang.GroovyRuntimeException; import groovy.lang.MetaClass; +import org.codehaus.groovy.reflection.ClassInfo; +import org.codehaus.groovy.runtime.ScriptBytecodeAdapter; /** * Call site for constructor http://git-wip-us.apache.org/repos/asf/groovy/blob/0cfb0d91/src/main/org/codehaus/groovy/runtime/callsite/NullCallSite.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/runtime/callsite/NullCallSite.java b/src/main/org/codehaus/groovy/runtime/callsite/NullCallSite.java index da3e3a8..3a6084c 100644 --- a/src/main/org/codehaus/groovy/runtime/callsite/NullCallSite.java +++ b/src/main/org/codehaus/groovy/runtime/callsite/NullCallSite.java @@ -19,7 +19,6 @@ package org.codehaus.groovy.runtime.callsite; import groovy.lang.GroovyRuntimeException; - import org.codehaus.groovy.runtime.InvokerHelper; import org.codehaus.groovy.runtime.NullObject; import org.codehaus.groovy.runtime.ScriptBytecodeAdapter; http://git-wip-us.apache.org/repos/asf/groovy/blob/0cfb0d91/src/main/org/codehaus/groovy/runtime/callsite/PerInstancePojoMetaClassSite.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/runtime/callsite/PerInstancePojoMetaClassSite.java b/src/main/org/codehaus/groovy/runtime/callsite/PerInstancePojoMetaClassSite.java index b4aec2a..4a1125e 100644 --- a/src/main/org/codehaus/groovy/runtime/callsite/PerInstancePojoMetaClassSite.java +++ b/src/main/org/codehaus/groovy/runtime/callsite/PerInstancePojoMetaClassSite.java @@ -19,10 +19,9 @@ package org.codehaus.groovy.runtime.callsite; import groovy.lang.GroovyRuntimeException; - +import org.codehaus.groovy.reflection.ClassInfo; import org.codehaus.groovy.runtime.InvokerHelper; import org.codehaus.groovy.runtime.ScriptBytecodeAdapter; -import org.codehaus.groovy.reflection.ClassInfo; public class PerInstancePojoMetaClassSite extends AbstractCallSite{ private final ClassInfo info; http://git-wip-us.apache.org/repos/asf/groovy/blob/0cfb0d91/src/main/org/codehaus/groovy/runtime/callsite/PogoGetPropertySite.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/runtime/callsite/PogoGetPropertySite.java b/src/main/org/codehaus/groovy/runtime/callsite/PogoGetPropertySite.java index f7d428e..7acca4b 100644 --- a/src/main/org/codehaus/groovy/runtime/callsite/PogoGetPropertySite.java +++ b/src/main/org/codehaus/groovy/runtime/callsite/PogoGetPropertySite.java @@ -18,10 +18,9 @@ */ package org.codehaus.groovy.runtime.callsite; -import org.codehaus.groovy.runtime.ScriptBytecodeAdapter; - import groovy.lang.GroovyObject; import groovy.lang.GroovyRuntimeException; +import org.codehaus.groovy.runtime.ScriptBytecodeAdapter; public class PogoGetPropertySite extends AbstractCallSite { private final Class aClass; http://git-wip-us.apache.org/repos/asf/groovy/blob/0cfb0d91/src/main/org/codehaus/groovy/runtime/callsite/PogoInterceptableSite.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/runtime/callsite/PogoInterceptableSite.java b/src/main/org/codehaus/groovy/runtime/callsite/PogoInterceptableSite.java index 13609e0..7f0f251 100644 --- a/src/main/org/codehaus/groovy/runtime/callsite/PogoInterceptableSite.java +++ b/src/main/org/codehaus/groovy/runtime/callsite/PogoInterceptableSite.java @@ -20,7 +20,6 @@ package org.codehaus.groovy.runtime.callsite; import groovy.lang.GroovyObject; import groovy.lang.GroovyRuntimeException; - import org.codehaus.groovy.runtime.InvokerHelper; import org.codehaus.groovy.runtime.ScriptBytecodeAdapter; http://git-wip-us.apache.org/repos/asf/groovy/blob/0cfb0d91/src/main/org/codehaus/groovy/runtime/callsite/PogoMetaClassGetPropertySite.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/runtime/callsite/PogoMetaClassGetPropertySite.java b/src/main/org/codehaus/groovy/runtime/callsite/PogoMetaClassGetPropertySite.java index b339b78..377672f 100644 --- a/src/main/org/codehaus/groovy/runtime/callsite/PogoMetaClassGetPropertySite.java +++ b/src/main/org/codehaus/groovy/runtime/callsite/PogoMetaClassGetPropertySite.java @@ -18,11 +18,10 @@ */ package org.codehaus.groovy.runtime.callsite; -import org.codehaus.groovy.runtime.ScriptBytecodeAdapter; - +import groovy.lang.GroovyObject; import groovy.lang.GroovyRuntimeException; import groovy.lang.MetaClass; -import groovy.lang.GroovyObject; +import org.codehaus.groovy.runtime.ScriptBytecodeAdapter; public class PogoMetaClassGetPropertySite extends AbstractCallSite { private final MetaClass metaClass; http://git-wip-us.apache.org/repos/asf/groovy/blob/0cfb0d91/src/main/org/codehaus/groovy/runtime/callsite/PogoMetaClassSite.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/runtime/callsite/PogoMetaClassSite.java b/src/main/org/codehaus/groovy/runtime/callsite/PogoMetaClassSite.java index 0922704..c7e291b 100644 --- a/src/main/org/codehaus/groovy/runtime/callsite/PogoMetaClassSite.java +++ b/src/main/org/codehaus/groovy/runtime/callsite/PogoMetaClassSite.java @@ -22,7 +22,6 @@ import groovy.lang.GroovyObject; import groovy.lang.GroovyRuntimeException; import groovy.lang.MetaClass; import groovy.lang.MissingMethodException; - import org.codehaus.groovy.runtime.ScriptBytecodeAdapter; import org.codehaus.groovy.runtime.metaclass.MissingMethodExecutionFailed; http://git-wip-us.apache.org/repos/asf/groovy/blob/0cfb0d91/src/main/org/codehaus/groovy/runtime/callsite/PojoMetaClassSite.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/runtime/callsite/PojoMetaClassSite.java b/src/main/org/codehaus/groovy/runtime/callsite/PojoMetaClassSite.java index b7d5da4..9f96b7d 100644 --- a/src/main/org/codehaus/groovy/runtime/callsite/PojoMetaClassSite.java +++ b/src/main/org/codehaus/groovy/runtime/callsite/PojoMetaClassSite.java @@ -20,7 +20,6 @@ package org.codehaus.groovy.runtime.callsite; import groovy.lang.GroovyRuntimeException; import groovy.lang.MetaClass; - import org.codehaus.groovy.reflection.ClassInfo; import org.codehaus.groovy.runtime.ScriptBytecodeAdapter; http://git-wip-us.apache.org/repos/asf/groovy/blob/0cfb0d91/src/main/org/codehaus/groovy/runtime/callsite/StaticMetaClassSite.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/runtime/callsite/StaticMetaClassSite.java b/src/main/org/codehaus/groovy/runtime/callsite/StaticMetaClassSite.java index cef267b..8399796 100644 --- a/src/main/org/codehaus/groovy/runtime/callsite/StaticMetaClassSite.java +++ b/src/main/org/codehaus/groovy/runtime/callsite/StaticMetaClassSite.java @@ -20,7 +20,6 @@ package org.codehaus.groovy.runtime.callsite; import groovy.lang.GroovyRuntimeException; import groovy.lang.MetaClass; - import org.codehaus.groovy.reflection.ClassInfo; import org.codehaus.groovy.runtime.ScriptBytecodeAdapter; http://git-wip-us.apache.org/repos/asf/groovy/blob/0cfb0d91/src/main/org/codehaus/groovy/runtime/callsite/StaticMetaMethodSite.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/runtime/callsite/StaticMetaMethodSite.java b/src/main/org/codehaus/groovy/runtime/callsite/StaticMetaMethodSite.java index 41ccaeb..cc49a55 100644 --- a/src/main/org/codehaus/groovy/runtime/callsite/StaticMetaMethodSite.java +++ b/src/main/org/codehaus/groovy/runtime/callsite/StaticMetaMethodSite.java @@ -21,9 +21,9 @@ package org.codehaus.groovy.runtime.callsite; import groovy.lang.GroovyRuntimeException; import groovy.lang.MetaClassImpl; import groovy.lang.MetaMethod; +import org.codehaus.groovy.reflection.CachedMethod; import org.codehaus.groovy.runtime.MetaClassHelper; import org.codehaus.groovy.runtime.ScriptBytecodeAdapter; -import org.codehaus.groovy.reflection.CachedMethod; /** * POJO call site http://git-wip-us.apache.org/repos/asf/groovy/blob/0cfb0d91/src/main/org/codehaus/groovy/runtime/m12n/ExtensionModuleScanner.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/runtime/m12n/ExtensionModuleScanner.java b/src/main/org/codehaus/groovy/runtime/m12n/ExtensionModuleScanner.java index 1404e9f..d27ea88 100644 --- a/src/main/org/codehaus/groovy/runtime/m12n/ExtensionModuleScanner.java +++ b/src/main/org/codehaus/groovy/runtime/m12n/ExtensionModuleScanner.java @@ -23,7 +23,8 @@ import groovy.lang.GroovyRuntimeException; import java.io.IOException; import java.io.InputStream; import java.net.URL; -import java.util.*; +import java.util.Enumeration; +import java.util.Properties; import static org.codehaus.groovy.runtime.DefaultGroovyMethodsSupport.closeQuietly; http://git-wip-us.apache.org/repos/asf/groovy/blob/0cfb0d91/src/main/org/codehaus/groovy/runtime/m12n/MetaInfExtensionModule.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/runtime/m12n/MetaInfExtensionModule.java b/src/main/org/codehaus/groovy/runtime/m12n/MetaInfExtensionModule.java index 830c5d2..39e39ad 100644 --- a/src/main/org/codehaus/groovy/runtime/m12n/MetaInfExtensionModule.java +++ b/src/main/org/codehaus/groovy/runtime/m12n/MetaInfExtensionModule.java @@ -19,6 +19,7 @@ package org.codehaus.groovy.runtime.m12n; import groovy.lang.GroovyRuntimeException; + import java.util.ArrayList; import java.util.LinkedList; import java.util.List; http://git-wip-us.apache.org/repos/asf/groovy/blob/0cfb0d91/src/main/org/codehaus/groovy/runtime/metaclass/ClosureMetaClass.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/runtime/metaclass/ClosureMetaClass.java b/src/main/org/codehaus/groovy/runtime/metaclass/ClosureMetaClass.java index c4b2dc1..d7383f2 100644 --- a/src/main/org/codehaus/groovy/runtime/metaclass/ClosureMetaClass.java +++ b/src/main/org/codehaus/groovy/runtime/metaclass/ClosureMetaClass.java @@ -18,9 +18,23 @@ */ package org.codehaus.groovy.runtime.metaclass; -import groovy.lang.*; - -import org.codehaus.groovy.reflection.*; +import groovy.lang.Closure; +import groovy.lang.ExpandoMetaClass; +import groovy.lang.GroovyObject; +import groovy.lang.GroovyRuntimeException; +import groovy.lang.MetaBeanProperty; +import groovy.lang.MetaClass; +import groovy.lang.MetaClassImpl; +import groovy.lang.MetaClassRegistry; +import groovy.lang.MetaMethod; +import groovy.lang.MetaProperty; +import groovy.lang.MissingMethodException; +import groovy.lang.MissingPropertyException; +import groovy.lang.ProxyMetaClass; +import org.codehaus.groovy.reflection.CachedClass; +import org.codehaus.groovy.reflection.CachedField; +import org.codehaus.groovy.reflection.CachedMethod; +import org.codehaus.groovy.reflection.ParameterTypes; import org.codehaus.groovy.runtime.InvokerHelper; import org.codehaus.groovy.runtime.MetaClassHelper; import org.codehaus.groovy.runtime.callsite.CallSite; @@ -31,7 +45,12 @@ import org.codehaus.groovy.util.FastArray; import java.beans.PropertyDescriptor; import java.lang.reflect.Constructor; import java.lang.reflect.Method; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Iterator; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; /** * A meta class for closures generated by the Groovy compiler. These classes http://git-wip-us.apache.org/repos/asf/groovy/blob/0cfb0d91/src/main/org/codehaus/groovy/runtime/metaclass/ConcurrentReaderHashMap.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/runtime/metaclass/ConcurrentReaderHashMap.java b/src/main/org/codehaus/groovy/runtime/metaclass/ConcurrentReaderHashMap.java index bfd58e9..14aaa5f 100644 --- a/src/main/org/codehaus/groovy/runtime/metaclass/ConcurrentReaderHashMap.java +++ b/src/main/org/codehaus/groovy/runtime/metaclass/ConcurrentReaderHashMap.java @@ -18,19 +18,18 @@ */ package org.codehaus.groovy.runtime.metaclass; -import java.util.Map; +import java.io.IOException; +import java.io.Serializable; +import java.util.AbstractCollection; import java.util.AbstractMap; import java.util.AbstractSet; -import java.util.AbstractCollection; -import java.util.Collection; -import java.util.Set; import java.util.ArrayList; -import java.util.Iterator; +import java.util.Collection; import java.util.Enumeration; +import java.util.Iterator; +import java.util.Map; import java.util.NoSuchElementException; - -import java.io.Serializable; -import java.io.IOException; +import java.util.Set; /** * A hash table that supports mostly-concurrent reading, but http://git-wip-us.apache.org/repos/asf/groovy/blob/0cfb0d91/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 abe5ff7..4cae01b 100644 --- a/src/main/org/codehaus/groovy/runtime/metaclass/MetaClassRegistryImpl.java +++ b/src/main/org/codehaus/groovy/runtime/metaclass/MetaClassRegistryImpl.java @@ -18,23 +18,39 @@ */ package org.codehaus.groovy.runtime.metaclass; -import groovy.lang.*; - +import groovy.lang.ExpandoMetaClass; +import groovy.lang.GroovyRuntimeException; +import groovy.lang.MetaClass; +import groovy.lang.MetaClassRegistry; +import groovy.lang.MetaClassRegistryChangeEvent; +import groovy.lang.MetaClassRegistryChangeEventListener; +import groovy.lang.MetaMethod; import org.codehaus.groovy.classgen.Verifier; -import org.codehaus.groovy.reflection.*; -import org.codehaus.groovy.runtime.*; +import org.codehaus.groovy.reflection.CachedClass; +import org.codehaus.groovy.reflection.CachedMethod; +import org.codehaus.groovy.reflection.ClassInfo; +import org.codehaus.groovy.reflection.GeneratedMetaMethod; +import org.codehaus.groovy.reflection.ReflectionCache; +import org.codehaus.groovy.runtime.DefaultGroovyMethods; +import org.codehaus.groovy.runtime.DefaultGroovyStaticMethods; import org.codehaus.groovy.runtime.m12n.ExtensionModule; import org.codehaus.groovy.runtime.m12n.ExtensionModuleRegistry; import org.codehaus.groovy.runtime.m12n.ExtensionModuleScanner; -import org.codehaus.groovy.util.ManagedConcurrentLinkedQueue; -import org.codehaus.groovy.vmplugin.VMPluginFactory; import org.codehaus.groovy.util.FastArray; +import org.codehaus.groovy.util.ManagedConcurrentLinkedQueue; import org.codehaus.groovy.util.ReferenceBundle; +import org.codehaus.groovy.vmplugin.VMPluginFactory; import java.lang.reflect.Constructor; import java.lang.reflect.Field; import java.lang.reflect.Modifier; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Iterator; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.Properties; /** * A registry of MetaClass instances which caches introspection & http://git-wip-us.apache.org/repos/asf/groovy/blob/0cfb0d91/src/main/org/codehaus/groovy/runtime/metaclass/MetaMethodIndex.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/runtime/metaclass/MetaMethodIndex.java b/src/main/org/codehaus/groovy/runtime/metaclass/MetaMethodIndex.java index c442e48..19a5791 100644 --- a/src/main/org/codehaus/groovy/runtime/metaclass/MetaMethodIndex.java +++ b/src/main/org/codehaus/groovy/runtime/metaclass/MetaMethodIndex.java @@ -20,8 +20,8 @@ package org.codehaus.groovy.runtime.metaclass; import groovy.lang.MetaMethod; import org.codehaus.groovy.reflection.CachedClass; -import org.codehaus.groovy.util.FastArray; import org.codehaus.groovy.reflection.GeneratedMetaMethod; +import org.codehaus.groovy.util.FastArray; import org.codehaus.groovy.util.SingleKeyHashMap; import java.util.NoSuchElementException; http://git-wip-us.apache.org/repos/asf/groovy/blob/0cfb0d91/src/main/org/codehaus/groovy/runtime/metaclass/MixedInMetaClass.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/runtime/metaclass/MixedInMetaClass.java b/src/main/org/codehaus/groovy/runtime/metaclass/MixedInMetaClass.java index 35a3793..62b8a92 100644 --- a/src/main/org/codehaus/groovy/runtime/metaclass/MixedInMetaClass.java +++ b/src/main/org/codehaus/groovy/runtime/metaclass/MixedInMetaClass.java @@ -18,13 +18,13 @@ */ package org.codehaus.groovy.runtime.metaclass; +import groovy.lang.GroovySystem; +import groovy.lang.MetaClass; import org.codehaus.groovy.runtime.InvokerHelper; +import org.codehaus.groovy.runtime.MetaClassHelper; import java.lang.ref.WeakReference; -import groovy.lang.*; -import org.codehaus.groovy.runtime.MetaClassHelper; - /** * @author Alex Tkachman * http://git-wip-us.apache.org/repos/asf/groovy/blob/0cfb0d91/src/main/org/codehaus/groovy/runtime/metaclass/MixinInstanceMetaMethod.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/runtime/metaclass/MixinInstanceMetaMethod.java b/src/main/org/codehaus/groovy/runtime/metaclass/MixinInstanceMetaMethod.java index 1c4ff7a..9ad8336 100644 --- a/src/main/org/codehaus/groovy/runtime/metaclass/MixinInstanceMetaMethod.java +++ b/src/main/org/codehaus/groovy/runtime/metaclass/MixinInstanceMetaMethod.java @@ -19,8 +19,8 @@ package org.codehaus.groovy.runtime.metaclass; import groovy.lang.MetaMethod; -import org.codehaus.groovy.reflection.MixinInMetaClass; import org.codehaus.groovy.reflection.CachedClass; +import org.codehaus.groovy.reflection.MixinInMetaClass; /** * MetaMethod for mixed in classes http://git-wip-us.apache.org/repos/asf/groovy/blob/0cfb0d91/src/main/org/codehaus/groovy/runtime/metaclass/MixinInstanceMetaProperty.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/runtime/metaclass/MixinInstanceMetaProperty.java b/src/main/org/codehaus/groovy/runtime/metaclass/MixinInstanceMetaProperty.java index 8059443..fa4e378 100644 --- a/src/main/org/codehaus/groovy/runtime/metaclass/MixinInstanceMetaProperty.java +++ b/src/main/org/codehaus/groovy/runtime/metaclass/MixinInstanceMetaProperty.java @@ -19,10 +19,10 @@ package org.codehaus.groovy.runtime.metaclass; import groovy.lang.MetaBeanProperty; -import groovy.lang.MetaProperty; import groovy.lang.MetaMethod; -import org.codehaus.groovy.reflection.MixinInMetaClass; +import groovy.lang.MetaProperty; import org.codehaus.groovy.reflection.CachedClass; +import org.codehaus.groovy.reflection.MixinInMetaClass; import org.codehaus.groovy.reflection.ReflectionCache; import java.lang.reflect.Modifier; http://git-wip-us.apache.org/repos/asf/groovy/blob/0cfb0d91/src/main/org/codehaus/groovy/runtime/metaclass/OwnedMetaClass.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/runtime/metaclass/OwnedMetaClass.java b/src/main/org/codehaus/groovy/runtime/metaclass/OwnedMetaClass.java index 599549a..dffa26b 100644 --- a/src/main/org/codehaus/groovy/runtime/metaclass/OwnedMetaClass.java +++ b/src/main/org/codehaus/groovy/runtime/metaclass/OwnedMetaClass.java @@ -18,7 +18,11 @@ */ package org.codehaus.groovy.runtime.metaclass; -import groovy.lang.*; +import groovy.lang.DelegatingMetaClass; +import groovy.lang.GroovyObject; +import groovy.lang.MetaClass; +import groovy.lang.MetaMethod; +import groovy.lang.MetaProperty; import org.codehaus.groovy.ast.ClassNode; import java.util.List; http://git-wip-us.apache.org/repos/asf/groovy/blob/0cfb0d91/src/main/org/codehaus/groovy/runtime/metaclass/TemporaryMethodKey.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/runtime/metaclass/TemporaryMethodKey.java b/src/main/org/codehaus/groovy/runtime/metaclass/TemporaryMethodKey.java index e999404..9fbca92 100644 --- a/src/main/org/codehaus/groovy/runtime/metaclass/TemporaryMethodKey.java +++ b/src/main/org/codehaus/groovy/runtime/metaclass/TemporaryMethodKey.java @@ -18,8 +18,8 @@ */ package org.codehaus.groovy.runtime.metaclass; -import org.codehaus.groovy.runtime.MethodKey; import org.codehaus.groovy.runtime.MetaClassHelper; +import org.codehaus.groovy.runtime.MethodKey; /** http://git-wip-us.apache.org/repos/asf/groovy/blob/0cfb0d91/src/main/org/codehaus/groovy/runtime/powerassert/AssertionRenderer.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/runtime/powerassert/AssertionRenderer.java b/src/main/org/codehaus/groovy/runtime/powerassert/AssertionRenderer.java index 8fa14cc..db86c8f 100644 --- a/src/main/org/codehaus/groovy/runtime/powerassert/AssertionRenderer.java +++ b/src/main/org/codehaus/groovy/runtime/powerassert/AssertionRenderer.java @@ -18,10 +18,13 @@ */ package org.codehaus.groovy.runtime.powerassert; -import java.util.*; - import org.codehaus.groovy.runtime.DefaultGroovyMethods; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Comparator; +import java.util.List; + /** * Creates a string representation of an assertion and its recorded values. * http://git-wip-us.apache.org/repos/asf/groovy/blob/0cfb0d91/src/main/org/codehaus/groovy/runtime/typehandling/DefaultTypeTransformation.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/runtime/typehandling/DefaultTypeTransformation.java b/src/main/org/codehaus/groovy/runtime/typehandling/DefaultTypeTransformation.java index bf9fe91..a33d6a0 100644 --- a/src/main/org/codehaus/groovy/runtime/typehandling/DefaultTypeTransformation.java +++ b/src/main/org/codehaus/groovy/runtime/typehandling/DefaultTypeTransformation.java @@ -21,10 +21,16 @@ package org.codehaus.groovy.runtime.typehandling; import groovy.lang.Closure; import groovy.lang.GString; import groovy.lang.GroovyRuntimeException; - import org.codehaus.groovy.reflection.ReflectionCache; import org.codehaus.groovy.reflection.stdclasses.CachedSAMClass; -import org.codehaus.groovy.runtime.*; +import org.codehaus.groovy.runtime.DefaultGroovyMethods; +import org.codehaus.groovy.runtime.InvokerHelper; +import org.codehaus.groovy.runtime.InvokerInvocationException; +import org.codehaus.groovy.runtime.IteratorClosureAdapter; +import org.codehaus.groovy.runtime.MethodClosure; +import org.codehaus.groovy.runtime.NullObject; +import org.codehaus.groovy.runtime.ResourceGroovyMethods; +import org.codehaus.groovy.runtime.StringGroovyMethods; import java.io.File; import java.io.IOException; @@ -34,7 +40,14 @@ import java.lang.reflect.Modifier; import java.math.BigDecimal; import java.math.BigInteger; import java.text.MessageFormat; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.Iterator; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Map; /** * Class providing various type conversions, coercions and boxing/unboxing operations. http://git-wip-us.apache.org/repos/asf/groovy/blob/0cfb0d91/src/main/org/codehaus/groovy/syntax/ASTHelper.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/syntax/ASTHelper.java b/src/main/org/codehaus/groovy/syntax/ASTHelper.java index 493e075..be09c82 100644 --- a/src/main/org/codehaus/groovy/syntax/ASTHelper.java +++ b/src/main/org/codehaus/groovy/syntax/ASTHelper.java @@ -18,9 +18,9 @@ */ package org.codehaus.groovy.syntax; +import org.codehaus.groovy.ast.AnnotationNode; import org.codehaus.groovy.ast.ClassNode; import org.codehaus.groovy.ast.ModuleNode; -import org.codehaus.groovy.ast.AnnotationNode; import org.codehaus.groovy.ast.PackageNode; import org.codehaus.groovy.control.SourceUnit; http://git-wip-us.apache.org/repos/asf/groovy/blob/0cfb0d91/src/main/org/codehaus/groovy/syntax/CSTNode.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/syntax/CSTNode.java b/src/main/org/codehaus/groovy/syntax/CSTNode.java index 10a11a0..d23c2cd 100644 --- a/src/main/org/codehaus/groovy/syntax/CSTNode.java +++ b/src/main/org/codehaus/groovy/syntax/CSTNode.java @@ -20,8 +20,8 @@ package org.codehaus.groovy.syntax; import org.codehaus.groovy.GroovyBugError; -import java.io.StringWriter; import java.io.PrintWriter; +import java.io.StringWriter; /** http://git-wip-us.apache.org/repos/asf/groovy/blob/0cfb0d91/src/main/org/codehaus/groovy/syntax/Numbers.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/syntax/Numbers.java b/src/main/org/codehaus/groovy/syntax/Numbers.java index a08f335..456294e 100644 --- a/src/main/org/codehaus/groovy/syntax/Numbers.java +++ b/src/main/org/codehaus/groovy/syntax/Numbers.java @@ -18,8 +18,8 @@ */ package org.codehaus.groovy.syntax; -import java.math.BigInteger; import java.math.BigDecimal; +import java.math.BigInteger; /** * Helper class for processing Groovy numeric literals. http://git-wip-us.apache.org/repos/asf/groovy/blob/0cfb0d91/src/main/org/codehaus/groovy/syntax/Reduction.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/syntax/Reduction.java b/src/main/org/codehaus/groovy/syntax/Reduction.java index 9658d4c..ea3ec86 100644 --- a/src/main/org/codehaus/groovy/syntax/Reduction.java +++ b/src/main/org/codehaus/groovy/syntax/Reduction.java @@ -20,9 +20,9 @@ package org.codehaus.groovy.syntax; import org.codehaus.groovy.GroovyBugError; -import java.util.List; import java.util.ArrayList; import java.util.Collections; +import java.util.List; /** http://git-wip-us.apache.org/repos/asf/groovy/blob/0cfb0d91/src/main/org/codehaus/groovy/syntax/RuntimeParserException.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/syntax/RuntimeParserException.java b/src/main/org/codehaus/groovy/syntax/RuntimeParserException.java index d5434ae..c47bc26 100644 --- a/src/main/org/codehaus/groovy/syntax/RuntimeParserException.java +++ b/src/main/org/codehaus/groovy/syntax/RuntimeParserException.java @@ -19,7 +19,6 @@ package org.codehaus.groovy.syntax; import groovy.lang.GroovyRuntimeException; - import org.codehaus.groovy.ast.ASTNode; /** http://git-wip-us.apache.org/repos/asf/groovy/blob/0cfb0d91/src/main/org/codehaus/groovy/syntax/Types.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/syntax/Types.java b/src/main/org/codehaus/groovy/syntax/Types.java index 5fa6c2c..0a8f5c4 100644 --- a/src/main/org/codehaus/groovy/syntax/Types.java +++ b/src/main/org/codehaus/groovy/syntax/Types.java @@ -18,15 +18,15 @@ */ package org.codehaus.groovy.syntax; +import org.codehaus.groovy.GroovyBugError; + +import java.util.Collection; +import java.util.Collections; import java.util.HashMap; +import java.util.HashSet; import java.util.Iterator; import java.util.Map; -import java.util.HashSet; import java.util.Set; -import java.util.Collections; -import java.util.Collection; - -import org.codehaus.groovy.GroovyBugError; /** http://git-wip-us.apache.org/repos/asf/groovy/blob/0cfb0d91/src/main/org/codehaus/groovy/tools/Compiler.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/tools/Compiler.java b/src/main/org/codehaus/groovy/tools/Compiler.java index 59045d9..8c2bbe7 100644 --- a/src/main/org/codehaus/groovy/tools/Compiler.java +++ b/src/main/org/codehaus/groovy/tools/Compiler.java @@ -18,13 +18,13 @@ */ package org.codehaus.groovy.tools; -import java.io.File; - import org.codehaus.groovy.control.CompilationFailedException; import org.codehaus.groovy.control.CompilationUnit; import org.codehaus.groovy.control.CompilerConfiguration; import org.codehaus.groovy.control.SourceUnit; +import java.io.File; + /** * A convenience front end for getting standard compilations done. * All compile() routines generate classes to the filesystem. http://git-wip-us.apache.org/repos/asf/groovy/blob/0cfb0d91/src/main/org/codehaus/groovy/tools/ErrorReporter.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/tools/ErrorReporter.java b/src/main/org/codehaus/groovy/tools/ErrorReporter.java index 3609ec3..88b625c 100644 --- a/src/main/org/codehaus/groovy/tools/ErrorReporter.java +++ b/src/main/org/codehaus/groovy/tools/ErrorReporter.java @@ -19,12 +19,12 @@ package org.codehaus.groovy.tools; -import java.io.PrintStream; -import java.io.PrintWriter; - +import groovy.lang.GroovyRuntimeException; import org.codehaus.groovy.GroovyExceptionInterface; import org.codehaus.groovy.control.CompilationFailedException; -import groovy.lang.GroovyRuntimeException; + +import java.io.PrintStream; +import java.io.PrintWriter; /** http://git-wip-us.apache.org/repos/asf/groovy/blob/0cfb0d91/src/main/org/codehaus/groovy/tools/FileSystemCompiler.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/tools/FileSystemCompiler.java b/src/main/org/codehaus/groovy/tools/FileSystemCompiler.java index 71f3702..d4e6f91 100644 --- a/src/main/org/codehaus/groovy/tools/FileSystemCompiler.java +++ b/src/main/org/codehaus/groovy/tools/FileSystemCompiler.java @@ -21,7 +21,13 @@ package org.codehaus.groovy.tools; import groovy.lang.Binding; import groovy.lang.GroovyResourceLoader; import groovy.lang.GroovyShell; -import org.apache.commons.cli.*; +import groovy.lang.GroovySystem; +import org.apache.commons.cli.CommandLine; +import org.apache.commons.cli.CommandLineParser; +import org.apache.commons.cli.GroovyInternalPosixParser; +import org.apache.commons.cli.HelpFormatter; +import org.apache.commons.cli.OptionBuilder; +import org.apache.commons.cli.Options; import org.codehaus.groovy.control.CompilationUnit; import org.codehaus.groovy.control.CompilerConfiguration; import org.codehaus.groovy.control.ConfigurationException; @@ -29,12 +35,16 @@ import org.codehaus.groovy.control.customizers.ImportCustomizer; import org.codehaus.groovy.runtime.DefaultGroovyStaticMethods; import org.codehaus.groovy.tools.javac.JavaAwareCompilationUnit; -import groovy.lang.GroovySystem; - -import java.io.*; +import java.io.BufferedReader; +import java.io.File; +import java.io.FileReader; +import java.io.IOException; import java.net.MalformedURLException; import java.net.URL; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; /** * Command-line compiler (aka. <tt>groovyc</tt>). http://git-wip-us.apache.org/repos/asf/groovy/blob/0cfb0d91/src/main/org/codehaus/groovy/tools/GrapeMain.groovy ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/tools/GrapeMain.groovy b/src/main/org/codehaus/groovy/tools/GrapeMain.groovy index 85d8a4a..6266de3 100644 --- a/src/main/org/codehaus/groovy/tools/GrapeMain.groovy +++ b/src/main/org/codehaus/groovy/tools/GrapeMain.groovy @@ -20,9 +20,9 @@ package org.codehaus.groovy.tools import groovy.grape.Grape import groovy.transform.Field +import org.apache.commons.cli.* import org.apache.ivy.util.DefaultMessageLogger import org.apache.ivy.util.Message -import org.apache.commons.cli.* //commands http://git-wip-us.apache.org/repos/asf/groovy/blob/0cfb0d91/src/main/org/codehaus/groovy/tools/GroovyStarter.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/tools/GroovyStarter.java b/src/main/org/codehaus/groovy/tools/GroovyStarter.java index 5e9ec19..0244ff3 100644 --- a/src/main/org/codehaus/groovy/tools/GroovyStarter.java +++ b/src/main/org/codehaus/groovy/tools/GroovyStarter.java @@ -18,8 +18,9 @@ */ package org.codehaus.groovy.tools; -import java.lang.reflect .*; import java.io.FileInputStream; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; /** * Helper class to initialize the Groovy runtime. http://git-wip-us.apache.org/repos/asf/groovy/blob/0cfb0d91/src/main/org/codehaus/groovy/tools/ast/TransformTestHelper.groovy ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/tools/ast/TransformTestHelper.groovy b/src/main/org/codehaus/groovy/tools/ast/TransformTestHelper.groovy index 02f7595..d9921d5 100644 --- a/src/main/org/codehaus/groovy/tools/ast/TransformTestHelper.groovy +++ b/src/main/org/codehaus/groovy/tools/ast/TransformTestHelper.groovy @@ -18,15 +18,16 @@ */ package org.codehaus.groovy.tools.ast -import org.codehaus.groovy.transform.ASTTransformation -import org.codehaus.groovy.control.CompilePhase +import org.codehaus.groovy.ast.ClassNode +import org.codehaus.groovy.classgen.GeneratorContext import org.codehaus.groovy.control.CompilationUnit -import org.codehaus.groovy.control.CompilerConfiguration -import java.security.CodeSource import org.codehaus.groovy.control.CompilationUnit.PrimaryClassNodeOperation +import org.codehaus.groovy.control.CompilePhase +import org.codehaus.groovy.control.CompilerConfiguration import org.codehaus.groovy.control.SourceUnit -import org.codehaus.groovy.classgen.GeneratorContext -import org.codehaus.groovy.ast.ClassNode +import org.codehaus.groovy.transform.ASTTransformation + +import java.security.CodeSource /* * This TestHarness exists so that a global transform can be run without http://git-wip-us.apache.org/repos/asf/groovy/blob/0cfb0d91/src/main/org/codehaus/groovy/tools/gse/DependencyTracker.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/tools/gse/DependencyTracker.java b/src/main/org/codehaus/groovy/tools/gse/DependencyTracker.java index 410b2a2..4a6da3d 100644 --- a/src/main/org/codehaus/groovy/tools/gse/DependencyTracker.java +++ b/src/main/org/codehaus/groovy/tools/gse/DependencyTracker.java @@ -18,10 +18,6 @@ */ package org.codehaus.groovy.tools.gse; -import java.util.HashMap; -import java.util.Map; -import java.util.Set; - import org.codehaus.groovy.ast.AnnotatedNode; import org.codehaus.groovy.ast.AnnotationNode; import org.codehaus.groovy.ast.ClassCodeVisitorSupport; @@ -37,6 +33,10 @@ import org.codehaus.groovy.ast.expr.VariableExpression; import org.codehaus.groovy.ast.stmt.CatchStatement; import org.codehaus.groovy.control.SourceUnit; +import java.util.HashMap; +import java.util.Map; +import java.util.Set; + public class DependencyTracker extends ClassCodeVisitorSupport { private Set<String> current; private Map<String, ?> precompiledDependencies; http://git-wip-us.apache.org/repos/asf/groovy/blob/0cfb0d91/src/main/org/codehaus/groovy/tools/javac/JavaAwareCompilationUnit.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/tools/javac/JavaAwareCompilationUnit.java b/src/main/org/codehaus/groovy/tools/javac/JavaAwareCompilationUnit.java index 9915028..d19c2d9 100644 --- a/src/main/org/codehaus/groovy/tools/javac/JavaAwareCompilationUnit.java +++ b/src/main/org/codehaus/groovy/tools/javac/JavaAwareCompilationUnit.java @@ -23,7 +23,12 @@ import org.codehaus.groovy.ast.ClassNode; import org.codehaus.groovy.ast.ModuleNode; import org.codehaus.groovy.classgen.GeneratorContext; import org.codehaus.groovy.classgen.VariableScopeVisitor; -import org.codehaus.groovy.control.*; +import org.codehaus.groovy.control.AnnotationConstantsVisitor; +import org.codehaus.groovy.control.CompilationFailedException; +import org.codehaus.groovy.control.CompilationUnit; +import org.codehaus.groovy.control.CompilerConfiguration; +import org.codehaus.groovy.control.Phases; +import org.codehaus.groovy.control.SourceUnit; import org.codehaus.groovy.transform.ASTTransformationCollectorCodeVisitor; import java.io.File; http://git-wip-us.apache.org/repos/asf/groovy/blob/0cfb0d91/src/main/org/codehaus/groovy/tools/javac/JavaCompiler.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/tools/javac/JavaCompiler.java b/src/main/org/codehaus/groovy/tools/javac/JavaCompiler.java index aa52a13..42e65b9 100644 --- a/src/main/org/codehaus/groovy/tools/javac/JavaCompiler.java +++ b/src/main/org/codehaus/groovy/tools/javac/JavaCompiler.java @@ -18,10 +18,10 @@ */ package org.codehaus.groovy.tools.javac; -import java.util.List; - import org.codehaus.groovy.control.CompilationUnit; +import java.util.List; + /** * @author Alex.Tkachman */ http://git-wip-us.apache.org/repos/asf/groovy/blob/0cfb0d91/src/main/org/codehaus/groovy/tools/javac/JavaStubGenerator.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/tools/javac/JavaStubGenerator.java b/src/main/org/codehaus/groovy/tools/javac/JavaStubGenerator.java index f6452ef..e2d4e5b 100644 --- a/src/main/org/codehaus/groovy/tools/javac/JavaStubGenerator.java +++ b/src/main/org/codehaus/groovy/tools/javac/JavaStubGenerator.java @@ -18,16 +18,27 @@ */ package org.codehaus.groovy.tools.javac; -import org.codehaus.groovy.ast.*; +import org.codehaus.groovy.ast.AnnotatedNode; +import org.codehaus.groovy.ast.AnnotationNode; +import org.codehaus.groovy.ast.ClassHelper; +import org.codehaus.groovy.ast.ClassNode; +import org.codehaus.groovy.ast.ConstructorNode; +import org.codehaus.groovy.ast.FieldNode; +import org.codehaus.groovy.ast.GenericsType; +import org.codehaus.groovy.ast.ImportNode; +import org.codehaus.groovy.ast.InnerClassNode; +import org.codehaus.groovy.ast.MethodNode; +import org.codehaus.groovy.ast.ModuleNode; +import org.codehaus.groovy.ast.Parameter; import org.codehaus.groovy.ast.expr.ArgumentListExpression; import org.codehaus.groovy.ast.expr.ClassExpression; +import org.codehaus.groovy.ast.expr.ClosureExpression; import org.codehaus.groovy.ast.expr.ConstantExpression; import org.codehaus.groovy.ast.expr.ConstructorCallExpression; import org.codehaus.groovy.ast.expr.Expression; import org.codehaus.groovy.ast.expr.ListExpression; -import org.codehaus.groovy.ast.expr.VariableExpression; import org.codehaus.groovy.ast.expr.PropertyExpression; -import org.codehaus.groovy.ast.expr.ClosureExpression; +import org.codehaus.groovy.ast.expr.VariableExpression; import org.codehaus.groovy.ast.stmt.BlockStatement; import org.codehaus.groovy.ast.stmt.ExpressionStatement; import org.codehaus.groovy.ast.stmt.Statement; @@ -42,9 +53,9 @@ import java.io.File; import java.io.FileNotFoundException; import java.io.FileOutputStream; import java.io.IOException; +import java.io.OutputStreamWriter; import java.io.PrintWriter; import java.io.StringWriter; -import java.io.OutputStreamWriter; import java.nio.charset.Charset; import java.util.ArrayList; import java.util.Arrays; http://git-wip-us.apache.org/repos/asf/groovy/blob/0cfb0d91/src/main/org/codehaus/groovy/tools/javac/JavacJavaCompiler.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/tools/javac/JavacJavaCompiler.java b/src/main/org/codehaus/groovy/tools/javac/JavacJavaCompiler.java index 873b7e6..32a20c3 100644 --- a/src/main/org/codehaus/groovy/tools/javac/JavacJavaCompiler.java +++ b/src/main/org/codehaus/groovy/tools/javac/JavacJavaCompiler.java @@ -19,22 +19,24 @@ package org.codehaus.groovy.tools.javac; import groovy.lang.GroovyClassLoader; +import org.codehaus.groovy.control.CompilationUnit; +import org.codehaus.groovy.control.CompilerConfiguration; +import org.codehaus.groovy.control.messages.ExceptionMessage; +import org.codehaus.groovy.control.messages.SimpleMessage; +import org.codehaus.groovy.runtime.DefaultGroovyMethods; import java.io.File; import java.io.PrintWriter; import java.io.StringWriter; -import java.lang.reflect.Method; import java.lang.reflect.InvocationTargetException; -import java.util.*; -import java.net.URLClassLoader; -import java.net.URL; +import java.lang.reflect.Method; import java.net.URISyntaxException; - -import org.codehaus.groovy.control.CompilationUnit; -import org.codehaus.groovy.control.CompilerConfiguration; -import org.codehaus.groovy.control.messages.ExceptionMessage; -import org.codehaus.groovy.control.messages.SimpleMessage; -import org.codehaus.groovy.runtime.DefaultGroovyMethods; +import java.net.URL; +import java.net.URLClassLoader; +import java.util.LinkedList; +import java.util.List; +import java.util.Locale; +import java.util.Map; public class JavacJavaCompiler implements JavaCompiler { private CompilerConfiguration config; http://git-wip-us.apache.org/repos/asf/groovy/blob/0cfb0d91/src/main/org/codehaus/groovy/tools/shell/IO.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/tools/shell/IO.java b/src/main/org/codehaus/groovy/tools/shell/IO.java index 23858f5..18bd8c2 100644 --- a/src/main/org/codehaus/groovy/tools/shell/IO.java +++ b/src/main/org/codehaus/groovy/tools/shell/IO.java @@ -18,6 +18,9 @@ */ package org.codehaus.groovy.tools.shell; +import org.codehaus.groovy.tools.shell.util.Preferences; +import org.fusesource.jansi.AnsiRenderWriter; + import java.io.Closeable; import java.io.IOException; import java.io.InputStream; @@ -26,9 +29,6 @@ import java.io.OutputStream; import java.io.PrintWriter; import java.io.Reader; -import org.codehaus.groovy.tools.shell.util.Preferences; -import org.fusesource.jansi.AnsiRenderWriter; - /** * Container for input/output handles. * http://git-wip-us.apache.org/repos/asf/groovy/blob/0cfb0d91/src/main/org/codehaus/groovy/tools/shell/util/Logger.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/tools/shell/util/Logger.java b/src/main/org/codehaus/groovy/tools/shell/util/Logger.java index 49d9521..30cd838 100644 --- a/src/main/org/codehaus/groovy/tools/shell/util/Logger.java +++ b/src/main/org/codehaus/groovy/tools/shell/util/Logger.java @@ -20,10 +20,11 @@ package org.codehaus.groovy.tools.shell.util; import org.codehaus.groovy.tools.shell.IO; -import static org.fusesource.jansi.Ansi.ansi; +import static org.fusesource.jansi.Ansi.Attribute.INTENSITY_BOLD; import static org.fusesource.jansi.Ansi.Color; -import static org.fusesource.jansi.Ansi.Color.*; -import static org.fusesource.jansi.Ansi.Attribute.*; +import static org.fusesource.jansi.Ansi.Color.GREEN; +import static org.fusesource.jansi.Ansi.Color.RED; +import static org.fusesource.jansi.Ansi.ansi; /** * Provides a very, very basic logging API. http://git-wip-us.apache.org/repos/asf/groovy/blob/0cfb0d91/src/main/org/codehaus/groovy/tools/shell/util/MessageSource.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/tools/shell/util/MessageSource.java b/src/main/org/codehaus/groovy/tools/shell/util/MessageSource.java index 2350082..e0ce1e4 100644 --- a/src/main/org/codehaus/groovy/tools/shell/util/MessageSource.java +++ b/src/main/org/codehaus/groovy/tools/shell/util/MessageSource.java @@ -18,12 +18,11 @@ */ package org.codehaus.groovy.tools.shell.util; -import java.util.ResourceBundle; -import java.util.MissingResourceException; +import groovy.lang.GroovyObjectSupport; import java.text.MessageFormat; - -import groovy.lang.GroovyObjectSupport; +import java.util.MissingResourceException; +import java.util.ResourceBundle; /** * Message source backed up by one or more {@link java.util.ResourceBundle} http://git-wip-us.apache.org/repos/asf/groovy/blob/0cfb0d91/src/main/org/codehaus/groovy/tools/shell/util/Preferences.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/tools/shell/util/Preferences.java b/src/main/org/codehaus/groovy/tools/shell/util/Preferences.java index bfaac49..989438f 100644 --- a/src/main/org/codehaus/groovy/tools/shell/util/Preferences.java +++ b/src/main/org/codehaus/groovy/tools/shell/util/Preferences.java @@ -18,11 +18,11 @@ */ package org.codehaus.groovy.tools.shell.util; +import org.codehaus.groovy.tools.shell.IO; + import java.util.prefs.BackingStoreException; -import java.util.prefs.PreferenceChangeListener; import java.util.prefs.PreferenceChangeEvent; - -import org.codehaus.groovy.tools.shell.IO; +import java.util.prefs.PreferenceChangeListener; /** * Container for shell preferences. http://git-wip-us.apache.org/repos/asf/groovy/blob/0cfb0d91/src/main/org/codehaus/groovy/transform/ASTTestTransformation.groovy ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/transform/ASTTestTransformation.groovy b/src/main/org/codehaus/groovy/transform/ASTTestTransformation.groovy index ef6ffd9..5f76c73 100644 --- a/src/main/org/codehaus/groovy/transform/ASTTestTransformation.groovy +++ b/src/main/org/codehaus/groovy/transform/ASTTestTransformation.groovy @@ -18,29 +18,18 @@ */ package org.codehaus.groovy.transform -import org.codehaus.groovy.ast.ASTNode -import org.codehaus.groovy.ast.AnnotationNode -import org.codehaus.groovy.ast.ClassHelper +import groovy.transform.CompilationUnitAware +import org.codehaus.groovy.ast.* import org.codehaus.groovy.ast.expr.ClosureExpression import org.codehaus.groovy.ast.expr.PropertyExpression import org.codehaus.groovy.ast.expr.VariableExpression -import org.codehaus.groovy.control.CompilationUnit -import org.codehaus.groovy.control.CompilePhase -import org.codehaus.groovy.control.CompilerConfiguration -import org.codehaus.groovy.control.ErrorCollector -import org.codehaus.groovy.control.Janitor -import org.codehaus.groovy.control.ProcessingUnit -import org.codehaus.groovy.control.SourceUnit +import org.codehaus.groovy.ast.stmt.Statement +import org.codehaus.groovy.control.* import org.codehaus.groovy.control.customizers.ImportCustomizer import org.codehaus.groovy.control.io.ReaderSource +import org.codehaus.groovy.runtime.MethodClosure import org.codehaus.groovy.syntax.SyntaxException import org.codehaus.groovy.tools.Utilities -import groovy.transform.CompilationUnitAware -import org.codehaus.groovy.ast.ClassCodeVisitorSupport -import org.codehaus.groovy.ast.stmt.Statement -import org.codehaus.groovy.ast.MethodNode -import org.codehaus.groovy.ast.ClassNode -import org.codehaus.groovy.runtime.MethodClosure import static org.codehaus.groovy.ast.tools.GeneralUtils.classX import static org.codehaus.groovy.ast.tools.GeneralUtils.propX http://git-wip-us.apache.org/repos/asf/groovy/blob/0cfb0d91/src/main/org/codehaus/groovy/transform/ASTTransformationCollectorCodeVisitor.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/transform/ASTTransformationCollectorCodeVisitor.java b/src/main/org/codehaus/groovy/transform/ASTTransformationCollectorCodeVisitor.java index c5da8e5..563d8dd 100644 --- a/src/main/org/codehaus/groovy/transform/ASTTransformationCollectorCodeVisitor.java +++ b/src/main/org/codehaus/groovy/transform/ASTTransformationCollectorCodeVisitor.java @@ -18,6 +18,8 @@ */ package org.codehaus.groovy.transform; +import groovy.lang.GroovyClassLoader; +import groovy.transform.AnnotationCollector; import org.codehaus.groovy.ast.AnnotatedNode; import org.codehaus.groovy.ast.AnnotationNode; import org.codehaus.groovy.ast.ClassCodeVisitorSupport; @@ -30,9 +32,6 @@ import org.codehaus.groovy.control.messages.ExceptionMessage; import org.codehaus.groovy.control.messages.SimpleMessage; import org.codehaus.groovy.control.messages.SyntaxErrorMessage; import org.codehaus.groovy.syntax.SyntaxException; - -import groovy.lang.GroovyClassLoader; -import groovy.transform.AnnotationCollector; import org.codehaus.groovy.transform.trait.TraitASTTransformation; import org.codehaus.groovy.transform.trait.Traits; http://git-wip-us.apache.org/repos/asf/groovy/blob/0cfb0d91/src/main/org/codehaus/groovy/transform/ASTTransformationVisitor.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/transform/ASTTransformationVisitor.java b/src/main/org/codehaus/groovy/transform/ASTTransformationVisitor.java index bf1f6d3..3f9e8e8 100644 --- a/src/main/org/codehaus/groovy/transform/ASTTransformationVisitor.java +++ b/src/main/org/codehaus/groovy/transform/ASTTransformationVisitor.java @@ -18,20 +18,37 @@ */ package org.codehaus.groovy.transform; +import groovy.lang.GroovyClassLoader; import groovy.transform.CompilationUnitAware; -import org.codehaus.groovy.ast.*; +import org.codehaus.groovy.ast.ASTNode; +import org.codehaus.groovy.ast.AnnotatedNode; +import org.codehaus.groovy.ast.AnnotationNode; +import org.codehaus.groovy.ast.ClassCodeVisitorSupport; +import org.codehaus.groovy.ast.ClassNode; import org.codehaus.groovy.classgen.GeneratorContext; -import org.codehaus.groovy.control.*; +import org.codehaus.groovy.control.ASTTransformationsContext; +import org.codehaus.groovy.control.CompilationFailedException; +import org.codehaus.groovy.control.CompilationUnit; +import org.codehaus.groovy.control.CompilePhase; +import org.codehaus.groovy.control.Phases; +import org.codehaus.groovy.control.SourceUnit; import org.codehaus.groovy.control.messages.SimpleMessage; import org.codehaus.groovy.control.messages.WarningMessage; -import groovy.lang.GroovyClassLoader; - import java.io.BufferedReader; import java.io.IOException; import java.io.InputStreamReader; import java.net.URL; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Enumeration; +import java.util.HashMap; +import java.util.Iterator; +import java.util.LinkedHashMap; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.Set; /** * This class handles the invocation of the ASTAnnotationTransformation http://git-wip-us.apache.org/repos/asf/groovy/blob/0cfb0d91/src/main/org/codehaus/groovy/transform/AbstractInterruptibleASTTransformation.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/transform/AbstractInterruptibleASTTransformation.java b/src/main/org/codehaus/groovy/transform/AbstractInterruptibleASTTransformation.java index f512975..717af48 100644 --- a/src/main/org/codehaus/groovy/transform/AbstractInterruptibleASTTransformation.java +++ b/src/main/org/codehaus/groovy/transform/AbstractInterruptibleASTTransformation.java @@ -45,11 +45,7 @@ import org.objectweb.asm.Opcodes; import java.util.Arrays; import java.util.List; -import static org.codehaus.groovy.ast.tools.GeneralUtils.args; -import static org.codehaus.groovy.ast.tools.GeneralUtils.constX; -import static org.codehaus.groovy.ast.tools.GeneralUtils.ctorX; -import static org.codehaus.groovy.ast.tools.GeneralUtils.ifS; -import static org.codehaus.groovy.ast.tools.GeneralUtils.throwS; +import static org.codehaus.groovy.ast.tools.GeneralUtils.*; /** * Base class for AST Transformations which will automatically throw an {@link InterruptedException} when http://git-wip-us.apache.org/repos/asf/groovy/blob/0cfb0d91/src/main/org/codehaus/groovy/transform/CategoryASTTransformation.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/transform/CategoryASTTransformation.java b/src/main/org/codehaus/groovy/transform/CategoryASTTransformation.java index 62c33e4..c2be28e 100644 --- a/src/main/org/codehaus/groovy/transform/CategoryASTTransformation.java +++ b/src/main/org/codehaus/groovy/transform/CategoryASTTransformation.java @@ -18,6 +18,7 @@ */ package org.codehaus.groovy.transform; +import groovy.lang.Reference; import org.codehaus.groovy.ast.ASTNode; import org.codehaus.groovy.ast.AnnotationNode; import org.codehaus.groovy.ast.ClassCodeExpressionTransformer; @@ -34,19 +35,17 @@ import org.codehaus.groovy.ast.expr.Expression; import org.codehaus.groovy.ast.expr.PropertyExpression; import org.codehaus.groovy.ast.expr.TupleExpression; import org.codehaus.groovy.ast.expr.VariableExpression; +import org.codehaus.groovy.ast.stmt.BlockStatement; import org.codehaus.groovy.ast.stmt.CatchStatement; +import org.codehaus.groovy.ast.stmt.ExpressionStatement; +import org.codehaus.groovy.ast.stmt.ForStatement; import org.codehaus.groovy.classgen.VariableScopeVisitor; import org.codehaus.groovy.control.CompilePhase; import org.codehaus.groovy.control.SourceUnit; import org.codehaus.groovy.control.messages.SyntaxErrorMessage; -import org.codehaus.groovy.ast.stmt.BlockStatement; -import org.codehaus.groovy.ast.stmt.ExpressionStatement; -import org.codehaus.groovy.ast.stmt.ForStatement; import org.codehaus.groovy.syntax.SyntaxException; import org.objectweb.asm.Opcodes; -import groovy.lang.Reference; - import java.util.HashSet; import java.util.LinkedList; import java.util.List; http://git-wip-us.apache.org/repos/asf/groovy/blob/0cfb0d91/src/main/org/codehaus/groovy/transform/DelegateASTTransformation.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/transform/DelegateASTTransformation.java b/src/main/org/codehaus/groovy/transform/DelegateASTTransformation.java index 78509ec..983ac8c 100644 --- a/src/main/org/codehaus/groovy/transform/DelegateASTTransformation.java +++ b/src/main/org/codehaus/groovy/transform/DelegateASTTransformation.java @@ -20,7 +20,6 @@ package org.codehaus.groovy.transform; import groovy.lang.Delegate; import groovy.lang.GroovyObject; - import groovy.lang.Lazy; import groovy.lang.Reference; import org.codehaus.groovy.ast.ASTNode; @@ -47,22 +46,8 @@ import java.util.Map; import java.util.Set; import static org.codehaus.groovy.ast.ClassHelper.make; -import static org.codehaus.groovy.ast.tools.GeneralUtils.assignS; -import static org.codehaus.groovy.ast.tools.GeneralUtils.callThisX; -import static org.codehaus.groovy.ast.tools.GeneralUtils.callX; -import static org.codehaus.groovy.ast.tools.GeneralUtils.getAllMethods; -import static org.codehaus.groovy.ast.tools.GeneralUtils.getAllProperties; -import static org.codehaus.groovy.ast.tools.GeneralUtils.getInterfacesAndSuperInterfaces; -import static org.codehaus.groovy.ast.tools.GeneralUtils.params; -import static org.codehaus.groovy.ast.tools.GeneralUtils.propX; -import static org.codehaus.groovy.ast.tools.GeneralUtils.returnS; -import static org.codehaus.groovy.ast.tools.GeneralUtils.stmt; -import static org.codehaus.groovy.ast.tools.GeneralUtils.varX; -import static org.codehaus.groovy.ast.tools.GenericsUtils.addMethodGenerics; -import static org.codehaus.groovy.ast.tools.GenericsUtils.correctToGenericsSpec; -import static org.codehaus.groovy.ast.tools.GenericsUtils.correctToGenericsSpecRecurse; -import static org.codehaus.groovy.ast.tools.GenericsUtils.createGenericsSpec; -import static org.codehaus.groovy.ast.tools.GenericsUtils.extractSuperClassGenerics; +import static org.codehaus.groovy.ast.tools.GeneralUtils.*; +import static org.codehaus.groovy.ast.tools.GenericsUtils.*; /** * Handles generation of code for the <code>@Delegate</code> annotation http://git-wip-us.apache.org/repos/asf/groovy/blob/0cfb0d91/src/main/org/codehaus/groovy/transform/ExternalizeMethodsASTTransformation.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/transform/ExternalizeMethodsASTTransformation.java b/src/main/org/codehaus/groovy/transform/ExternalizeMethodsASTTransformation.java index e2ca472..99854ab 100644 --- a/src/main/org/codehaus/groovy/transform/ExternalizeMethodsASTTransformation.java +++ b/src/main/org/codehaus/groovy/transform/ExternalizeMethodsASTTransformation.java @@ -26,7 +26,6 @@ import org.codehaus.groovy.ast.ClassHelper; import org.codehaus.groovy.ast.ClassNode; import org.codehaus.groovy.ast.FieldNode; import org.codehaus.groovy.ast.Parameter; -import org.codehaus.groovy.ast.expr.Expression; import org.codehaus.groovy.ast.expr.MethodCallExpression; import org.codehaus.groovy.ast.stmt.BlockStatement; import org.codehaus.groovy.ast.tools.GenericsUtils; @@ -40,15 +39,7 @@ import java.io.ObjectOutput; import java.util.List; import static org.codehaus.groovy.ast.ClassHelper.make; -import static org.codehaus.groovy.ast.tools.GeneralUtils.assignS; -import static org.codehaus.groovy.ast.tools.GeneralUtils.callX; -import static org.codehaus.groovy.ast.tools.GeneralUtils.castX; -import static org.codehaus.groovy.ast.tools.GeneralUtils.getInstanceNonPropertyFields; -import static org.codehaus.groovy.ast.tools.GeneralUtils.getInstancePropertyFields; -import static org.codehaus.groovy.ast.tools.GeneralUtils.param; -import static org.codehaus.groovy.ast.tools.GeneralUtils.params; -import static org.codehaus.groovy.ast.tools.GeneralUtils.stmt; -import static org.codehaus.groovy.ast.tools.GeneralUtils.varX; +import static org.codehaus.groovy.ast.tools.GeneralUtils.*; /** * Handles generation of code for the @ExternalizeMethods annotation. http://git-wip-us.apache.org/repos/asf/groovy/blob/0cfb0d91/src/main/org/codehaus/groovy/transform/ImmutableASTTransformation.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/transform/ImmutableASTTransformation.java b/src/main/org/codehaus/groovy/transform/ImmutableASTTransformation.java index edf2eab7..ab467b7 100644 --- a/src/main/org/codehaus/groovy/transform/ImmutableASTTransformation.java +++ b/src/main/org/codehaus/groovy/transform/ImmutableASTTransformation.java @@ -53,14 +53,14 @@ import java.lang.reflect.Field; import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; +import java.util.Collections; import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Set; -import java.util.SortedSet; import java.util.SortedMap; -import java.util.Collections; +import java.util.SortedSet; import static org.codehaus.groovy.ast.ClassHelper.make; import static org.codehaus.groovy.ast.ClassHelper.makeWithoutCaching; http://git-wip-us.apache.org/repos/asf/groovy/blob/0cfb0d91/src/main/org/codehaus/groovy/transform/IndexedPropertyASTTransformation.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/transform/IndexedPropertyASTTransformation.java b/src/main/org/codehaus/groovy/transform/IndexedPropertyASTTransformation.java index a04b9e5..0781f11 100644 --- a/src/main/org/codehaus/groovy/transform/IndexedPropertyASTTransformation.java +++ b/src/main/org/codehaus/groovy/transform/IndexedPropertyASTTransformation.java @@ -35,11 +35,7 @@ import java.util.List; import static org.codehaus.groovy.ast.ClassHelper.make; import static org.codehaus.groovy.ast.ClassHelper.makeWithoutCaching; -import static org.codehaus.groovy.ast.tools.GeneralUtils.assignS; -import static org.codehaus.groovy.ast.tools.GeneralUtils.indexX; -import static org.codehaus.groovy.ast.tools.GeneralUtils.params; -import static org.codehaus.groovy.ast.tools.GeneralUtils.stmt; -import static org.codehaus.groovy.ast.tools.GeneralUtils.varX; +import static org.codehaus.groovy.ast.tools.GeneralUtils.*; /** * Handles generation of code for the {@code @}IndexedProperty annotation. http://git-wip-us.apache.org/repos/asf/groovy/blob/0cfb0d91/src/main/org/codehaus/groovy/transform/InheritConstructorsASTTransformation.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/transform/InheritConstructorsASTTransformation.java b/src/main/org/codehaus/groovy/transform/InheritConstructorsASTTransformation.java index b4d89cb..4f2987c 100644 --- a/src/main/org/codehaus/groovy/transform/InheritConstructorsASTTransformation.java +++ b/src/main/org/codehaus/groovy/transform/InheritConstructorsASTTransformation.java @@ -34,14 +34,8 @@ import java.util.List; import java.util.Map; import static org.codehaus.groovy.ast.ClassHelper.make; -import static org.codehaus.groovy.ast.tools.GeneralUtils.args; -import static org.codehaus.groovy.ast.tools.GeneralUtils.block; -import static org.codehaus.groovy.ast.tools.GeneralUtils.ctorSuperS; -import static org.codehaus.groovy.ast.tools.GeneralUtils.param; -import static org.codehaus.groovy.ast.tools.GeneralUtils.varX; -import static org.codehaus.groovy.ast.tools.GenericsUtils.correctToGenericsSpecRecurse; -import static org.codehaus.groovy.ast.tools.GenericsUtils.createGenericsSpec; -import static org.codehaus.groovy.ast.tools.GenericsUtils.extractSuperClassGenerics; +import static org.codehaus.groovy.ast.tools.GeneralUtils.*; +import static org.codehaus.groovy.ast.tools.GenericsUtils.*; /** * Handles generation of code for the {@code @}InheritConstructors annotation. http://git-wip-us.apache.org/repos/asf/groovy/blob/0cfb0d91/src/main/org/codehaus/groovy/transform/LazyASTTransformation.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/transform/LazyASTTransformation.java b/src/main/org/codehaus/groovy/transform/LazyASTTransformation.java index a8eb6d4..02e6488 100644 --- a/src/main/org/codehaus/groovy/transform/LazyASTTransformation.java +++ b/src/main/org/codehaus/groovy/transform/LazyASTTransformation.java @@ -41,22 +41,7 @@ import org.codehaus.groovy.runtime.MetaClassHelper; import java.lang.ref.SoftReference; import static org.codehaus.groovy.ast.ClassHelper.makeWithoutCaching; -import static org.codehaus.groovy.ast.tools.GeneralUtils.assignS; -import static org.codehaus.groovy.ast.tools.GeneralUtils.assignX; -import static org.codehaus.groovy.ast.tools.GeneralUtils.block; -import static org.codehaus.groovy.ast.tools.GeneralUtils.callThisX; -import static org.codehaus.groovy.ast.tools.GeneralUtils.callX; -import static org.codehaus.groovy.ast.tools.GeneralUtils.classX; -import static org.codehaus.groovy.ast.tools.GeneralUtils.ctorX; -import static org.codehaus.groovy.ast.tools.GeneralUtils.declS; -import static org.codehaus.groovy.ast.tools.GeneralUtils.ifElseS; -import static org.codehaus.groovy.ast.tools.GeneralUtils.notNullX; -import static org.codehaus.groovy.ast.tools.GeneralUtils.param; -import static org.codehaus.groovy.ast.tools.GeneralUtils.params; -import static org.codehaus.groovy.ast.tools.GeneralUtils.propX; -import static org.codehaus.groovy.ast.tools.GeneralUtils.returnS; -import static org.codehaus.groovy.ast.tools.GeneralUtils.stmt; -import static org.codehaus.groovy.ast.tools.GeneralUtils.varX; +import static org.codehaus.groovy.ast.tools.GeneralUtils.*; /** * Handles generation of code for the @Lazy annotation http://git-wip-us.apache.org/repos/asf/groovy/blob/0cfb0d91/src/main/org/codehaus/groovy/transform/MemoizedASTTransformation.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/transform/MemoizedASTTransformation.java b/src/main/org/codehaus/groovy/transform/MemoizedASTTransformation.java index 6bca46c..780cd28 100644 --- a/src/main/org/codehaus/groovy/transform/MemoizedASTTransformation.java +++ b/src/main/org/codehaus/groovy/transform/MemoizedASTTransformation.java @@ -40,15 +40,7 @@ import java.util.ArrayList; import java.util.List; import static org.codehaus.groovy.ast.ClassHelper.make; -import static org.codehaus.groovy.ast.tools.GeneralUtils.args; -import static org.codehaus.groovy.ast.tools.GeneralUtils.callThisX; -import static org.codehaus.groovy.ast.tools.GeneralUtils.callX; -import static org.codehaus.groovy.ast.tools.GeneralUtils.cloneParams; -import static org.codehaus.groovy.ast.tools.GeneralUtils.constX; -import static org.codehaus.groovy.ast.tools.GeneralUtils.fieldX; -import static org.codehaus.groovy.ast.tools.GeneralUtils.returnS; -import static org.codehaus.groovy.ast.tools.GeneralUtils.stmt; -import static org.codehaus.groovy.ast.tools.GeneralUtils.varX; +import static org.codehaus.groovy.ast.tools.GeneralUtils.*; import static org.codehaus.groovy.ast.tools.GenericsUtils.newClass; /** http://git-wip-us.apache.org/repos/asf/groovy/blob/0cfb0d91/src/main/org/codehaus/groovy/transform/NewifyASTTransformation.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/transform/NewifyASTTransformation.java b/src/main/org/codehaus/groovy/transform/NewifyASTTransformation.java index f649658..ea936ad 100644 --- a/src/main/org/codehaus/groovy/transform/NewifyASTTransformation.java +++ b/src/main/org/codehaus/groovy/transform/NewifyASTTransformation.java @@ -39,9 +39,9 @@ import org.codehaus.groovy.ast.expr.VariableExpression; import org.codehaus.groovy.control.CompilePhase; import org.codehaus.groovy.control.SourceUnit; +import java.util.Arrays; import java.util.HashSet; import java.util.List; -import java.util.Arrays; import java.util.Set; import static org.codehaus.groovy.ast.ClassHelper.make; http://git-wip-us.apache.org/repos/asf/groovy/blob/0cfb0d91/src/main/org/codehaus/groovy/transform/PackageScopeASTTransformation.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/transform/PackageScopeASTTransformation.java b/src/main/org/codehaus/groovy/transform/PackageScopeASTTransformation.java index 5fca842..61493b0 100644 --- a/src/main/org/codehaus/groovy/transform/PackageScopeASTTransformation.java +++ b/src/main/org/codehaus/groovy/transform/PackageScopeASTTransformation.java @@ -38,9 +38,9 @@ import org.codehaus.groovy.ast.expr.PropertyExpression; import org.codehaus.groovy.control.CompilePhase; import org.codehaus.groovy.control.SourceUnit; +import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import java.util.ArrayList; /** * Handles transformation for the @PackageScope annotation. http://git-wip-us.apache.org/repos/asf/groovy/blob/0cfb0d91/src/main/org/codehaus/groovy/transform/ReadWriteLockASTTransformation.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/transform/ReadWriteLockASTTransformation.java b/src/main/org/codehaus/groovy/transform/ReadWriteLockASTTransformation.java index 113d21d..1f7ffaf 100644 --- a/src/main/org/codehaus/groovy/transform/ReadWriteLockASTTransformation.java +++ b/src/main/org/codehaus/groovy/transform/ReadWriteLockASTTransformation.java @@ -36,11 +36,7 @@ import org.codehaus.groovy.control.SourceUnit; import java.util.concurrent.locks.ReentrantReadWriteLock; import static org.codehaus.groovy.ast.ClassHelper.make; -import static org.codehaus.groovy.ast.tools.GeneralUtils.block; -import static org.codehaus.groovy.ast.tools.GeneralUtils.callX; -import static org.codehaus.groovy.ast.tools.GeneralUtils.ctorX; -import static org.codehaus.groovy.ast.tools.GeneralUtils.stmt; -import static org.codehaus.groovy.ast.tools.GeneralUtils.varX; +import static org.codehaus.groovy.ast.tools.GeneralUtils.*; /** http://git-wip-us.apache.org/repos/asf/groovy/blob/0cfb0d91/src/main/org/codehaus/groovy/transform/SingletonASTTransformation.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/transform/SingletonASTTransformation.java b/src/main/org/codehaus/groovy/transform/SingletonASTTransformation.java index ce20ddc..e170eba 100644 --- a/src/main/org/codehaus/groovy/transform/SingletonASTTransformation.java +++ b/src/main/org/codehaus/groovy/transform/SingletonASTTransformation.java @@ -35,17 +35,7 @@ import org.codehaus.groovy.control.SourceUnit; import java.util.List; import static org.codehaus.groovy.ast.ClassHelper.make; -import static org.codehaus.groovy.ast.tools.GeneralUtils.args; -import static org.codehaus.groovy.ast.tools.GeneralUtils.assignX; -import static org.codehaus.groovy.ast.tools.GeneralUtils.classX; -import static org.codehaus.groovy.ast.tools.GeneralUtils.constX; -import static org.codehaus.groovy.ast.tools.GeneralUtils.ctorX; -import static org.codehaus.groovy.ast.tools.GeneralUtils.ifElseS; -import static org.codehaus.groovy.ast.tools.GeneralUtils.ifS; -import static org.codehaus.groovy.ast.tools.GeneralUtils.notNullX; -import static org.codehaus.groovy.ast.tools.GeneralUtils.returnS; -import static org.codehaus.groovy.ast.tools.GeneralUtils.throwS; -import static org.codehaus.groovy.ast.tools.GeneralUtils.varX; +import static org.codehaus.groovy.ast.tools.GeneralUtils.*; import static org.codehaus.groovy.ast.tools.GenericsUtils.newClass; /** http://git-wip-us.apache.org/repos/asf/groovy/blob/0cfb0d91/src/main/org/codehaus/groovy/transform/SortableASTTransformation.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/transform/SortableASTTransformation.java b/src/main/org/codehaus/groovy/transform/SortableASTTransformation.java index 56168e4..da7bd57 100644 --- a/src/main/org/codehaus/groovy/transform/SortableASTTransformation.java +++ b/src/main/org/codehaus/groovy/transform/SortableASTTransformation.java @@ -29,12 +29,12 @@ import org.codehaus.groovy.ast.InnerClassNode; import org.codehaus.groovy.ast.MethodNode; import org.codehaus.groovy.ast.Parameter; import org.codehaus.groovy.ast.PropertyNode; -import org.codehaus.groovy.classgen.VariableScopeVisitor; -import org.codehaus.groovy.runtime.AbstractComparator; import org.codehaus.groovy.ast.stmt.BlockStatement; import org.codehaus.groovy.ast.stmt.Statement; +import org.codehaus.groovy.classgen.VariableScopeVisitor; import org.codehaus.groovy.control.CompilePhase; import org.codehaus.groovy.control.SourceUnit; +import org.codehaus.groovy.runtime.AbstractComparator; import org.codehaus.groovy.runtime.StringGroovyMethods; import java.util.ArrayList; @@ -45,9 +45,7 @@ import java.util.List; import static org.codehaus.groovy.ast.ClassHelper.isPrimitiveType; import static org.codehaus.groovy.ast.ClassHelper.make; import static org.codehaus.groovy.ast.tools.GeneralUtils.*; -import static org.codehaus.groovy.ast.tools.GenericsUtils.makeClassSafe; -import static org.codehaus.groovy.ast.tools.GenericsUtils.makeClassSafeWithGenerics; -import static org.codehaus.groovy.ast.tools.GenericsUtils.newClass; +import static org.codehaus.groovy.ast.tools.GenericsUtils.*; /** * Injects a set of Comparators and sort methods.
