Optimize imports
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/4526cc0d Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/4526cc0d Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/4526cc0d Branch: refs/heads/GROOVY_2_6_X Commit: 4526cc0d2b38ef0b465e4c7c5b9eee945e8b7791 Parents: 70cd22d Author: sunlan <[email protected]> Authored: Thu Nov 23 22:05:27 2017 +0800 Committer: sunlan <[email protected]> Committed: Thu Nov 23 22:05:35 2017 +0800 ---------------------------------------------------------------------- .../groovy/beans/BindableASTTransformation.java | 14 +--- src/main/groovy/beans/ListenerList.groovy | 6 +- .../beans/ListenerListASTTransformation.groovy | 6 +- .../groovy/beans/VetoableASTTransformation.java | 14 +--- .../grape/GrabAnnotationTransformation.java | 8 +-- src/main/groovy/grape/Grape.java | 2 +- src/main/groovy/grape/GrapeEngine.java | 2 +- src/main/groovy/grape/GrapeIvy.groovy | 23 +++--- src/main/groovy/inspect/Inspector.java | 6 +- .../groovy/io/EncodingAwareBufferedWriter.java | 3 +- src/main/groovy/io/GroovyPrintStream.java | 6 +- src/main/groovy/io/GroovyPrintWriter.java | 8 +-- src/main/groovy/io/PlatformLineWriter.java | 2 +- src/main/groovy/lang/BenchmarkInterceptor.java | 7 +- src/main/groovy/lang/Closure.java | 5 +- src/main/groovy/lang/ExpandoMetaClass.java | 32 ++++----- src/main/groovy/lang/GString.java | 2 +- src/main/groovy/lang/Grab.java | 2 +- src/main/groovy/lang/GrabResolver.java | 2 +- src/main/groovy/lang/GroovyClassLoader.java | 37 ++++++++-- src/main/groovy/lang/GroovyCodeSource.java | 5 +- src/main/groovy/lang/GroovyResourceLoader.java | 2 +- src/main/groovy/lang/GroovyShell.java | 7 +- src/main/groovy/lang/MetaClassImpl.java | 72 +++++++++++++++++-- src/main/groovy/lang/MetaProperty.java | 4 +- src/main/groovy/lang/NumberRange.java | 8 +-- src/main/groovy/lang/Sequence.java | 6 +- src/main/groovy/lang/SpreadMap.java | 6 +- src/main/groovy/transform/CompileStatic.java | 6 +- .../transform/ConditionalInterrupt.groovy | 3 +- src/main/groovy/transform/Memoized.java | 4 +- src/main/groovy/transform/Sortable.java | 6 +- .../groovy/transform/ThreadInterrupt.groovy | 7 +- src/main/groovy/transform/TimedInterrupt.groovy | 9 +-- src/main/groovy/transform/TypeChecked.java | 7 +- src/main/groovy/transform/builder/Builder.java | 8 +-- .../transform/builder/DefaultStrategy.java | 23 +----- .../transform/builder/ExternalStrategy.java | 19 +---- .../transform/builder/InitializerStrategy.java | 26 +------ .../transform/builder/SimpleStrategy.java | 11 +-- src/main/groovy/ui/GroovyMain.java | 12 +++- src/main/groovy/util/CharsetToolkit.java | 9 ++- src/main/groovy/util/CliBuilder.groovy | 8 +-- src/main/groovy/util/ClosureComparator.java | 3 +- src/main/groovy/util/ConfigObject.java | 7 +- src/main/groovy/util/Eval.java | 3 +- src/main/groovy/util/Expando.java | 4 +- src/main/groovy/util/FactoryBuilderSupport.java | 12 +++- src/main/groovy/util/GroovyCollections.java | 11 ++- src/main/groovy/util/GroovyScriptEngine.java | 1 - src/main/groovy/util/MapEntry.java | 4 +- src/main/groovy/util/ObjectGraphBuilder.java | 11 ++- src/main/groovy/util/ObservableMap.java | 9 ++- src/main/groovy/util/ObservableSet.java | 9 ++- src/main/groovy/util/Proxy.java | 4 +- src/main/groovy/util/logging/Commons.java | 8 ++- src/main/groovy/util/logging/Log.java | 9 ++- src/main/groovy/util/logging/Log4j.java | 9 ++- src/main/groovy/util/logging/Log4j2.java | 13 ++-- src/main/groovy/util/logging/Slf4j.java | 20 ++++-- .../ConcurrentLinkedHashMap.java | 14 +++- .../concurrentlinkedhashmap/LinkedDeque.java | 6 +- .../util/concurrentlinkedhashmap/Weighers.java | 6 +- .../groovy/antlr/AntlrASTProcessSnippets.java | 5 +- .../groovy/antlr/AntlrParserPlugin.java | 39 ++++++++++- src/main/org/codehaus/groovy/antlr/Main.java | 15 ++-- .../org/codehaus/groovy/antlr/SourceBuffer.java | 2 +- .../groovy/antlr/UnicodeEscapingReader.java | 6 +- .../groovy/antlr/java/Java2GroovyMain.java | 1 + .../antlr/java/PreJava2GroovyConverter.java | 4 +- .../antlr/treewalker/CompositeVisitor.java | 7 +- .../antlr/treewalker/FlatNodeListTraversal.java | 7 +- .../antlr/treewalker/NodeAsHTMLPrinter.java | 6 +- .../groovy/antlr/treewalker/NodeCollector.java | 4 +- .../groovy/antlr/treewalker/NodePrinter.java | 4 +- .../antlr/treewalker/SourceCodeTraversal.java | 6 +- .../groovy/antlr/treewalker/SourcePrinter.java | 6 +- .../antlr/treewalker/TraversalHelper.java | 9 ++- .../org/codehaus/groovy/ast/AnnotatedNode.java | 4 +- .../ast/ClassCodeExpressionTransformer.java | 10 +-- .../groovy/ast/ClassCodeVisitorSupport.java | 6 +- .../org/codehaus/groovy/ast/ClassHelper.java | 16 +++-- .../codehaus/groovy/ast/CodeVisitorSupport.java | 55 ++++++++++++++- .../org/codehaus/groovy/ast/CompileUnit.java | 9 ++- .../org/codehaus/groovy/ast/GenericsType.java | 4 +- .../codehaus/groovy/ast/GroovyCodeVisitor.java | 52 +++++++++++++- .../groovy/ast/MixinASTTransformation.java | 5 +- src/main/org/codehaus/groovy/ast/Parameter.java | 2 +- .../groovy/ast/TransformingCodeVisitor.java | 33 ++++++++- .../groovy/ast/builder/AstBuilder.groovy | 2 +- .../ast/builder/AstBuilderTransformation.java | 13 +++- .../ast/builder/AstSpecificationCompiler.groovy | 72 +------------------ .../groovy/ast/builder/AstStringCompiler.groovy | 4 +- .../groovy/ast/decompiled/Annotations.java | 8 ++- .../groovy/ast/decompiled/AsmDecompiler.java | 14 +++- .../groovy/ast/decompiled/ClassStub.java | 6 +- .../ast/decompiled/DecompiledClassNode.java | 9 ++- .../ast/decompiled/MemberSignatureParser.java | 8 ++- .../ast/expr/AnnotationConstantExpression.java | 4 +- .../groovy/ast/expr/ArgumentListExpression.java | 4 +- .../groovy/ast/expr/ArrayExpression.java | 6 +- .../groovy/ast/expr/ClosureExpression.java | 6 +- .../groovy/ast/expr/ClosureListExpression.java | 6 +- .../codehaus/groovy/ast/expr/Expression.java | 10 +-- .../groovy/ast/expr/GStringExpression.java | 6 +- .../groovy/ast/expr/ListExpression.java | 6 +- .../codehaus/groovy/ast/expr/MapExpression.java | 6 +- .../groovy/ast/expr/MethodCallExpression.java | 6 +- .../ast/expr/MethodPointerExpression.java | 1 - .../ast/expr/StaticMethodCallExpression.java | 1 - .../groovy/ast/expr/TupleExpression.java | 8 ++- .../groovy/ast/stmt/BlockStatement.java | 6 +- .../groovy/ast/stmt/SwitchStatement.java | 6 +- .../groovy/ast/tools/WideningCategories.java | 17 ++++- .../groovy/classgen/AnnotationVisitor.java | 10 +-- .../classgen/ClassCompletionVerifier.java | 22 ++++-- .../groovy/classgen/DummyClassGenerator.java | 11 ++- .../groovy/classgen/EnumCompletionVisitor.java | 9 ++- .../codehaus/groovy/classgen/EnumVisitor.java | 20 +++++- .../groovy/classgen/ExtendedVerifier.java | 4 +- .../classgen/InnerClassVisitorHelper.java | 11 ++- .../codehaus/groovy/classgen/ReturnAdder.java | 16 ++++- .../groovy/classgen/VariableScopeVisitor.java | 27 +++++++- .../org/codehaus/groovy/classgen/Verifier.java | 24 +++++-- .../groovy/classgen/VerifierCodeVisitor.java | 4 +- .../groovy/classgen/asm/AssertionWriter.java | 6 +- .../asm/BinaryDoubleExpressionHelper.java | 4 +- .../classgen/asm/BinaryExpressionHelper.java | 53 +------------- .../classgen/asm/BinaryExpressionWriter.java | 6 +- .../asm/BinaryFloatExpressionHelper.java | 4 +- .../classgen/asm/BinaryIntExpressionHelper.java | 3 +- .../asm/BinaryLongExpressionHelper.java | 4 +- .../groovy/classgen/asm/BytecodeHelper.java | 7 +- .../groovy/classgen/asm/CallSiteWriter.java | 10 ++- .../groovy/classgen/asm/ClosureWriter.java | 10 +-- .../groovy/classgen/asm/InvocationWriter.java | 30 +++++++- .../groovy/classgen/asm/MethodCaller.java | 4 +- .../codehaus/groovy/classgen/asm/MopWriter.java | 12 ++-- .../groovy/classgen/asm/OperandStack.java | 16 +++-- .../classgen/asm/OptimizingStatementWriter.java | 46 +++++++++--- .../classgen/asm/UnaryExpressionHelper.java | 6 +- .../classgen/asm/indy/IndyCallSiteWriter.java | 3 +- .../classgen/asm/indy/InvokeDynamicWriter.java | 11 +-- .../classgen/asm/sc/StaticInvocationWriter.java | 28 ++++++-- ...ypesBinaryExpressionMultiTypeDispatcher.java | 29 +++++++- .../asm/sc/StaticTypesCallSiteWriter.java | 30 ++++++-- .../sc/StaticTypesUnaryExpressionHelper.java | 11 ++- .../groovy/control/CompilationUnit.java | 26 +++++-- .../codehaus/groovy/control/ErrorCollector.java | 10 +-- .../codehaus/groovy/control/ParserPlugin.java | 4 +- .../codehaus/groovy/control/ResolveVisitor.java | 46 ++++++++++-- .../groovy/control/StaticImportVisitor.java | 7 +- .../ASTTransformationCustomizer.groovy | 26 +++---- .../control/customizers/ImportCustomizer.java | 3 +- .../customizers/SecureASTCustomizer.java | 70 +++++++++++++++++-- .../ASTTransformationCustomizerFactory.groovy | 2 +- .../groovy/control/io/AbstractReaderSource.java | 6 +- .../groovy/control/io/FileReaderSource.java | 12 +++- .../control/io/InputStreamReaderSource.java | 4 +- .../groovy/control/io/ReaderSource.java | 6 +- .../groovy/control/io/StringReaderSource.java | 4 +- .../groovy/control/io/URLReaderSource.java | 6 +- .../control/messages/ExceptionMessage.java | 4 +- .../groovy/control/messages/LocatedMessage.java | 4 +- .../groovy/control/messages/Message.java | 4 +- .../groovy/control/messages/SimpleMessage.java | 4 +- .../control/messages/SyntaxErrorMessage.java | 4 +- .../groovy/control/messages/WarningMessage.java | 4 +- .../reflection/AccessPermissionChecker.java | 4 +- .../codehaus/groovy/reflection/CachedClass.java | 21 ++++-- .../groovy/reflection/CachedMethod.java | 10 ++- .../codehaus/groovy/reflection/ClassInfo.java | 37 ++++++++-- .../ClassLoaderForClassArtifacts.java | 9 ++- .../groovy/reflection/GeneratedMetaMethod.java | 16 ++++- .../groovy/reflection/ReflectionUtils.java | 2 +- .../groovy/reflection/SunClassLoader.java | 8 +-- .../stdclasses/BigDecimalCachedClass.java | 3 +- .../stdclasses/CachedClosureClass.java | 2 +- .../reflection/stdclasses/CachedSAMClass.java | 19 +++-- .../codehaus/groovy/runtime/ConvertedMap.java | 4 +- .../runtime/DefaultGroovyMethodsSupport.java | 36 +++++++++- .../runtime/DefaultGroovyStaticMethods.java | 7 +- .../groovy/runtime/FlushingStreamWriter.java | 4 +- .../groovy/runtime/GroovyCategorySupport.java | 11 ++- .../groovy/runtime/HandleMetaClass.java | 7 +- .../groovy/runtime/MetaClassHelper.java | 10 ++- .../groovy/runtime/MethodRankHelper.java | 5 +- .../org/codehaus/groovy/runtime/NullObject.java | 6 +- .../groovy/runtime/ResourceGroovyMethods.java | 26 ++++++- .../groovy/runtime/ScriptBytecodeAdapter.java | 14 +++- .../groovy/runtime/StackTraceUtils.java | 3 +- .../groovy/runtime/StringGroovyMethods.java | 5 +- .../runtime/callsite/AbstractCallSite.java | 7 +- .../runtime/callsite/BooleanClosureWrapper.java | 4 +- .../groovy/runtime/callsite/CallSiteArray.java | 7 +- .../runtime/callsite/CallSiteClassLoader.java | 4 +- .../runtime/callsite/CallSiteGenerator.java | 3 +- .../callsite/ClassMetaClassGetPropertySite.java | 1 - .../callsite/ConstructorMetaClassSite.java | 3 +- .../callsite/GetEffectivePogoFieldSite.java | 7 +- .../callsite/GetEffectivePogoPropertySite.java | 2 +- .../callsite/GetEffectivePojoFieldSite.java | 5 +- .../callsite/GetEffectivePojoPropertySite.java | 1 - .../runtime/callsite/GroovySunClassLoader.java | 2 +- .../callsite/MetaClassConstructorSite.java | 5 +- .../groovy/runtime/callsite/NullCallSite.java | 1 - .../callsite/PerInstancePojoMetaClassSite.java | 3 +- .../runtime/callsite/PogoGetPropertySite.java | 3 +- .../runtime/callsite/PogoInterceptableSite.java | 1 - .../callsite/PogoMetaClassGetPropertySite.java | 5 +- .../runtime/callsite/PogoMetaClassSite.java | 1 - .../runtime/callsite/PojoMetaClassSite.java | 1 - .../runtime/callsite/StaticMetaClassSite.java | 1 - .../runtime/callsite/StaticMetaMethodSite.java | 2 +- .../runtime/m12n/ExtensionModuleScanner.java | 3 +- .../runtime/m12n/MetaInfExtensionModule.java | 1 + .../runtime/metaclass/ClosureMetaClass.java | 27 ++++++-- .../metaclass/ConcurrentReaderHashMap.java | 15 ++-- .../metaclass/MetaClassRegistryImpl.java | 30 ++++++-- .../runtime/metaclass/MetaMethodIndex.java | 2 +- .../runtime/metaclass/MixedInMetaClass.java | 6 +- .../metaclass/MixinInstanceMetaMethod.java | 2 +- .../metaclass/MixinInstanceMetaProperty.java | 4 +- .../runtime/metaclass/OwnedMetaClass.java | 6 +- .../runtime/metaclass/TemporaryMethodKey.java | 2 +- .../runtime/powerassert/AssertionRenderer.java | 8 ++- .../typehandling/DefaultTypeTransformation.java | 1 - .../org/codehaus/groovy/syntax/ASTHelper.java | 2 +- .../org/codehaus/groovy/syntax/CSTNode.java | 2 +- .../org/codehaus/groovy/syntax/Numbers.java | 2 +- .../org/codehaus/groovy/syntax/Reduction.java | 2 +- .../groovy/syntax/RuntimeParserException.java | 1 - .../org/codehaus/groovy/tools/Compiler.java | 4 +- .../codehaus/groovy/tools/ErrorReporter.java | 8 +-- .../groovy/tools/FileSystemCompiler.java | 2 +- .../org/codehaus/groovy/tools/GrapeMain.groovy | 7 +- .../codehaus/groovy/tools/GroovyStarter.java | 3 +- .../groovy/tools/ast/TransformTestHelper.groovy | 13 ++-- .../groovy/tools/gse/DependencyTracker.java | 8 +-- .../tools/javac/JavaAwareCompilationUnit.java | 7 +- .../groovy/tools/javac/JavaCompiler.java | 4 +- .../groovy/tools/javac/JavaStubGenerator.java | 19 +++-- .../groovy/tools/javac/JavacJavaCompiler.java | 27 ++++---- .../org/codehaus/groovy/tools/shell/IO.java | 6 +- .../groovy/tools/shell/util/Logger.java | 7 +- .../groovy/tools/shell/util/MessageSource.java | 7 +- .../groovy/tools/shell/util/Preferences.java | 6 +- .../transform/ASTTestTransformation.groovy | 21 ++---- .../transform/ASTTransformationVisitor.java | 27 ++++++-- .../AbstractInterruptibleASTTransformation.java | 6 +- .../AutoImplementASTTransformation.java | 11 +-- .../transform/CategoryASTTransformation.java | 9 ++- .../transform/DelegateASTTransformation.java | 19 +---- .../ExternalizeMethodsASTTransformation.java | 10 +-- .../transform/FieldASTTransformation.java | 8 +-- .../transform/ImmutableASTTransformation.java | 4 +- .../IndexedPropertyASTTransformation.java | 6 +- .../InheritConstructorsASTTransformation.java | 10 +-- .../groovy/transform/LazyASTTransformation.java | 17 +---- .../MapConstructorASTTransformation.java | 18 +---- .../transform/MemoizedASTTransformation.java | 10 +-- .../transform/NewifyASTTransformation.java | 2 +- .../PackageScopeASTTransformation.java | 2 +- .../ReadWriteLockASTTransformation.java | 6 +- .../transform/SingletonASTTransformation.java | 12 +--- .../transform/SortableASTTransformation.java | 8 +-- .../transform/SourceURIASTTransformation.java | 4 +- .../ThreadInterruptibleASTTransformation.groovy | 4 +- .../TimedInterruptibleASTTransformation.groovy | 22 +----- .../TupleConstructorASTTransformation.java | 22 +----- .../transform/sc/StaticCompilationVisitor.java | 42 +++++++++-- .../sc/StaticCompileTransformation.java | 6 +- .../BooleanExpressionTransformer.java | 12 +++- .../stc/DefaultTypeCheckingExtension.java | 7 +- .../transform/stc/PropertyLookupVisitor.java | 6 +- .../transform/stc/SignatureCodecVersion1.java | 7 +- .../stc/StaticTypeCheckingSupport.java | 30 +++++++- .../stc/StaticTypeCheckingVisitor.java | 73 ++++++++++---------- .../transform/stc/TypeCheckingContext.java | 18 ++++- .../transform/stc/TypeCheckingExtension.java | 17 ++++- .../groovy/transform/tailrec/AstHelper.groovy | 5 +- .../transform/tailrec/InWhileLoopWrapper.groovy | 8 +-- .../transform/trait/NAryOperationRewriter.java | 2 +- .../trait/SuperCallTraitTransformer.java | 8 +-- .../transform/trait/TraitASTTransformation.java | 1 - .../groovy/transform/trait/TraitComposer.java | 8 +-- .../groovy/util/IteratorBufferedIterator.java | 3 +- .../groovy/util/ListBufferedIterator.java | 3 +- .../org/codehaus/groovy/vmplugin/VMPlugin.java | 4 +- .../groovy/vmplugin/v5/JUnit4Utils.java | 2 +- .../vmplugin/v5/PluginDefaultGroovyMethods.java | 6 +- .../groovy/vmplugin/v7/IndyArrayAccess.java | 4 +- .../v7/IndyGuardsFiltersAndSignatures.java | 21 +++--- .../groovy/vmplugin/v7/IndyInterface.java | 11 ++- .../codehaus/groovy/vmplugin/v7/IndyMath.java | 13 ++-- .../codehaus/groovy/vmplugin/v7/Selector.java | 8 +-- .../groovy/vmplugin/v7/TypeTransformers.java | 11 +-- 297 files changed, 1883 insertions(+), 1210 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/groovy/blob/4526cc0d/src/main/groovy/beans/BindableASTTransformation.java ---------------------------------------------------------------------- diff --git a/src/main/groovy/beans/BindableASTTransformation.java b/src/main/groovy/beans/BindableASTTransformation.java index f987295..51be7a2 100644 --- a/src/main/groovy/beans/BindableASTTransformation.java +++ b/src/main/groovy/beans/BindableASTTransformation.java @@ -44,19 +44,7 @@ import org.objectweb.asm.Opcodes; import java.beans.PropertyChangeListener; import java.beans.PropertyChangeSupport; -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.callThisX; -import static org.codehaus.groovy.ast.tools.GeneralUtils.callX; -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.declS; -import static org.codehaus.groovy.ast.tools.GeneralUtils.fieldX; -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.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 {@code @Bindable} annotation when {@code @Vetoable} http://git-wip-us.apache.org/repos/asf/groovy/blob/4526cc0d/src/main/groovy/beans/ListenerList.groovy ---------------------------------------------------------------------- diff --git a/src/main/groovy/beans/ListenerList.groovy b/src/main/groovy/beans/ListenerList.groovy index 6034b9a..3f696be 100644 --- a/src/main/groovy/beans/ListenerList.groovy +++ b/src/main/groovy/beans/ListenerList.groovy @@ -18,13 +18,9 @@ */ package groovy.beans -import java.lang.annotation.Documented -import java.lang.annotation.ElementType -import java.lang.annotation.Retention -import java.lang.annotation.RetentionPolicy -import java.lang.annotation.Target import org.codehaus.groovy.transform.GroovyASTTransformationClass +import java.lang.annotation.* /** * This annotation adds Java-style listener support to a class based on an annotated Collection-property. http://git-wip-us.apache.org/repos/asf/groovy/blob/4526cc0d/src/main/groovy/beans/ListenerListASTTransformation.groovy ---------------------------------------------------------------------- diff --git a/src/main/groovy/beans/ListenerListASTTransformation.groovy b/src/main/groovy/beans/ListenerListASTTransformation.groovy index 2e8b664..b6703fa 100644 --- a/src/main/groovy/beans/ListenerListASTTransformation.groovy +++ b/src/main/groovy/beans/ListenerListASTTransformation.groovy @@ -18,6 +18,9 @@ */ package groovy.beans +import org.codehaus.groovy.ast.* +import org.codehaus.groovy.ast.expr.* +import org.codehaus.groovy.ast.stmt.* import org.codehaus.groovy.control.CompilePhase import org.codehaus.groovy.control.SourceUnit import org.codehaus.groovy.control.messages.SyntaxErrorMessage @@ -27,9 +30,6 @@ import org.codehaus.groovy.syntax.Types import org.codehaus.groovy.transform.ASTTransformation import org.codehaus.groovy.transform.GroovyASTTransformation import org.objectweb.asm.Opcodes -import org.codehaus.groovy.ast.* -import org.codehaus.groovy.ast.expr.* -import org.codehaus.groovy.ast.stmt.* /** * Handles generation of code for the {@code @ListenerList} annotation. http://git-wip-us.apache.org/repos/asf/groovy/blob/4526cc0d/src/main/groovy/beans/VetoableASTTransformation.java ---------------------------------------------------------------------- diff --git a/src/main/groovy/beans/VetoableASTTransformation.java b/src/main/groovy/beans/VetoableASTTransformation.java index d7353fd..5a7e7db 100644 --- a/src/main/groovy/beans/VetoableASTTransformation.java +++ b/src/main/groovy/beans/VetoableASTTransformation.java @@ -44,19 +44,7 @@ import java.beans.PropertyVetoException; import java.beans.VetoableChangeListener; import java.beans.VetoableChangeSupport; -import static org.codehaus.groovy.ast.tools.GeneralUtils.args; -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.constX; -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.fieldX; -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.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 {@code @Vetoable} annotation, and {@code @Bindable} http://git-wip-us.apache.org/repos/asf/groovy/blob/4526cc0d/src/main/groovy/grape/GrabAnnotationTransformation.java ---------------------------------------------------------------------- diff --git a/src/main/groovy/grape/GrabAnnotationTransformation.java b/src/main/groovy/grape/GrabAnnotationTransformation.java index e0b501f..56ccff8 100644 --- a/src/main/groovy/grape/GrabAnnotationTransformation.java +++ b/src/main/groovy/grape/GrabAnnotationTransformation.java @@ -64,13 +64,7 @@ import java.util.Set; import java.util.regex.Matcher; import java.util.regex.Pattern; -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.constX; -import static org.codehaus.groovy.ast.tools.GeneralUtils.eqX; -import static org.codehaus.groovy.ast.tools.GeneralUtils.ifS; -import static org.codehaus.groovy.ast.tools.GeneralUtils.stmt; +import static org.codehaus.groovy.ast.tools.GeneralUtils.*; import static org.codehaus.groovy.transform.AbstractASTTransformation.getMemberStringValue; /** http://git-wip-us.apache.org/repos/asf/groovy/blob/4526cc0d/src/main/groovy/grape/Grape.java ---------------------------------------------------------------------- diff --git a/src/main/groovy/grape/Grape.java b/src/main/groovy/grape/Grape.java index 6786b53..c534ded 100644 --- a/src/main/groovy/grape/Grape.java +++ b/src/main/groovy/grape/Grape.java @@ -18,10 +18,10 @@ */ package groovy.grape; +import java.net.URI; import java.util.Collections; import java.util.List; import java.util.Map; -import java.net.URI; /** * Facade to GrapeEngine. http://git-wip-us.apache.org/repos/asf/groovy/blob/4526cc0d/src/main/groovy/grape/GrapeEngine.java ---------------------------------------------------------------------- diff --git a/src/main/groovy/grape/GrapeEngine.java b/src/main/groovy/grape/GrapeEngine.java index 6cdcf1a..4ce171f 100644 --- a/src/main/groovy/grape/GrapeEngine.java +++ b/src/main/groovy/grape/GrapeEngine.java @@ -18,9 +18,9 @@ */ package groovy.grape; +import java.net.URI; import java.util.List; import java.util.Map; -import java.net.URI; /** * @author Danno Ferrin http://git-wip-us.apache.org/repos/asf/groovy/blob/4526cc0d/src/main/groovy/grape/GrapeIvy.groovy ---------------------------------------------------------------------- diff --git a/src/main/groovy/grape/GrapeIvy.groovy b/src/main/groovy/grape/GrapeIvy.groovy index f3e0958..726fe4a 100644 --- a/src/main/groovy/grape/GrapeIvy.groovy +++ b/src/main/groovy/grape/GrapeIvy.groovy @@ -20,18 +20,12 @@ package groovy.grape import org.apache.groovy.plugin.GroovyRunner import org.apache.groovy.plugin.GroovyRunnerRegistry - -import java.util.regex.Pattern import org.apache.ivy.Ivy import org.apache.ivy.core.cache.ResolutionCacheManager import org.apache.ivy.core.event.IvyListener import org.apache.ivy.core.event.download.PrepareDownloadEvent import org.apache.ivy.core.event.resolve.StartResolveEvent -import org.apache.ivy.core.module.descriptor.Configuration -import org.apache.ivy.core.module.descriptor.DefaultDependencyArtifactDescriptor -import org.apache.ivy.core.module.descriptor.DefaultDependencyDescriptor -import org.apache.ivy.core.module.descriptor.DefaultExcludeRule -import org.apache.ivy.core.module.descriptor.DefaultModuleDescriptor +import org.apache.ivy.core.module.descriptor.* import org.apache.ivy.core.module.id.ArtifactId import org.apache.ivy.core.module.id.ModuleId import org.apache.ivy.core.module.id.ModuleRevisionId @@ -45,16 +39,17 @@ import org.apache.ivy.plugins.resolver.ChainResolver import org.apache.ivy.plugins.resolver.IBiblioResolver import org.apache.ivy.util.DefaultMessageLogger import org.apache.ivy.util.Message +import org.codehaus.groovy.reflection.CachedClass +import org.codehaus.groovy.reflection.ClassInfo import org.codehaus.groovy.reflection.ReflectionUtils -import java.util.zip.ZipFile -import java.util.zip.ZipEntry -import java.util.zip.ZipException -import javax.xml.parsers.DocumentBuilderFactory import org.codehaus.groovy.runtime.metaclass.MetaClassRegistryImpl -import java.util.jar.JarFile -import org.codehaus.groovy.reflection.CachedClass -import org.codehaus.groovy.reflection.ClassInfo +import javax.xml.parsers.DocumentBuilderFactory +import java.util.jar.JarFile +import java.util.regex.Pattern +import java.util.zip.ZipEntry +import java.util.zip.ZipException +import java.util.zip.ZipFile /** * @author Danno Ferrin http://git-wip-us.apache.org/repos/asf/groovy/blob/4526cc0d/src/main/groovy/inspect/Inspector.java ---------------------------------------------------------------------- diff --git a/src/main/groovy/inspect/Inspector.java b/src/main/groovy/inspect/Inspector.java index a2e59e9..b93aa69 100644 --- a/src/main/groovy/inspect/Inspector.java +++ b/src/main/groovy/inspect/Inspector.java @@ -31,7 +31,11 @@ import java.lang.reflect.Constructor; import java.lang.reflect.Field; import java.lang.reflect.Method; import java.lang.reflect.Modifier; -import java.util.*; +import java.util.Collection; +import java.util.Collections; +import java.util.Comparator; +import java.util.Iterator; +import java.util.List; /** * The Inspector provides a unified access to an object's http://git-wip-us.apache.org/repos/asf/groovy/blob/4526cc0d/src/main/groovy/io/EncodingAwareBufferedWriter.java ---------------------------------------------------------------------- diff --git a/src/main/groovy/io/EncodingAwareBufferedWriter.java b/src/main/groovy/io/EncodingAwareBufferedWriter.java index df08a2d..2faaaeb 100644 --- a/src/main/groovy/io/EncodingAwareBufferedWriter.java +++ b/src/main/groovy/io/EncodingAwareBufferedWriter.java @@ -18,7 +18,8 @@ */ package groovy.io; -import java.io.*; +import java.io.BufferedWriter; +import java.io.OutputStreamWriter; import java.nio.charset.Charset; /** http://git-wip-us.apache.org/repos/asf/groovy/blob/4526cc0d/src/main/groovy/io/GroovyPrintStream.java ---------------------------------------------------------------------- diff --git a/src/main/groovy/io/GroovyPrintStream.java b/src/main/groovy/io/GroovyPrintStream.java index 3a3e3a6..d77c5aa 100644 --- a/src/main/groovy/io/GroovyPrintStream.java +++ b/src/main/groovy/io/GroovyPrintStream.java @@ -18,14 +18,14 @@ */ package groovy.io; +import org.codehaus.groovy.runtime.InvokerHelper; + import java.io.File; +import java.io.FileNotFoundException; import java.io.OutputStream; import java.io.PrintStream; -import java.io.FileNotFoundException; import java.io.UnsupportedEncodingException; -import org.codehaus.groovy.runtime.InvokerHelper; - /** * A PrintStream that outputs objects in Groovy style. * That means print(Object) uses InvokerHelper.toString(Object) http://git-wip-us.apache.org/repos/asf/groovy/blob/4526cc0d/src/main/groovy/io/GroovyPrintWriter.java ---------------------------------------------------------------------- diff --git a/src/main/groovy/io/GroovyPrintWriter.java b/src/main/groovy/io/GroovyPrintWriter.java index 01633c3..0a076b9 100644 --- a/src/main/groovy/io/GroovyPrintWriter.java +++ b/src/main/groovy/io/GroovyPrintWriter.java @@ -18,14 +18,14 @@ */ package groovy.io; +import org.codehaus.groovy.runtime.InvokerHelper; + import java.io.File; +import java.io.FileNotFoundException; import java.io.OutputStream; import java.io.PrintWriter; -import java.io.Writer; -import java.io.FileNotFoundException; import java.io.UnsupportedEncodingException; - -import org.codehaus.groovy.runtime.InvokerHelper; +import java.io.Writer; /** * A PrintWriter that outputs objects in Groovy style. http://git-wip-us.apache.org/repos/asf/groovy/blob/4526cc0d/src/main/groovy/io/PlatformLineWriter.java ---------------------------------------------------------------------- diff --git a/src/main/groovy/io/PlatformLineWriter.java b/src/main/groovy/io/PlatformLineWriter.java index cde9558..0071e0f 100644 --- a/src/main/groovy/io/PlatformLineWriter.java +++ b/src/main/groovy/io/PlatformLineWriter.java @@ -19,8 +19,8 @@ package groovy.io; import java.io.BufferedWriter; -import java.io.Writer; import java.io.IOException; +import java.io.Writer; /** * A buffered writer that gobbles any \r characters http://git-wip-us.apache.org/repos/asf/groovy/blob/4526cc0d/src/main/groovy/lang/BenchmarkInterceptor.java ---------------------------------------------------------------------- diff --git a/src/main/groovy/lang/BenchmarkInterceptor.java b/src/main/groovy/lang/BenchmarkInterceptor.java index 90180b3..b460a9a 100644 --- a/src/main/groovy/lang/BenchmarkInterceptor.java +++ b/src/main/groovy/lang/BenchmarkInterceptor.java @@ -18,7 +18,12 @@ */ package groovy.lang; -import java.util.*; +import java.util.HashMap; +import java.util.Iterator; +import java.util.LinkedHashMap; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; /** * Interceptor that registers the timestamp of each method call http://git-wip-us.apache.org/repos/asf/groovy/blob/4526cc0d/src/main/groovy/lang/Closure.java ---------------------------------------------------------------------- diff --git a/src/main/groovy/lang/Closure.java b/src/main/groovy/lang/Closure.java index 9e3d432..99d2ea9 100644 --- a/src/main/groovy/lang/Closure.java +++ b/src/main/groovy/lang/Closure.java @@ -21,7 +21,10 @@ package groovy.lang; import org.apache.groovy.internal.util.UncheckedThrow; import org.codehaus.groovy.reflection.ReflectionCache; import org.codehaus.groovy.reflection.stdclasses.CachedClosureClass; -import org.codehaus.groovy.runtime.*; +import org.codehaus.groovy.runtime.ComposedClosure; +import org.codehaus.groovy.runtime.CurriedClosure; +import org.codehaus.groovy.runtime.InvokerHelper; +import org.codehaus.groovy.runtime.InvokerInvocationException; import org.codehaus.groovy.runtime.callsite.BooleanClosureWrapper; import org.codehaus.groovy.runtime.memoize.LRUCache; import org.codehaus.groovy.runtime.memoize.Memoize; http://git-wip-us.apache.org/repos/asf/groovy/blob/4526cc0d/src/main/groovy/lang/ExpandoMetaClass.java ---------------------------------------------------------------------- diff --git a/src/main/groovy/lang/ExpandoMetaClass.java b/src/main/groovy/lang/ExpandoMetaClass.java index 08e99c9..bfb5210 100644 --- a/src/main/groovy/lang/ExpandoMetaClass.java +++ b/src/main/groovy/lang/ExpandoMetaClass.java @@ -18,22 +18,6 @@ */ package groovy.lang; -import java.lang.reflect.Constructor; -import java.lang.reflect.Method; -import java.lang.reflect.Modifier; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.HashSet; -import java.util.Iterator; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.locks.Lock; -import java.util.concurrent.locks.ReentrantReadWriteLock; - import org.codehaus.groovy.reflection.CachedClass; import org.codehaus.groovy.reflection.MixinInMetaClass; import org.codehaus.groovy.runtime.DefaultCachedMethodKey; @@ -56,6 +40,22 @@ import org.codehaus.groovy.runtime.metaclass.OwnedMetaClass; import org.codehaus.groovy.runtime.metaclass.ThreadManagedMetaBeanProperty; import org.codehaus.groovy.util.FastArray; +import java.lang.reflect.Constructor; +import java.lang.reflect.Method; +import java.lang.reflect.Modifier; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.HashSet; +import java.util.Iterator; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.locks.Lock; +import java.util.concurrent.locks.ReentrantReadWriteLock; + /** * ExpandoMetaClass is a MetaClass that behaves like an Expando, allowing the addition or replacement * of methods, properties and constructors on the fly. http://git-wip-us.apache.org/repos/asf/groovy/blob/4526cc0d/src/main/groovy/lang/GString.java ---------------------------------------------------------------------- diff --git a/src/main/groovy/lang/GString.java b/src/main/groovy/lang/GString.java index d18d994..6468f95 100644 --- a/src/main/groovy/lang/GString.java +++ b/src/main/groovy/lang/GString.java @@ -25,8 +25,8 @@ import org.codehaus.groovy.runtime.StringGroovyMethods; import java.io.IOException; import java.io.Serializable; import java.io.StringWriter; -import java.io.Writer; import java.io.UnsupportedEncodingException; +import java.io.Writer; import java.util.ArrayList; import java.util.Arrays; import java.util.List; http://git-wip-us.apache.org/repos/asf/groovy/blob/4526cc0d/src/main/groovy/lang/Grab.java ---------------------------------------------------------------------- diff --git a/src/main/groovy/lang/Grab.java b/src/main/groovy/lang/Grab.java index 54bceb0..2d789e6 100644 --- a/src/main/groovy/lang/Grab.java +++ b/src/main/groovy/lang/Grab.java @@ -18,10 +18,10 @@ */ package groovy.lang; +import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import java.lang.annotation.ElementType; /** * Used to grab the referenced artifact and its dependencies and make it available on the Classpath. http://git-wip-us.apache.org/repos/asf/groovy/blob/4526cc0d/src/main/groovy/lang/GrabResolver.java ---------------------------------------------------------------------- diff --git a/src/main/groovy/lang/GrabResolver.java b/src/main/groovy/lang/GrabResolver.java index 2a16aed..6512cb3 100644 --- a/src/main/groovy/lang/GrabResolver.java +++ b/src/main/groovy/lang/GrabResolver.java @@ -18,10 +18,10 @@ */ package groovy.lang; +import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import java.lang.annotation.ElementType; /** * Used to add a repository for resolving Grape dependencies. http://git-wip-us.apache.org/repos/asf/groovy/blob/4526cc0d/src/main/groovy/lang/GroovyClassLoader.java ---------------------------------------------------------------------- diff --git a/src/main/groovy/lang/GroovyClassLoader.java b/src/main/groovy/lang/GroovyClassLoader.java index 394627b..b201fb9 100644 --- a/src/main/groovy/lang/GroovyClassLoader.java +++ b/src/main/groovy/lang/GroovyClassLoader.java @@ -33,17 +33,42 @@ import org.codehaus.groovy.ast.ModuleNode; import org.codehaus.groovy.ast.expr.ConstantExpression; import org.codehaus.groovy.classgen.GeneratorContext; import org.codehaus.groovy.classgen.Verifier; -import org.codehaus.groovy.control.*; -import org.codehaus.groovy.runtime.InvokerHelper; +import org.codehaus.groovy.control.BytecodeProcessor; +import org.codehaus.groovy.control.CompilationFailedException; +import org.codehaus.groovy.control.CompilationUnit; +import org.codehaus.groovy.control.CompilePhase; +import org.codehaus.groovy.control.CompilerConfiguration; +import org.codehaus.groovy.control.Phases; +import org.codehaus.groovy.control.SourceUnit; import org.codehaus.groovy.runtime.IOGroovyMethods; +import org.codehaus.groovy.runtime.InvokerHelper; import org.objectweb.asm.ClassVisitor; import org.objectweb.asm.ClassWriter; import org.objectweb.asm.Opcodes; -import java.io.*; -import java.net.*; -import java.security.*; -import java.util.*; +import java.io.File; +import java.io.IOException; +import java.io.InputStream; +import java.io.UnsupportedEncodingException; +import java.net.MalformedURLException; +import java.net.URI; +import java.net.URISyntaxException; +import java.net.URL; +import java.net.URLClassLoader; +import java.net.URLConnection; +import java.net.URLDecoder; +import java.security.AccessController; +import java.security.CodeSource; +import java.security.Permission; +import java.security.PermissionCollection; +import java.security.Permissions; +import java.security.PrivilegedAction; +import java.security.ProtectionDomain; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Enumeration; +import java.util.HashMap; +import java.util.Map; /** * A ClassLoader which can load Groovy classes. The loaded classes are cached, http://git-wip-us.apache.org/repos/asf/groovy/blob/4526cc0d/src/main/groovy/lang/GroovyCodeSource.java ---------------------------------------------------------------------- diff --git a/src/main/groovy/lang/GroovyCodeSource.java b/src/main/groovy/lang/GroovyCodeSource.java index 4c5c57b..0201abe 100644 --- a/src/main/groovy/lang/GroovyCodeSource.java +++ b/src/main/groovy/lang/GroovyCodeSource.java @@ -20,6 +20,8 @@ package groovy.lang; import groovy.security.GroovyCodeSourcePermission; import groovy.util.CharsetToolkit; +import org.codehaus.groovy.runtime.IOGroovyMethods; +import org.codehaus.groovy.runtime.ResourceGroovyMethods; import java.io.File; import java.io.FileNotFoundException; @@ -35,9 +37,6 @@ import java.security.PrivilegedActionException; import java.security.PrivilegedExceptionAction; import java.security.cert.Certificate; -import org.codehaus.groovy.runtime.IOGroovyMethods; -import org.codehaus.groovy.runtime.ResourceGroovyMethods; - /** * CodeSource wrapper class that allows specific security policies to be associated with a class * compiled from groovy source. http://git-wip-us.apache.org/repos/asf/groovy/blob/4526cc0d/src/main/groovy/lang/GroovyResourceLoader.java ---------------------------------------------------------------------- diff --git a/src/main/groovy/lang/GroovyResourceLoader.java b/src/main/groovy/lang/GroovyResourceLoader.java index 49d0268..7abe202 100644 --- a/src/main/groovy/lang/GroovyResourceLoader.java +++ b/src/main/groovy/lang/GroovyResourceLoader.java @@ -18,8 +18,8 @@ */ package groovy.lang; -import java.net.URL; import java.net.MalformedURLException; +import java.net.URL; /** * Allows frameworks that integrate with Groovy to determine how Groovy files are resolved. http://git-wip-us.apache.org/repos/asf/groovy/blob/4526cc0d/src/main/groovy/lang/GroovyShell.java ---------------------------------------------------------------------- diff --git a/src/main/groovy/lang/GroovyShell.java b/src/main/groovy/lang/GroovyShell.java index 78eac63..b169e59 100644 --- a/src/main/groovy/lang/GroovyShell.java +++ b/src/main/groovy/lang/GroovyShell.java @@ -18,9 +18,8 @@ */ package groovy.lang; -import groovy.ui.GroovyMain; import groovy.security.GroovyCodeSourcePermission; - +import groovy.ui.GroovyMain; import org.apache.groovy.plugin.GroovyRunner; import org.apache.groovy.plugin.GroovyRunnerRegistry; import org.codehaus.groovy.control.CompilationFailedException; @@ -28,7 +27,9 @@ import org.codehaus.groovy.control.CompilerConfiguration; import org.codehaus.groovy.runtime.InvokerHelper; import org.codehaus.groovy.runtime.InvokerInvocationException; -import java.io.*; +import java.io.File; +import java.io.IOException; +import java.io.Reader; import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; import java.net.URI; http://git-wip-us.apache.org/repos/asf/groovy/blob/4526cc0d/src/main/groovy/lang/MetaClassImpl.java ---------------------------------------------------------------------- diff --git a/src/main/groovy/lang/MetaClassImpl.java b/src/main/groovy/lang/MetaClassImpl.java index 964fe6a..f76a0b2 100644 --- a/src/main/groovy/lang/MetaClassImpl.java +++ b/src/main/groovy/lang/MetaClassImpl.java @@ -24,13 +24,51 @@ import org.codehaus.groovy.ast.ClassNode; import org.codehaus.groovy.classgen.asm.BytecodeHelper; import org.codehaus.groovy.control.CompilationUnit; import org.codehaus.groovy.control.Phases; -import org.codehaus.groovy.reflection.*; +import org.codehaus.groovy.reflection.CacheAccessControlException; +import org.codehaus.groovy.reflection.CachedClass; +import org.codehaus.groovy.reflection.CachedConstructor; +import org.codehaus.groovy.reflection.CachedField; +import org.codehaus.groovy.reflection.CachedMethod; +import org.codehaus.groovy.reflection.ClassInfo; +import org.codehaus.groovy.reflection.GeneratedMetaMethod; +import org.codehaus.groovy.reflection.ParameterTypes; +import org.codehaus.groovy.reflection.ReflectionCache; import org.codehaus.groovy.reflection.android.AndroidSupport; -import org.codehaus.groovy.runtime.*; -import org.codehaus.groovy.runtime.callsite.*; -import org.codehaus.groovy.runtime.metaclass.*; +import org.codehaus.groovy.runtime.ArrayTypeUtils; +import org.codehaus.groovy.runtime.ConvertedClosure; +import org.codehaus.groovy.runtime.CurriedClosure; +import org.codehaus.groovy.runtime.DefaultGroovyMethods; +import org.codehaus.groovy.runtime.GeneratedClosure; +import org.codehaus.groovy.runtime.GroovyCategorySupport; +import org.codehaus.groovy.runtime.InvokerHelper; +import org.codehaus.groovy.runtime.InvokerInvocationException; +import org.codehaus.groovy.runtime.MetaClassHelper; +import org.codehaus.groovy.runtime.MethodClosure; +import org.codehaus.groovy.runtime.callsite.AbstractCallSite; +import org.codehaus.groovy.runtime.callsite.CallSite; +import org.codehaus.groovy.runtime.callsite.ConstructorSite; +import org.codehaus.groovy.runtime.callsite.MetaClassConstructorSite; +import org.codehaus.groovy.runtime.callsite.PogoMetaClassSite; +import org.codehaus.groovy.runtime.callsite.PogoMetaMethodSite; +import org.codehaus.groovy.runtime.callsite.PojoMetaClassSite; +import org.codehaus.groovy.runtime.callsite.PojoMetaMethodSite; +import org.codehaus.groovy.runtime.callsite.StaticMetaClassSite; +import org.codehaus.groovy.runtime.callsite.StaticMetaMethodSite; +import org.codehaus.groovy.runtime.metaclass.ClosureMetaMethod; +import org.codehaus.groovy.runtime.metaclass.MetaClassRegistryImpl; +import org.codehaus.groovy.runtime.metaclass.MetaMethodIndex; import org.codehaus.groovy.runtime.metaclass.MethodMetaProperty.GetBeanMethodMetaProperty; import org.codehaus.groovy.runtime.metaclass.MethodMetaProperty.GetMethodMetaProperty; +import org.codehaus.groovy.runtime.metaclass.MethodSelectionException; +import org.codehaus.groovy.runtime.metaclass.MissingMethodExceptionNoStack; +import org.codehaus.groovy.runtime.metaclass.MissingMethodExecutionFailed; +import org.codehaus.groovy.runtime.metaclass.MissingPropertyExceptionNoStack; +import org.codehaus.groovy.runtime.metaclass.MixinInstanceMetaMethod; +import org.codehaus.groovy.runtime.metaclass.MultipleSetterProperty; +import org.codehaus.groovy.runtime.metaclass.NewInstanceMetaMethod; +import org.codehaus.groovy.runtime.metaclass.NewMetaMethod; +import org.codehaus.groovy.runtime.metaclass.NewStaticMetaMethod; +import org.codehaus.groovy.runtime.metaclass.TransformMetaMethod; import org.codehaus.groovy.runtime.typehandling.DefaultTypeTransformation; import org.codehaus.groovy.runtime.typehandling.NumberMathModificationInfo; import org.codehaus.groovy.runtime.wrappers.Wrapper; @@ -39,13 +77,33 @@ import org.codehaus.groovy.util.FastArray; import org.codehaus.groovy.util.SingleKeyHashMap; import org.objectweb.asm.ClassVisitor; -import java.beans.*; -import java.lang.reflect.*; +import java.beans.BeanInfo; +import java.beans.EventSetDescriptor; +import java.beans.IntrospectionException; +import java.beans.Introspector; +import java.beans.PropertyDescriptor; +import java.lang.reflect.Array; +import java.lang.reflect.Constructor; +import java.lang.reflect.Method; +import java.lang.reflect.Modifier; +import java.lang.reflect.Proxy; import java.net.URL; import java.security.AccessController; import java.security.PrivilegedActionException; import java.security.PrivilegedExceptionAction; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.Comparator; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.LinkedHashSet; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; http://git-wip-us.apache.org/repos/asf/groovy/blob/4526cc0d/src/main/groovy/lang/MetaProperty.java ---------------------------------------------------------------------- diff --git a/src/main/groovy/lang/MetaProperty.java b/src/main/groovy/lang/MetaProperty.java index 6cd0164..d3c9633 100644 --- a/src/main/groovy/lang/MetaProperty.java +++ b/src/main/groovy/lang/MetaProperty.java @@ -18,10 +18,10 @@ */ package groovy.lang; -import java.lang.reflect.Modifier; - import org.codehaus.groovy.runtime.MetaClassHelper; +import java.lang.reflect.Modifier; + /** * Represents a property on a bean which may have a getter and/or a setter * http://git-wip-us.apache.org/repos/asf/groovy/blob/4526cc0d/src/main/groovy/lang/NumberRange.java ---------------------------------------------------------------------- diff --git a/src/main/groovy/lang/NumberRange.java b/src/main/groovy/lang/NumberRange.java index 52ef856..3028e24 100644 --- a/src/main/groovy/lang/NumberRange.java +++ b/src/main/groovy/lang/NumberRange.java @@ -29,13 +29,7 @@ import java.util.Iterator; import java.util.List; import java.util.NoSuchElementException; -import static org.codehaus.groovy.runtime.ScriptBytecodeAdapter.compareEqual; -import static org.codehaus.groovy.runtime.ScriptBytecodeAdapter.compareGreaterThan; -import static org.codehaus.groovy.runtime.ScriptBytecodeAdapter.compareGreaterThanEqual; -import static org.codehaus.groovy.runtime.ScriptBytecodeAdapter.compareLessThan; -import static org.codehaus.groovy.runtime.ScriptBytecodeAdapter.compareLessThanEqual; -import static org.codehaus.groovy.runtime.ScriptBytecodeAdapter.compareNotEqual; -import static org.codehaus.groovy.runtime.ScriptBytecodeAdapter.compareTo; +import static org.codehaus.groovy.runtime.ScriptBytecodeAdapter.*; import static org.codehaus.groovy.runtime.dgmimpl.NumberNumberMinus.minus; import static org.codehaus.groovy.runtime.dgmimpl.NumberNumberMultiply.multiply; import static org.codehaus.groovy.runtime.dgmimpl.NumberNumberPlus.plus; http://git-wip-us.apache.org/repos/asf/groovy/blob/4526cc0d/src/main/groovy/lang/Sequence.java ---------------------------------------------------------------------- diff --git a/src/main/groovy/lang/Sequence.java b/src/main/groovy/lang/Sequence.java index f546fae..2b4316c 100644 --- a/src/main/groovy/lang/Sequence.java +++ b/src/main/groovy/lang/Sequence.java @@ -18,14 +18,14 @@ */ package groovy.lang; +import org.codehaus.groovy.runtime.InvokerHelper; +import org.codehaus.groovy.runtime.typehandling.DefaultTypeTransformation; + import java.util.ArrayList; import java.util.Collection; import java.util.Iterator; import java.util.List; -import org.codehaus.groovy.runtime.InvokerHelper; -import org.codehaus.groovy.runtime.typehandling.DefaultTypeTransformation; - /** * Represents a sequence of objects which represents zero or many instances of * of objects of a given type. The type can be omitted in which case any type of http://git-wip-us.apache.org/repos/asf/groovy/blob/4526cc0d/src/main/groovy/lang/SpreadMap.java ---------------------------------------------------------------------- diff --git a/src/main/groovy/lang/SpreadMap.java b/src/main/groovy/lang/SpreadMap.java index c6ba18b..7ba9e4f 100644 --- a/src/main/groovy/lang/SpreadMap.java +++ b/src/main/groovy/lang/SpreadMap.java @@ -18,12 +18,12 @@ */ package groovy.lang; +import org.codehaus.groovy.runtime.typehandling.DefaultTypeTransformation; + import java.util.HashMap; +import java.util.Iterator; import java.util.List; import java.util.Map; -import java.util.Iterator; - -import org.codehaus.groovy.runtime.typehandling.DefaultTypeTransformation; /** * Helper to turn a list with an even number of elements into a Map. http://git-wip-us.apache.org/repos/asf/groovy/blob/4526cc0d/src/main/groovy/transform/CompileStatic.java ---------------------------------------------------------------------- diff --git a/src/main/groovy/transform/CompileStatic.java b/src/main/groovy/transform/CompileStatic.java index 3b7c511..16dbc33 100644 --- a/src/main/groovy/transform/CompileStatic.java +++ b/src/main/groovy/transform/CompileStatic.java @@ -20,7 +20,11 @@ package groovy.transform; import org.codehaus.groovy.transform.GroovyASTTransformationClass; -import java.lang.annotation.*; +import java.lang.annotation.Documented; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; /** * This will let the Groovy compiler use compile time checks in the style of Java http://git-wip-us.apache.org/repos/asf/groovy/blob/4526cc0d/src/main/groovy/transform/ConditionalInterrupt.groovy ---------------------------------------------------------------------- diff --git a/src/main/groovy/transform/ConditionalInterrupt.groovy b/src/main/groovy/transform/ConditionalInterrupt.groovy index bc9c2b4..66aa64c 100644 --- a/src/main/groovy/transform/ConditionalInterrupt.groovy +++ b/src/main/groovy/transform/ConditionalInterrupt.groovy @@ -18,11 +18,12 @@ */ package groovy.transform +import org.codehaus.groovy.transform.GroovyASTTransformationClass + import java.lang.annotation.ElementType import java.lang.annotation.Retention import java.lang.annotation.RetentionPolicy import java.lang.annotation.Target -import org.codehaus.groovy.transform.GroovyASTTransformationClass /** * Allows "interrupt-safe" executions of scripts by adding a custom check for interruption http://git-wip-us.apache.org/repos/asf/groovy/blob/4526cc0d/src/main/groovy/transform/Memoized.java ---------------------------------------------------------------------- diff --git a/src/main/groovy/transform/Memoized.java b/src/main/groovy/transform/Memoized.java index 9e1409d..efecb17 100644 --- a/src/main/groovy/transform/Memoized.java +++ b/src/main/groovy/transform/Memoized.java @@ -18,13 +18,13 @@ */ package groovy.transform; +import org.codehaus.groovy.transform.GroovyASTTransformationClass; + import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import org.codehaus.groovy.transform.GroovyASTTransformationClass; - /** * Method annotation that creates a cache for the results of the execution of the annotated method. Whenever the method * is called, the mapping between the parameters and the return value is preserved in a cache making subsequent calls with http://git-wip-us.apache.org/repos/asf/groovy/blob/4526cc0d/src/main/groovy/transform/Sortable.java ---------------------------------------------------------------------- diff --git a/src/main/groovy/transform/Sortable.java b/src/main/groovy/transform/Sortable.java index b27013d..b235bfa 100644 --- a/src/main/groovy/transform/Sortable.java +++ b/src/main/groovy/transform/Sortable.java @@ -18,12 +18,12 @@ */ package groovy.transform; +import org.codehaus.groovy.transform.GroovyASTTransformationClass; + +import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import java.lang.annotation.ElementType; - -import org.codehaus.groovy.transform.GroovyASTTransformationClass; /** * A class annotation used to make a class Comparable by multiple Comparators. http://git-wip-us.apache.org/repos/asf/groovy/blob/4526cc0d/src/main/groovy/transform/ThreadInterrupt.groovy ---------------------------------------------------------------------- diff --git a/src/main/groovy/transform/ThreadInterrupt.groovy b/src/main/groovy/transform/ThreadInterrupt.groovy index 30a4365..d8a6f64 100644 --- a/src/main/groovy/transform/ThreadInterrupt.groovy +++ b/src/main/groovy/transform/ThreadInterrupt.groovy @@ -18,13 +18,10 @@ */ package groovy.transform -import java.lang.annotation.Documented -import java.lang.annotation.ElementType -import java.lang.annotation.Retention -import java.lang.annotation.RetentionPolicy -import java.lang.annotation.Target import org.codehaus.groovy.transform.GroovyASTTransformationClass +import java.lang.annotation.* + /** * Allows "interrupt-safe" executions of scripts by adding Thread.currentThread().isInterrupted() * checks into loops (for, while) and at the start of closures and methods. http://git-wip-us.apache.org/repos/asf/groovy/blob/4526cc0d/src/main/groovy/transform/TimedInterrupt.groovy ---------------------------------------------------------------------- diff --git a/src/main/groovy/transform/TimedInterrupt.groovy b/src/main/groovy/transform/TimedInterrupt.groovy index aa19048..3f1097c 100644 --- a/src/main/groovy/transform/TimedInterrupt.groovy +++ b/src/main/groovy/transform/TimedInterrupt.groovy @@ -18,14 +18,11 @@ */ package groovy.transform -import java.lang.annotation.Documented -import java.lang.annotation.ElementType -import java.lang.annotation.Retention -import java.lang.annotation.RetentionPolicy -import java.lang.annotation.Target +import org.codehaus.groovy.transform.GroovyASTTransformationClass + +import java.lang.annotation.* import java.util.concurrent.TimeUnit import java.util.concurrent.TimeoutException -import org.codehaus.groovy.transform.GroovyASTTransformationClass /** * Allows safe timed executions of scripts by adding elapsed time checks into loops (for, while) http://git-wip-us.apache.org/repos/asf/groovy/blob/4526cc0d/src/main/groovy/transform/TypeChecked.java ---------------------------------------------------------------------- diff --git a/src/main/groovy/transform/TypeChecked.java b/src/main/groovy/transform/TypeChecked.java index fe32564..b902f3f 100644 --- a/src/main/groovy/transform/TypeChecked.java +++ b/src/main/groovy/transform/TypeChecked.java @@ -18,10 +18,13 @@ */ package groovy.transform; -import java.lang.annotation.*; - import org.codehaus.groovy.transform.GroovyASTTransformationClass; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + /** * This will let the Groovy compiler use compile time checks in the style of Java. * @author <a href="mailto:[email protected]";>Jochen "blackdrag" Theodorou</a> http://git-wip-us.apache.org/repos/asf/groovy/blob/4526cc0d/src/main/groovy/transform/builder/Builder.java ---------------------------------------------------------------------- diff --git a/src/main/groovy/transform/builder/Builder.java b/src/main/groovy/transform/builder/Builder.java index 8293f1f..93b6090 100644 --- a/src/main/groovy/transform/builder/Builder.java +++ b/src/main/groovy/transform/builder/Builder.java @@ -18,14 +18,14 @@ */ package groovy.transform.builder; +import groovy.transform.Undefined; +import org.codehaus.groovy.transform.GroovyASTTransformationClass; + +import java.lang.annotation.Documented; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import java.lang.annotation.Documented; - -import groovy.transform.Undefined; -import org.codehaus.groovy.transform.GroovyASTTransformationClass; import static org.codehaus.groovy.transform.BuilderASTTransformation.BuilderStrategy; http://git-wip-us.apache.org/repos/asf/groovy/blob/4526cc0d/src/main/groovy/transform/builder/DefaultStrategy.java ---------------------------------------------------------------------- diff --git a/src/main/groovy/transform/builder/DefaultStrategy.java b/src/main/groovy/transform/builder/DefaultStrategy.java index c1f1ca6..51cfdc4 100644 --- a/src/main/groovy/transform/builder/DefaultStrategy.java +++ b/src/main/groovy/transform/builder/DefaultStrategy.java @@ -36,29 +36,12 @@ import java.util.List; import java.util.Map; import static org.codehaus.groovy.ast.ClassHelper.OBJECT_TYPE; -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.block; -import static org.codehaus.groovy.ast.tools.GeneralUtils.callX; -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.declS; -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.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.GenericsUtils.newClass; +import static org.codehaus.groovy.ast.tools.GeneralUtils.*; +import static org.codehaus.groovy.ast.tools.GenericsUtils.*; import static org.codehaus.groovy.transform.AbstractASTTransformation.getMemberStringValue; import static org.codehaus.groovy.transform.BuilderASTTransformation.NO_EXCEPTIONS; import static org.codehaus.groovy.transform.BuilderASTTransformation.NO_PARAMS; -import static org.objectweb.asm.Opcodes.ACC_PRIVATE; -import static org.objectweb.asm.Opcodes.ACC_PUBLIC; -import static org.objectweb.asm.Opcodes.ACC_STATIC; +import static org.objectweb.asm.Opcodes.*; /** * This strategy is used with the {@link Builder} AST transform to create a builder helper class http://git-wip-us.apache.org/repos/asf/groovy/blob/4526cc0d/src/main/groovy/transform/builder/ExternalStrategy.java ---------------------------------------------------------------------- diff --git a/src/main/groovy/transform/builder/ExternalStrategy.java b/src/main/groovy/transform/builder/ExternalStrategy.java index 29b6971..32f50a5 100644 --- a/src/main/groovy/transform/builder/ExternalStrategy.java +++ b/src/main/groovy/transform/builder/ExternalStrategy.java @@ -31,24 +31,11 @@ import org.codehaus.groovy.transform.BuilderASTTransformation; import java.util.ArrayList; import java.util.List; -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.constX; -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.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.*; import static org.codehaus.groovy.ast.tools.GenericsUtils.newClass; -import static org.codehaus.groovy.transform.AbstractASTTransformation.shouldSkip; -import static org.codehaus.groovy.transform.BuilderASTTransformation.MY_TYPE_NAME; -import static org.codehaus.groovy.transform.BuilderASTTransformation.NO_EXCEPTIONS; -import static org.codehaus.groovy.transform.BuilderASTTransformation.NO_PARAMS; -import static org.objectweb.asm.Opcodes.ACC_PUBLIC; +import static org.codehaus.groovy.transform.BuilderASTTransformation.*; import static org.objectweb.asm.Opcodes.ACC_PRIVATE; +import static org.objectweb.asm.Opcodes.ACC_PUBLIC; /** * This strategy is used with the {@link Builder} AST transform to populate a builder helper class http://git-wip-us.apache.org/repos/asf/groovy/blob/4526cc0d/src/main/groovy/transform/builder/InitializerStrategy.java ---------------------------------------------------------------------- diff --git a/src/main/groovy/transform/builder/InitializerStrategy.java b/src/main/groovy/transform/builder/InitializerStrategy.java index 4e0dd82..9086b97 100644 --- a/src/main/groovy/transform/builder/InitializerStrategy.java +++ b/src/main/groovy/transform/builder/InitializerStrategy.java @@ -41,32 +41,12 @@ import java.util.List; import java.util.Map; import static org.codehaus.groovy.ast.ClassHelper.OBJECT_TYPE; -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.block; -import static org.codehaus.groovy.ast.tools.GeneralUtils.callX; -import static org.codehaus.groovy.ast.tools.GeneralUtils.callThisX; -import static org.codehaus.groovy.ast.tools.GeneralUtils.constX; -import static org.codehaus.groovy.ast.tools.GeneralUtils.ctorSuperS; -import static org.codehaus.groovy.ast.tools.GeneralUtils.ctorThisS; -import static org.codehaus.groovy.ast.tools.GeneralUtils.ctorX; -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.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.GenericsUtils.makeClassSafeWithGenerics; +import static org.codehaus.groovy.ast.tools.GeneralUtils.*; +import static org.codehaus.groovy.ast.tools.GenericsUtils.*; import static org.codehaus.groovy.transform.AbstractASTTransformation.getMemberStringValue; import static org.codehaus.groovy.transform.BuilderASTTransformation.NO_EXCEPTIONS; import static org.codehaus.groovy.transform.BuilderASTTransformation.NO_PARAMS; -import static org.objectweb.asm.Opcodes.ACC_PRIVATE; -import static org.objectweb.asm.Opcodes.ACC_PUBLIC; -import static org.objectweb.asm.Opcodes.ACC_STATIC; -import static org.objectweb.asm.Opcodes.ACC_SYNTHETIC; +import static org.objectweb.asm.Opcodes.*; /** * This strategy is used with the {@link Builder} AST transform to create a builder helper class http://git-wip-us.apache.org/repos/asf/groovy/blob/4526cc0d/src/main/groovy/transform/builder/SimpleStrategy.java ---------------------------------------------------------------------- diff --git a/src/main/groovy/transform/builder/SimpleStrategy.java b/src/main/groovy/transform/builder/SimpleStrategy.java index 7956ac6..04a33bf 100644 --- a/src/main/groovy/transform/builder/SimpleStrategy.java +++ b/src/main/groovy/transform/builder/SimpleStrategy.java @@ -31,16 +31,7 @@ import org.objectweb.asm.Opcodes; import java.util.ArrayList; import java.util.List; -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.fieldX; -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.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; import static org.codehaus.groovy.transform.AbstractASTTransformation.getMemberStringValue; import static org.codehaus.groovy.transform.BuilderASTTransformation.NO_EXCEPTIONS; http://git-wip-us.apache.org/repos/asf/groovy/blob/4526cc0d/src/main/groovy/ui/GroovyMain.java ---------------------------------------------------------------------- diff --git a/src/main/groovy/ui/GroovyMain.java b/src/main/groovy/ui/GroovyMain.java index db1efed..a4d5986 100644 --- a/src/main/groovy/ui/GroovyMain.java +++ b/src/main/groovy/ui/GroovyMain.java @@ -40,15 +40,23 @@ import org.codehaus.groovy.runtime.ResourceGroovyMethods; import org.codehaus.groovy.runtime.StackTraceUtils; import org.codehaus.groovy.runtime.StringGroovyMethods; -import java.io.*; +import java.io.BufferedReader; +import java.io.File; +import java.io.FileNotFoundException; +import java.io.FileReader; +import java.io.FileWriter; +import java.io.IOException; +import java.io.InputStreamReader; +import java.io.PrintStream; +import java.io.PrintWriter; import java.math.BigInteger; import java.net.URI; import java.net.URISyntaxException; import java.net.URL; import java.security.AccessController; import java.security.PrivilegedAction; -import java.util.Enumeration; import java.util.ArrayList; +import java.util.Enumeration; import java.util.Iterator; import java.util.List; import java.util.Properties; http://git-wip-us.apache.org/repos/asf/groovy/blob/4526cc0d/src/main/groovy/util/CharsetToolkit.java ---------------------------------------------------------------------- diff --git a/src/main/groovy/util/CharsetToolkit.java b/src/main/groovy/util/CharsetToolkit.java index ad641f2..e127459 100644 --- a/src/main/groovy/util/CharsetToolkit.java +++ b/src/main/groovy/util/CharsetToolkit.java @@ -18,7 +18,14 @@ */ package groovy.util; -import java.io.*; +import java.io.BufferedReader; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.io.LineNumberReader; import java.nio.charset.Charset; import java.util.Collection; http://git-wip-us.apache.org/repos/asf/groovy/blob/4526cc0d/src/main/groovy/util/CliBuilder.groovy ---------------------------------------------------------------------- diff --git a/src/main/groovy/util/CliBuilder.groovy b/src/main/groovy/util/CliBuilder.groovy index bc7d44a..bb21520 100644 --- a/src/main/groovy/util/CliBuilder.groovy +++ b/src/main/groovy/util/CliBuilder.groovy @@ -23,14 +23,8 @@ import groovy.cli.Option import groovy.cli.TypedOption import groovy.cli.Unparsed import groovy.transform.Undefined -import org.apache.commons.cli.CommandLine -import org.apache.commons.cli.CommandLineParser -import org.apache.commons.cli.DefaultParser -import org.apache.commons.cli.GnuParser -import org.apache.commons.cli.HelpFormatter +import org.apache.commons.cli.* import org.apache.commons.cli.Option as CliOption -import org.apache.commons.cli.Options -import org.apache.commons.cli.ParseException import org.codehaus.groovy.runtime.InvokerHelper import org.codehaus.groovy.runtime.MetaClassHelper import org.codehaus.groovy.runtime.StringGroovyMethods http://git-wip-us.apache.org/repos/asf/groovy/blob/4526cc0d/src/main/groovy/util/ClosureComparator.java ---------------------------------------------------------------------- diff --git a/src/main/groovy/util/ClosureComparator.java b/src/main/groovy/util/ClosureComparator.java index 7ae29e1..24d03f3 100644 --- a/src/main/groovy/util/ClosureComparator.java +++ b/src/main/groovy/util/ClosureComparator.java @@ -19,9 +19,10 @@ package groovy.util; import groovy.lang.Closure; -import java.util.Comparator; import org.codehaus.groovy.runtime.typehandling.DefaultTypeTransformation; +import java.util.Comparator; + /** * A Comparator which uses a closure to compare 2 values being equal * http://git-wip-us.apache.org/repos/asf/groovy/blob/4526cc0d/src/main/groovy/util/ConfigObject.java ---------------------------------------------------------------------- diff --git a/src/main/groovy/util/ConfigObject.java b/src/main/groovy/util/ConfigObject.java index 6308d74..c76bc97 100644 --- a/src/main/groovy/util/ConfigObject.java +++ b/src/main/groovy/util/ConfigObject.java @@ -31,7 +31,12 @@ import java.io.IOException; import java.io.StringWriter; import java.io.Writer; import java.net.URL; -import java.util.*; +import java.util.Collection; +import java.util.HashMap; +import java.util.LinkedHashMap; +import java.util.Map; +import java.util.Properties; +import java.util.Set; /** * A ConfigObject at a simple level is a Map that creates configuration entries (other ConfigObjects) when referencing them. http://git-wip-us.apache.org/repos/asf/groovy/blob/4526cc0d/src/main/groovy/util/Eval.java ---------------------------------------------------------------------- diff --git a/src/main/groovy/util/Eval.java b/src/main/groovy/util/Eval.java index 0330108..87f9295 100644 --- a/src/main/groovy/util/Eval.java +++ b/src/main/groovy/util/Eval.java @@ -18,10 +18,9 @@ */ package groovy.util; -import org.codehaus.groovy.control.CompilationFailedException; - import groovy.lang.Binding; import groovy.lang.GroovyShell; +import org.codehaus.groovy.control.CompilationFailedException; /** * Allow easy integration from Groovy into Java through convenience methods. http://git-wip-us.apache.org/repos/asf/groovy/blob/4526cc0d/src/main/groovy/util/Expando.java ---------------------------------------------------------------------- diff --git a/src/main/groovy/util/Expando.java b/src/main/groovy/util/Expando.java index 46d2dde..f009551 100644 --- a/src/main/groovy/util/Expando.java +++ b/src/main/groovy/util/Expando.java @@ -24,11 +24,11 @@ import groovy.lang.GroovyRuntimeException; import groovy.lang.MetaExpandoProperty; import groovy.lang.MissingPropertyException; +import java.util.ArrayList; import java.util.HashMap; +import java.util.List; import java.util.Map; import java.util.Map.Entry; -import java.util.List; -import java.util.ArrayList; /** http://git-wip-us.apache.org/repos/asf/groovy/blob/4526cc0d/src/main/groovy/util/FactoryBuilderSupport.java ---------------------------------------------------------------------- diff --git a/src/main/groovy/util/FactoryBuilderSupport.java b/src/main/groovy/util/FactoryBuilderSupport.java index 21bd6d5..8dbcff0 100644 --- a/src/main/groovy/util/FactoryBuilderSupport.java +++ b/src/main/groovy/util/FactoryBuilderSupport.java @@ -34,7 +34,17 @@ import org.codehaus.groovy.runtime.metaclass.MissingMethodExceptionNoStack; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.lang.reflect.Modifier; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.Comparator; +import java.util.HashMap; +import java.util.LinkedHashMap; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.TreeSet; import java.util.logging.Level; import java.util.logging.Logger; http://git-wip-us.apache.org/repos/asf/groovy/blob/4526cc0d/src/main/groovy/util/GroovyCollections.java ---------------------------------------------------------------------- diff --git a/src/main/groovy/util/GroovyCollections.java b/src/main/groovy/util/GroovyCollections.java index 8a409f7..dff062d 100644 --- a/src/main/groovy/util/GroovyCollections.java +++ b/src/main/groovy/util/GroovyCollections.java @@ -18,11 +18,16 @@ */ package groovy.util; -import org.codehaus.groovy.runtime.typehandling.DefaultTypeTransformation; -import org.codehaus.groovy.runtime.ScriptBytecodeAdapter; import org.codehaus.groovy.runtime.DefaultGroovyMethods; +import org.codehaus.groovy.runtime.ScriptBytecodeAdapter; +import org.codehaus.groovy.runtime.typehandling.DefaultTypeTransformation; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.HashSet; +import java.util.List; +import java.util.Set; /** * A Collections utility class http://git-wip-us.apache.org/repos/asf/groovy/blob/4526cc0d/src/main/groovy/util/GroovyScriptEngine.java ---------------------------------------------------------------------- diff --git a/src/main/groovy/util/GroovyScriptEngine.java b/src/main/groovy/util/GroovyScriptEngine.java index 5244501..aecb27a 100644 --- a/src/main/groovy/util/GroovyScriptEngine.java +++ b/src/main/groovy/util/GroovyScriptEngine.java @@ -23,7 +23,6 @@ import groovy.lang.GroovyClassLoader; import groovy.lang.GroovyCodeSource; import groovy.lang.GroovyResourceLoader; import groovy.lang.Script; - import org.codehaus.groovy.GroovyBugError; import org.codehaus.groovy.ast.ClassNode; import org.codehaus.groovy.ast.InnerClassNode; http://git-wip-us.apache.org/repos/asf/groovy/blob/4526cc0d/src/main/groovy/util/MapEntry.java ---------------------------------------------------------------------- diff --git a/src/main/groovy/util/MapEntry.java b/src/main/groovy/util/MapEntry.java index 4bd2596..9190fcd 100644 --- a/src/main/groovy/util/MapEntry.java +++ b/src/main/groovy/util/MapEntry.java @@ -18,10 +18,10 @@ */ package groovy.util; -import java.util.Map; - import org.codehaus.groovy.runtime.typehandling.DefaultTypeTransformation; +import java.util.Map; + /** * A Map.Entry implementation. * http://git-wip-us.apache.org/repos/asf/groovy/blob/4526cc0d/src/main/groovy/util/ObjectGraphBuilder.java ---------------------------------------------------------------------- diff --git a/src/main/groovy/util/ObjectGraphBuilder.java b/src/main/groovy/util/ObjectGraphBuilder.java index 96db2ee..7ba0089 100644 --- a/src/main/groovy/util/ObjectGraphBuilder.java +++ b/src/main/groovy/util/ObjectGraphBuilder.java @@ -22,17 +22,16 @@ import groovy.lang.Closure; import groovy.lang.GString; import groovy.lang.MetaProperty; import groovy.lang.MissingPropertyException; +import org.codehaus.groovy.runtime.InvokerHelper; +import java.lang.reflect.ParameterizedType; +import java.lang.reflect.Type; +import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; -import java.util.Map; import java.util.List; -import java.util.ArrayList; +import java.util.Map; import java.util.regex.Pattern; -import java.lang.reflect.Type; -import java.lang.reflect.ParameterizedType; - -import org.codehaus.groovy.runtime.InvokerHelper; /** * A builder for creating object graphs.<br> http://git-wip-us.apache.org/repos/asf/groovy/blob/4526cc0d/src/main/groovy/util/ObservableMap.java ---------------------------------------------------------------------- diff --git a/src/main/groovy/util/ObservableMap.java b/src/main/groovy/util/ObservableMap.java index e17d1f5..43dc7a0 100644 --- a/src/main/groovy/util/ObservableMap.java +++ b/src/main/groovy/util/ObservableMap.java @@ -23,7 +23,14 @@ import groovy.lang.Closure; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import java.beans.PropertyChangeSupport; -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.HashMap; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; /** * Map decorator that will trigger PropertyChangeEvents when a value changes.<br> http://git-wip-us.apache.org/repos/asf/groovy/blob/4526cc0d/src/main/groovy/util/ObservableSet.java ---------------------------------------------------------------------- diff --git a/src/main/groovy/util/ObservableSet.java b/src/main/groovy/util/ObservableSet.java index 678fde1..b794436 100644 --- a/src/main/groovy/util/ObservableSet.java +++ b/src/main/groovy/util/ObservableSet.java @@ -23,7 +23,14 @@ import groovy.lang.Closure; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import java.beans.PropertyChangeSupport; -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Set; +import java.util.Stack; /** * Set decorator that will trigger PropertyChangeEvents when a value changes.<br> http://git-wip-us.apache.org/repos/asf/groovy/blob/4526cc0d/src/main/groovy/util/Proxy.java ---------------------------------------------------------------------- diff --git a/src/main/groovy/util/Proxy.java b/src/main/groovy/util/Proxy.java index 95601b9..ac080b3 100644 --- a/src/main/groovy/util/Proxy.java +++ b/src/main/groovy/util/Proxy.java @@ -18,12 +18,12 @@ */ package groovy.util; -import java.util.Iterator; - import groovy.lang.GroovyObjectSupport; import groovy.lang.MissingMethodException; import org.codehaus.groovy.runtime.InvokerHelper; +import java.util.Iterator; + /** * Dynamic groovy proxy for another object. All method * invocations get forwarded to actual object, unless the proxy overrides it. http://git-wip-us.apache.org/repos/asf/groovy/blob/4526cc0d/src/main/groovy/util/logging/Commons.java ---------------------------------------------------------------------- diff --git a/src/main/groovy/util/logging/Commons.java b/src/main/groovy/util/logging/Commons.java index 7b1da7d..aa456d2 100644 --- a/src/main/groovy/util/logging/Commons.java +++ b/src/main/groovy/util/logging/Commons.java @@ -21,7 +21,13 @@ package groovy.util.logging; import groovy.lang.GroovyClassLoader; import org.codehaus.groovy.ast.ClassNode; import org.codehaus.groovy.ast.FieldNode; -import org.codehaus.groovy.ast.expr.*; +import org.codehaus.groovy.ast.expr.ArgumentListExpression; +import org.codehaus.groovy.ast.expr.BooleanExpression; +import org.codehaus.groovy.ast.expr.ClassExpression; +import org.codehaus.groovy.ast.expr.ConstantExpression; +import org.codehaus.groovy.ast.expr.Expression; +import org.codehaus.groovy.ast.expr.MethodCallExpression; +import org.codehaus.groovy.ast.expr.TernaryExpression; import org.codehaus.groovy.transform.GroovyASTTransformationClass; import org.codehaus.groovy.transform.LogASTTransformation; import org.objectweb.asm.Opcodes; http://git-wip-us.apache.org/repos/asf/groovy/blob/4526cc0d/src/main/groovy/util/logging/Log.java ---------------------------------------------------------------------- diff --git a/src/main/groovy/util/logging/Log.java b/src/main/groovy/util/logging/Log.java index 39edc39..e52d39b 100644 --- a/src/main/groovy/util/logging/Log.java +++ b/src/main/groovy/util/logging/Log.java @@ -22,7 +22,14 @@ import groovy.lang.GroovyClassLoader; import org.codehaus.groovy.ast.ClassHelper; import org.codehaus.groovy.ast.ClassNode; import org.codehaus.groovy.ast.FieldNode; -import org.codehaus.groovy.ast.expr.*; +import org.codehaus.groovy.ast.expr.ArgumentListExpression; +import org.codehaus.groovy.ast.expr.AttributeExpression; +import org.codehaus.groovy.ast.expr.BooleanExpression; +import org.codehaus.groovy.ast.expr.ClassExpression; +import org.codehaus.groovy.ast.expr.ConstantExpression; +import org.codehaus.groovy.ast.expr.Expression; +import org.codehaus.groovy.ast.expr.MethodCallExpression; +import org.codehaus.groovy.ast.expr.TernaryExpression; import org.codehaus.groovy.transform.GroovyASTTransformationClass; import org.codehaus.groovy.transform.LogASTTransformation; import org.codehaus.groovy.transform.LogASTTransformation.LoggingStrategy; http://git-wip-us.apache.org/repos/asf/groovy/blob/4526cc0d/src/main/groovy/util/logging/Log4j.java ---------------------------------------------------------------------- diff --git a/src/main/groovy/util/logging/Log4j.java b/src/main/groovy/util/logging/Log4j.java index 5a78e79..2dfdf7f 100644 --- a/src/main/groovy/util/logging/Log4j.java +++ b/src/main/groovy/util/logging/Log4j.java @@ -21,7 +21,14 @@ package groovy.util.logging; import groovy.lang.GroovyClassLoader; import org.codehaus.groovy.ast.ClassNode; import org.codehaus.groovy.ast.FieldNode; -import org.codehaus.groovy.ast.expr.*; +import org.codehaus.groovy.ast.expr.ArgumentListExpression; +import org.codehaus.groovy.ast.expr.AttributeExpression; +import org.codehaus.groovy.ast.expr.BooleanExpression; +import org.codehaus.groovy.ast.expr.ClassExpression; +import org.codehaus.groovy.ast.expr.ConstantExpression; +import org.codehaus.groovy.ast.expr.Expression; +import org.codehaus.groovy.ast.expr.MethodCallExpression; +import org.codehaus.groovy.ast.expr.TernaryExpression; import org.codehaus.groovy.transform.GroovyASTTransformationClass; import org.codehaus.groovy.transform.LogASTTransformation; import org.objectweb.asm.Opcodes; http://git-wip-us.apache.org/repos/asf/groovy/blob/4526cc0d/src/main/groovy/util/logging/Log4j2.java ---------------------------------------------------------------------- diff --git a/src/main/groovy/util/logging/Log4j2.java b/src/main/groovy/util/logging/Log4j2.java index 6aab6c5..7aca5a5 100644 --- a/src/main/groovy/util/logging/Log4j2.java +++ b/src/main/groovy/util/logging/Log4j2.java @@ -19,13 +19,6 @@ package groovy.util.logging; import groovy.lang.GroovyClassLoader; - -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; -import java.util.Locale; - import org.codehaus.groovy.ast.ClassNode; import org.codehaus.groovy.ast.FieldNode; import org.codehaus.groovy.ast.expr.ArgumentListExpression; @@ -39,6 +32,12 @@ import org.codehaus.groovy.transform.GroovyASTTransformationClass; import org.codehaus.groovy.transform.LogASTTransformation; import org.objectweb.asm.Opcodes; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; +import java.util.Locale; + /** * This local transform adds a logging ability to your program using * Log4j2 logging. Every method call on a unbound variable named <i>log</i> http://git-wip-us.apache.org/repos/asf/groovy/blob/4526cc0d/src/main/groovy/util/logging/Slf4j.java ---------------------------------------------------------------------- diff --git a/src/main/groovy/util/logging/Slf4j.java b/src/main/groovy/util/logging/Slf4j.java index 7084938..0e866e4 100644 --- a/src/main/groovy/util/logging/Slf4j.java +++ b/src/main/groovy/util/logging/Slf4j.java @@ -18,20 +18,26 @@ */ package groovy.util.logging; -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; -import java.util.Locale; - import groovy.lang.GroovyClassLoader; import org.codehaus.groovy.ast.ClassNode; import org.codehaus.groovy.ast.FieldNode; -import org.codehaus.groovy.ast.expr.*; +import org.codehaus.groovy.ast.expr.ArgumentListExpression; +import org.codehaus.groovy.ast.expr.BooleanExpression; +import org.codehaus.groovy.ast.expr.ClassExpression; +import org.codehaus.groovy.ast.expr.ConstantExpression; +import org.codehaus.groovy.ast.expr.Expression; +import org.codehaus.groovy.ast.expr.MethodCallExpression; +import org.codehaus.groovy.ast.expr.TernaryExpression; import org.codehaus.groovy.transform.GroovyASTTransformationClass; import org.codehaus.groovy.transform.LogASTTransformation; import org.objectweb.asm.Opcodes; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; +import java.util.Locale; + /** * This local transform adds a logging ability to your program using * LogBack logging. Every method call on a unbound variable named <i>log</i> http://git-wip-us.apache.org/repos/asf/groovy/blob/4526cc0d/src/main/org/apache/groovy/util/concurrentlinkedhashmap/ConcurrentLinkedHashMap.java ---------------------------------------------------------------------- diff --git a/src/main/org/apache/groovy/util/concurrentlinkedhashmap/ConcurrentLinkedHashMap.java b/src/main/org/apache/groovy/util/concurrentlinkedhashmap/ConcurrentLinkedHashMap.java index 5c2c952..6fcc1b0 100644 --- a/src/main/org/apache/groovy/util/concurrentlinkedhashmap/ConcurrentLinkedHashMap.java +++ b/src/main/org/apache/groovy/util/concurrentlinkedhashmap/ConcurrentLinkedHashMap.java @@ -18,7 +18,19 @@ package org.apache.groovy.util.concurrentlinkedhashmap; import java.io.InvalidObjectException; import java.io.ObjectInputStream; import java.io.Serializable; -import java.util.*; +import java.util.AbstractCollection; +import java.util.AbstractMap; +import java.util.AbstractQueue; +import java.util.AbstractSet; +import java.util.Collection; +import java.util.HashMap; +import java.util.Hashtable; +import java.util.Iterator; +import java.util.LinkedHashMap; +import java.util.LinkedHashSet; +import java.util.Map; +import java.util.Queue; +import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentLinkedQueue; import java.util.concurrent.ConcurrentMap; http://git-wip-us.apache.org/repos/asf/groovy/blob/4526cc0d/src/main/org/apache/groovy/util/concurrentlinkedhashmap/LinkedDeque.java ---------------------------------------------------------------------- diff --git a/src/main/org/apache/groovy/util/concurrentlinkedhashmap/LinkedDeque.java b/src/main/org/apache/groovy/util/concurrentlinkedhashmap/LinkedDeque.java index db41aaa..8deda5a 100644 --- a/src/main/org/apache/groovy/util/concurrentlinkedhashmap/LinkedDeque.java +++ b/src/main/org/apache/groovy/util/concurrentlinkedhashmap/LinkedDeque.java @@ -15,7 +15,11 @@ */ package org.apache.groovy.util.concurrentlinkedhashmap; -import java.util.*; +import java.util.AbstractCollection; +import java.util.Collection; +import java.util.Deque; +import java.util.Iterator; +import java.util.NoSuchElementException; //import javax.annotation.concurrent.NotThreadSafe;
