You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@groovy.apache.org by su...@apache.org on 2017/12/06 12:13:04 UTC
[3/4] groovy git commit: Merge branch 'GROOVY_2_4_X' of
https://git-wip-us.apache.org/repos/asf/groovy into GROOVY_2_4_X
Merge branch 'GROOVY_2_4_X' of https://git-wip-us.apache.org/repos/asf/groovy into GROOVY_2_4_X
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/9e950abf
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/9e950abf
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/9e950abf
Branch: refs/heads/GROOVY_2_4_X
Commit: 9e950abf2f7c1c13c1358aa4c67bb75250e1edc2
Parents: 2ee2a4a 1c312a5
Author: sunlan <su...@apache.org>
Authored: Wed Dec 6 20:12:02 2017 +0800
Committer: sunlan <su...@apache.org>
Committed: Wed Dec 6 20:12:02 2017 +0800
----------------------------------------------------------------------
build.gradle | 2 +-
.../groovy/beans/BindableASTTransformation.java | 14 +-
.../groovy/beans/VetoableASTTransformation.java | 14 +-
.../grape/GrabAnnotationTransformation.java | 8 +-
src/main/groovy/inspect/Inspector.java | 5 +-
src/main/groovy/lang/GString.java | 68 +++---
src/main/groovy/lang/MetaClassImpl.java | 191 ++++++++---------
src/main/groovy/lang/Reference.java | 1 +
.../transform/builder/DefaultStrategy.java | 24 ++-
.../transform/builder/ExternalStrategy.java | 16 +-
.../transform/builder/InitializerStrategy.java | 26 ++-
.../transform/builder/SimpleStrategy.java | 10 +-
src/main/groovy/util/ClosureComparator.java | 6 +-
src/main/groovy/util/GroovyScriptEngine.java | 25 ++-
src/main/groovy/xml/QName.java | 1 +
src/main/org/codehaus/groovy/ast/ClassNode.java | 32 +--
.../org/codehaus/groovy/ast/GenericsType.java | 12 +-
.../groovy/ast/MixinASTTransformation.java | 5 +-
.../groovy/ast/tools/WideningCategories.java | 17 +-
.../groovy/classgen/AsmClassGenerator.java | 18 +-
.../classgen/ClassCompletionVerifier.java | 24 ++-
.../groovy/classgen/ExtendedVerifier.java | 4 +-
.../classgen/InnerClassCompletionVisitor.java | 11 -
.../groovy/classgen/InnerClassVisitor.java | 12 --
.../classgen/InnerClassVisitorHelper.java | 12 ++
.../org/codehaus/groovy/classgen/Verifier.java | 6 +-
.../groovy/classgen/asm/AssertionWriter.java | 11 +-
.../asm/BinaryDoubleExpressionHelper.java | 8 +-
.../classgen/asm/BinaryExpressionHelper.java | 50 ++++-
.../BinaryExpressionMultiTypeDispatcher.java | 21 +-
.../classgen/asm/BinaryExpressionWriter.java | 20 +-
.../asm/BinaryFloatExpressionHelper.java | 10 +-
.../classgen/asm/BinaryIntExpressionHelper.java | 24 ++-
.../asm/BinaryLongExpressionHelper.java | 16 +-
.../groovy/classgen/asm/CallSiteWriter.java | 25 ++-
.../groovy/classgen/asm/ClosureWriter.java | 11 +-
.../groovy/classgen/asm/CompileStack.java | 2 +-
.../groovy/classgen/asm/InvocationWriter.java | 17 +-
.../codehaus/groovy/classgen/asm/MopWriter.java | 14 +-
.../groovy/classgen/asm/OperandStack.java | 56 ++++-
.../classgen/asm/OptimizingStatementWriter.java | 42 ++--
.../groovy/classgen/asm/StatementWriter.java | 10 +-
.../classgen/asm/indy/InvokeDynamicWriter.java | 23 ++-
.../classgen/asm/sc/StaticInvocationWriter.java | 11 +-
...ypesBinaryExpressionMultiTypeDispatcher.java | 10 +-
.../asm/sc/StaticTypesCallSiteWriter.java | 26 ++-
.../asm/sc/StaticTypesStatementWriter.java | 19 +-
.../sc/StaticTypesUnaryExpressionHelper.java | 10 +-
.../org/codehaus/groovy/control/Phases.java | 2 +-
.../codehaus/groovy/control/ProcessingUnit.java | 18 +-
.../groovy/reflection/CachedMethod.java | 5 +-
.../codehaus/groovy/reflection/ClassInfo.java | 8 +-
.../groovy/reflection/GeneratedMetaMethod.java | 1 +
.../codehaus/groovy/runtime/CurriedClosure.java | 23 +--
.../groovy/runtime/NumberAwareComparator.java | 5 +-
.../groovy/runtime/ProcessGroovyMethods.java | 1 +
.../runtime/metaclass/ClosureMetaClass.java | 207 +++++++------------
.../metaclass/ConcurrentReaderHashMap.java | 1 +
.../org/codehaus/groovy/syntax/TokenUtil.java | 31 ++-
src/main/org/codehaus/groovy/syntax/Types.java | 9 +-
.../groovy/tools/FileSystemCompiler.java | 18 +-
.../codehaus/groovy/tools/GroovyStarter.java | 10 +-
.../groovy/tools/LoaderConfiguration.java | 12 +-
.../groovy/tools/javac/JavaStubGenerator.java | 5 +-
.../AbstractInterruptibleASTTransformation.java | 6 +-
.../transform/AnnotationCollectorTransform.java | 8 +-
.../transform/AutoCloneASTTransformation.java | 30 ++-
.../transform/DelegateASTTransformation.java | 17 +-
.../EqualsAndHashCodeASTTransformation.java | 33 ++-
.../ExternalizeMethodsASTTransformation.java | 10 +-
.../transform/ImmutableASTTransformation.java | 33 ++-
.../IndexedPropertyASTTransformation.java | 6 +-
.../InheritConstructorsASTTransformation.java | 23 ++-
.../groovy/transform/LazyASTTransformation.java | 17 +-
.../transform/MemoizedASTTransformation.java | 10 +-
.../ReadWriteLockASTTransformation.java | 6 +-
.../transform/SingletonASTTransformation.java | 12 +-
.../transform/SortableASTTransformation.java | 26 ++-
.../transform/SourceURIASTTransformation.java | 4 +-
.../TimedInterruptibleASTTransformation.groovy | 12 +-
.../transform/ToStringASTTransformation.java | 20 +-
.../TupleConstructorASTTransformation.java | 19 +-
.../transform/sc/StaticCompilationVisitor.java | 17 +-
.../BooleanExpressionTransformer.java | 12 +-
.../stc/AbstractTypeCheckingExtension.java | 2 +-
.../transform/stc/SignatureCodecVersion1.java | 11 +-
.../stc/StaticTypeCheckingSupport.java | 81 +++++++-
.../stc/StaticTypeCheckingVisitor.java | 129 +++++++++++-
.../groovy/transform/tailrec/AstHelper.groovy | 5 +-
.../trait/SuperCallTraitTransformer.java | 5 +-
.../groovy/transform/trait/TraitComposer.java | 8 +-
.../codehaus/groovy/util/LockableObject.java | 1 +
.../codehaus/groovy/vmplugin/v7/IndyMath.java | 6 +-
.../codehaus/groovy/vmplugin/v7/Selector.java | 64 ++++--
.../groovy/security/SecurityTestSupport.java | 24 ++-
.../codehaus/groovy/classgen/TestSupport.java | 26 ++-
.../src/main/java/groovy/util/AntBuilder.java | 13 +-
.../ant/AntProjectPropertiesDelegate.java | 12 +-
.../codehaus/groovy/ant/CompileTaskSupport.java | 16 +-
.../org/codehaus/groovy/ant/FileScanner.java | 8 +-
.../codehaus/groovy/ant/GenerateStubsTask.java | 2 -
.../java/org/codehaus/groovy/ant/Groovy.java | 11 +-
.../java/org/codehaus/groovy/ant/Groovyc.java | 24 ++-
.../org/codehaus/groovy/ant/GroovycTask.java | 2 -
.../java/org/codehaus/groovy/ant/Groovydoc.java | 6 +-
.../org/codehaus/groovy/ant/GroovycTest.java | 12 +-
.../groovy/inspect/swingui/AstBrowser.groovy | 35 ++--
.../swingui/AstNodeToScriptAdapter.groovy | 83 +++++++-
.../groovy/inspect/swingui/ObjectBrowser.groovy | 7 +-
.../swingui/ScriptToTreeNodeAdapter.groovy | 78 ++++++-
.../src/main/groovy/groovy/ui/Console.groovy | 48 ++---
.../main/groovy/groovy/ui/ConsoleActions.groovy | 8 +-
.../main/groovy/groovy/ui/ConsoleApplet.groovy | 2 +-
.../groovy/groovy/ui/ConsoleIvyPlugin.groovy | 7 +-
.../main/groovy/groovy/ui/ConsoleSupport.java | 5 +-
.../groovy/groovy/ui/ConsoleTextEditor.java | 14 +-
.../main/groovy/groovy/ui/ConsoleView.groovy | 12 +-
.../groovy/groovy/ui/OutputTransforms.groovy | 6 +-
.../groovy/ui/text/AutoIndentAction.groovy | 4 +-
.../groovy/ui/text/FindReplaceUtility.java | 34 +--
.../groovy/groovy/ui/text/GroovyFilter.java | 15 +-
.../ui/text/StructuredSyntaxDocumentFilter.java | 27 +--
.../ui/text/StructuredSyntaxResources.java | 4 +-
.../main/groovy/groovy/ui/text/TextEditor.java | 51 ++---
.../groovy/groovy/ui/text/TextUndoManager.java | 5 +-
.../groovy/ui/view/BasicContentPane.groovy | 15 +-
.../groovy/groovy/ui/view/BasicMenuBar.groovy | 4 -
.../groovy/groovy/ui/view/BasicStatusBar.groovy | 5 +-
.../groovy/groovy/ui/view/BasicToolBar.groovy | 4 +-
.../main/groovy/groovy/ui/view/Defaults.groovy | 3 +-
.../groovy/groovy/ui/view/GTKDefaults.groovy | 3 -
.../groovy/groovy/ui/view/MacOSXDefaults.groovy | 3 +-
.../groovy/ui/view/WindowsDefaults.groovy | 3 -
.../codehaus/groovy/tools/groovydoc/Main.groovy | 6 +-
.../groovydoc/ClasspathResourceManager.java | 3 +-
.../tools/groovydoc/ExternalGroovyClassDoc.java | 8 +-
.../groovy/tools/groovydoc/GroovyDocWriter.java | 8 +-
.../tools/groovydoc/GroovyRootDocBuilder.java | 8 +-
.../tools/groovydoc/SimpleGroovyClassDoc.java | 21 +-
.../SimpleGroovyClassDocAssembler.java | 7 +-
.../groovydoc/SimpleGroovyConstructorDoc.java | 3 +-
.../groovy/tools/groovydoc/SimpleGroovyDoc.java | 4 +-
.../SimpleGroovyExecutableMemberDoc.java | 8 +-
.../tools/groovydoc/SimpleGroovyFieldDoc.java | 2 +-
.../tools/groovydoc/SimpleGroovyMemberDoc.java | 3 +-
.../tools/groovydoc/SimpleGroovyMethodDoc.java | 4 +-
.../tools/groovydoc/SimpleGroovyParameter.java | 6 +-
.../tools/groovydoc/SimpleGroovyRootDoc.java | 17 +-
.../codehaus/groovy/tools/shell/Groovysh.groovy | 7 +-
.../tools/shell/InteractiveShellRunner.groovy | 8 +-
.../groovy/tools/shell/Interpreter.groovy | 3 +-
.../codehaus/groovy/tools/shell/Parser.groovy | 15 +-
.../tools/shell/PatchedConsoleReader.groovy | 1 -
.../tools/shell/commands/DocCommand.groovy | 1 -
.../tools/shell/commands/ExitCommand.groovy | 2 +-
.../tools/shell/commands/HelpCommand.groovy | 2 +-
.../tools/shell/commands/InspectCommand.groovy | 10 +-
.../tools/shell/commands/RegisterCommand.groovy | 2 +-
.../tools/shell/commands/SetCommand.groovy | 2 +-
.../tools/shell/commands/ShowCommand.groovy | 1 -
.../completion/GroovySyntaxCompletor.groovy | 30 ++-
.../shell/completion/ReflectionCompletor.groovy | 54 ++++-
.../completion/StricterArgumentCompleter.groovy | 2 +-
.../tools/shell/util/PackageHelperImpl.groovy | 42 ++--
.../shell/util/ScriptVariableAnalyzer.groovy | 6 +-
.../tools/shell/util/XmlCommandRegistrar.groovy | 2 +-
.../groovy/jmx/builder/JmxBuilderTools.groovy | 2 +-
.../groovy/jmx/builder/JmxMetaMapBuilder.groovy | 2 +-
.../jmx/builder/JmxBuilderModelMBean.java | 11 +-
.../src/main/java/groovy/util/GroovyMBean.java | 16 +-
.../src/main/java/groovy/json/JsonBuilder.java | 8 +-
.../src/main/java/groovy/json/JsonDelegate.java | 7 +-
.../src/main/java/groovy/json/JsonLexer.java | 8 +-
.../src/main/java/groovy/json/JsonOutput.java | 13 +-
.../src/main/java/groovy/json/JsonSlurper.java | 2 +-
.../src/main/java/groovy/json/JsonToken.java | 6 +-
.../java/groovy/json/StreamingJsonBuilder.java | 12 +-
.../groovy/json/internal/BaseJsonParser.java | 7 +-
.../groovy/json/internal/CharSequenceValue.java | 4 +-
.../main/java/groovy/json/internal/LazyMap.java | 7 +-
.../java/groovy/json/internal/LazyValueMap.java | 7 +-
.../java/groovy/json/internal/NumberValue.java | 4 +-
.../java/groovy/json/internal/ValueMapImpl.java | 6 +-
.../jsr223/GroovyScriptEngineFactory.java | 15 +-
.../groovy/jsr223/GroovyScriptEngineImpl.java | 16 +-
.../groovy/runtime/NioGroovyMethods.java | 28 +--
.../codehaus/groovy/runtime/WritablePath.java | 4 +-
.../groovy/servlet/AbstractHttpServlet.java | 11 +-
.../main/java/groovy/servlet/GroovyServlet.java | 6 +-
.../java/groovy/servlet/ServletBinding.java | 12 +-
.../java/groovy/servlet/TemplateServlet.java | 9 +-
.../sql/BatchingPreparedStatementWrapper.java | 1 -
.../src/main/java/groovy/sql/DataSet.java | 4 +-
.../groovy/sql/GroovyResultSetExtension.java | 7 +-
.../java/groovy/sql/GroovyResultSetProxy.java | 3 +-
.../groovy/sql/ResultSetMetaDataWrapper.java | 4 +-
.../src/main/java/groovy/sql/Sql.java | 34 ++-
.../main/java/groovy/sql/SqlWhereVisitor.java | 6 +-
.../groovy/groovy/sql/SqlCompleteTest.groovy | 1 +
.../groovy/swing/LookAndFeelHelper.groovy | 3 +-
.../groovy/groovy/swing/SwingBuilder.groovy | 103 +++++----
.../swing/binding/AbstractButtonProperties.java | 6 +-
.../swing/binding/JComboBoxMetaMethods.groovy | 3 +-
.../swing/binding/JComboBoxProperties.java | 13 +-
.../swing/binding/JComponentProperties.java | 8 +-
.../swing/binding/JListMetaMethods.groovy | 3 +-
.../groovy/swing/binding/JListProperties.groovy | 23 ++-
.../swing/binding/JScrollBarProperties.java | 6 +-
.../groovy/swing/binding/JSliderProperties.java | 6 +-
.../swing/binding/JSpinnerProperties.java | 6 +-
.../swing/binding/JTableMetaMethods.groovy | 5 +-
.../groovy/swing/binding/JTableProperties.java | 6 +-
.../swing/binding/JTextComponentProperties.java | 6 +-
.../groovy/swing/factory/ActionFactory.groovy | 5 +-
.../swing/factory/BevelBorderFactory.groovy | 4 +-
.../groovy/swing/factory/BindFactory.groovy | 26 ++-
.../groovy/swing/factory/BoxFactory.groovy | 5 +-
.../swing/factory/BoxLayoutFactory.groovy | 5 +-
.../swing/factory/ButtonGroupFactory.groovy | 3 +-
.../swing/factory/CellEditorFactory.groovy | 3 +-
.../groovy/swing/factory/ColumnFactory.groovy | 3 +-
.../swing/factory/ColumnModelFactory.groovy | 5 +-
.../groovy/swing/factory/ComboBoxFactory.groovy | 4 +-
.../swing/factory/ComponentFactory.groovy | 6 +-
.../groovy/swing/factory/DialogFactory.groovy | 5 +-
.../swing/factory/EmptyBorderFactory.groovy | 2 +-
.../swing/factory/EtchedBorderFactory.groovy | 4 +-
.../swing/factory/FormattedTextFactory.groovy | 2 +-
.../groovy/swing/factory/FrameFactory.groovy | 3 +-
.../groovy/swing/factory/GridBagFactory.groovy | 9 +-
.../swing/factory/ImageIconFactory.groovy | 4 +-
.../swing/factory/InternalFrameFactory.groovy | 2 +-
.../groovy/swing/factory/LayoutFactory.groovy | 4 +-
.../groovy/swing/factory/ListFactory.groovy | 3 +-
.../swing/factory/MatteBorderFactory.groovy | 2 +-
.../groovy/swing/factory/RendererFactory.groovy | 6 +-
.../factory/RichActionWidgetFactory.groovy | 3 +-
.../factory/RootPaneContainerFactory.groovy | 7 +-
.../swing/factory/ScrollPaneFactory.groovy | 6 +-
.../swing/factory/SeparatorFactory.groovy | 4 +-
.../swing/factory/SplitPaneFactory.groovy | 5 +-
.../swing/factory/SwingBorderFactory.groovy | 3 +-
.../swing/factory/TabbedPaneFactory.groovy | 3 +-
.../groovy/swing/factory/TableFactory.groovy | 3 +-
.../swing/factory/TableLayoutFactory.groovy | 7 +-
.../swing/factory/TableModelFactory.groovy | 7 +-
.../swing/factory/TitledBorderFactory.groovy | 3 +-
.../groovy/swing/factory/WidgetFactory.groovy | 6 +-
.../groovy/swing/factory/WindowFactory.groovy | 2 +-
.../groovy/swing/impl/ClosureCellEditor.groovy | 5 +-
.../groovy/groovy/swing/impl/DefaultAction.java | 3 +-
.../groovy/groovy/swing/impl/TableLayout.java | 7 +-
.../groovy/swing/impl/TableLayoutCell.java | 3 +-
.../groovy/swing/impl/TableLayoutRow.java | 2 +-
.../org/codehaus/groovy/binding/BindPath.java | 9 +-
.../groovy/binding/PropertyBinding.java | 4 +-
.../PropertyChangeProxyTargetBinding.java | 2 +-
.../groovy/binding/PropertyPathFullBinding.java | 4 +-
.../binding/SwingTimerTriggerBinding.java | 4 +-
.../groovy/text/GStringTemplateEngine.java | 11 +-
.../groovy/text/SimpleTemplateEngine.java | 11 +-
.../groovy/text/StreamingTemplateEngine.java | 8 +-
.../main/groovy/groovy/text/TemplateEngine.java | 6 +-
.../groovy/groovy/text/markup/BaseTemplate.java | 2 +-
.../markup/MarkupBuilderCodeTransformer.java | 2 -
.../text/markup/MarkupTemplateEngine.java | 14 +-
.../MarkupTemplateTypeCheckingExtension.groovy | 18 +-
.../groovy/groovy/lang/GroovyLogTestCase.groovy | 6 +-
.../util/JavadocAssertionTestSuite.groovy | 2 +-
.../mock/interceptor/MockProxyMetaClass.java | 9 +-
.../src/main/java/groovy/util/AllTestSuite.java | 12 +-
.../main/java/groovy/util/GroovyTestSuite.java | 12 +-
.../groovy/xml/StreamingDOMBuilder.groovy | 6 +-
.../groovy/xml/StreamingMarkupBuilder.groovy | 2 +-
.../groovy/xml/StreamingSAXBuilder.groovy | 2 +-
.../main/java/groovy/util/XmlNodePrinter.java | 2 +-
.../src/main/java/groovy/util/XmlSlurper.java | 34 ++-
.../groovy/util/slurpersupport/Attribute.java | 3 +-
.../groovy/util/slurpersupport/Attributes.java | 4 +-
.../util/slurpersupport/FilteredAttributes.java | 7 +-
.../slurpersupport/FilteredNodeChildren.java | 7 +-
.../groovy/util/slurpersupport/GPathResult.java | 13 +-
.../groovy/util/slurpersupport/NodeChild.java | 3 +-
.../util/slurpersupport/NodeChildren.java | 3 +-
.../src/main/java/groovy/xml/DOMBuilder.java | 20 +-
.../main/java/groovy/xml/FactorySupport.java | 4 +-
.../src/main/java/groovy/xml/MarkupBuilder.java | 2 +-
.../groovy/xml/NamespaceBuilderSupport.java | 1 -
.../src/main/java/groovy/xml/SAXBuilder.java | 7 +-
.../src/main/java/groovy/xml/XmlUtil.java | 16 +-
.../xml/streamingmarkupsupport/Builder.java | 15 +-
.../codehaus/groovy/tools/xml/DomToGroovy.java | 18 +-
292 files changed, 2677 insertions(+), 1230 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/groovy/blob/9e950abf/src/main/groovy/grape/GrabAnnotationTransformation.java
----------------------------------------------------------------------