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:02 UTC
[1/4] groovy git commit: Minor refactoring
Repository: groovy
Updated Branches:
refs/heads/GROOVY_2_4_X 1c312a50f -> e7ee5ede0
Minor refactoring
(cherry picked from commit 53b2a07)
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/e988957c
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/e988957c
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/e988957c
Branch: refs/heads/GROOVY_2_4_X
Commit: e988957c0718bd4edd5df3f3c323821a5dd5c5b4
Parents: 29592e1
Author: sunlan <su...@apache.org>
Authored: Sat Dec 2 15:04:56 2017 +0800
Committer: sunlan <su...@apache.org>
Committed: Sat Dec 2 16:24:29 2017 +0800
----------------------------------------------------------------------
src/main/groovy/grape/GrabAnnotationTransformation.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/groovy/blob/e988957c/src/main/groovy/grape/GrabAnnotationTransformation.java
----------------------------------------------------------------------
diff --git a/src/main/groovy/grape/GrabAnnotationTransformation.java b/src/main/groovy/grape/GrabAnnotationTransformation.java
index ad76ea2..0bccbbe 100644
--- a/src/main/groovy/grape/GrabAnnotationTransformation.java
+++ b/src/main/groovy/grape/GrabAnnotationTransformation.java
@@ -552,8 +552,9 @@ public class GrabAnnotationTransformation extends ClassCodeVisitorSupport implem
// assume gradle syntax
// see: http://www.gradle.org/latest/docs/userguide/dependency_management.html#sec:how_to_declare_your_dependencies
Map<String, Object> parts = GrapeUtil.getIvyParts(allstr);
- for (String key : parts.keySet()) {
- String value = parts.get(key).toString();
+ for (Map.Entry<String, Object> entry : parts.entrySet()) {
+ String key = entry.getKey();
+ String value = entry.getValue().toString();
if (!key.equals("version") || !value.equals("*") || !exclude) {
node.addMember(key, constX(value));
}
[2/4] groovy git commit: Minor refactoring
Posted by su...@apache.org.
Minor refactoring
(cherry picked from commit 5d2fcc6)
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/2ee2a4ad
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/2ee2a4ad
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/2ee2a4ad
Branch: refs/heads/GROOVY_2_4_X
Commit: 2ee2a4ad4535b9f3f559cd0b45508caa8ad81e30
Parents: e988957
Author: sunlan <su...@apache.org>
Authored: Sat Dec 2 15:44:47 2017 +0800
Committer: sunlan <su...@apache.org>
Committed: Sat Dec 2 16:24:34 2017 +0800
----------------------------------------------------------------------
src/main/groovy/lang/GroovyShell.java | 14 +------------
.../codehaus/groovy/runtime/InvokerHelper.java | 22 +++++++++++++-------
2 files changed, 15 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/groovy/blob/2ee2a4ad/src/main/groovy/lang/GroovyShell.java
----------------------------------------------------------------------
diff --git a/src/main/groovy/lang/GroovyShell.java b/src/main/groovy/lang/GroovyShell.java
index 7e2b326..b2a0a30 100644
--- a/src/main/groovy/lang/GroovyShell.java
+++ b/src/main/groovy/lang/GroovyShell.java
@@ -259,24 +259,12 @@ public class GroovyShell extends GroovyObjectSupport {
if (Script.class.isAssignableFrom(scriptClass)) {
// treat it just like a script if it is one
try {
- Constructor constructor = scriptClass.getConstructor(Binding.class);
- Script script = (Script) constructor.newInstance(context);
+ Script script = InvokerHelper.newScript(scriptClass, context);
return script.run();
} catch (InstantiationException e) {
// ignore instantiation errors,, try to do main
} catch (IllegalAccessException e) {
// ignore instantiation errors, try to do main
- } catch (NoSuchMethodException e) {
- try {
- // Fallback for non-standard "Scripts" that don't have contextual constructor.
- Script script = (Script) scriptClass.newInstance();
- script.setBinding(context);
- return script.run();
- } catch (InstantiationException e1) {
- // ignore instantiation errors, try to do main
- } catch (IllegalAccessException e1) {
- // ignore instantiation errors, try to do main
- }
} catch (InvocationTargetException e) {
// ignore instantiation errors, try to do main
}
http://git-wip-us.apache.org/repos/asf/groovy/blob/2ee2a4ad/src/main/org/codehaus/groovy/runtime/InvokerHelper.java
----------------------------------------------------------------------
diff --git a/src/main/org/codehaus/groovy/runtime/InvokerHelper.java b/src/main/org/codehaus/groovy/runtime/InvokerHelper.java
index f3471c1..d8f1b37 100644
--- a/src/main/org/codehaus/groovy/runtime/InvokerHelper.java
+++ b/src/main/org/codehaus/groovy/runtime/InvokerHelper.java
@@ -442,14 +442,7 @@ public class InvokerHelper {
} else {
try {
if (Script.class.isAssignableFrom(scriptClass)) {
- try {
- Constructor constructor = scriptClass.getConstructor(Binding.class);
- script = (Script) constructor.newInstance(context);
- } catch (NoSuchMethodException e) {
- // Fallback for non-standard "Script" classes.
- script = (Script) scriptClass.newInstance();
- script.setBinding(context);
- }
+ script = newScript(scriptClass, context);
} else {
final GroovyObject object = (GroovyObject) scriptClass.newInstance();
// it could just be a class, so let's wrap it in a Script
@@ -487,6 +480,19 @@ public class InvokerHelper {
return script;
}
+ public static Script newScript(Class scriptClass, Binding context) throws InstantiationException, IllegalAccessException, InvocationTargetException {
+ Script script;
+ try {
+ Constructor constructor = scriptClass.getConstructor(Binding.class);
+ script = (Script) constructor.newInstance(context);
+ } catch (NoSuchMethodException e) {
+ // Fallback for non-standard "Script" classes.
+ script = (Script) scriptClass.newInstance();
+ script.setBinding(context);
+ }
+ return script;
+ }
+
/**
* Sets the properties on the given object
*/
[4/4] groovy git commit: Use static valueOf instead
Posted by su...@apache.org.
Use static valueOf instead
(cherry picked from commit 0401f74)
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/e7ee5ede
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/e7ee5ede
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/e7ee5ede
Branch: refs/heads/GROOVY_2_4_X
Commit: e7ee5ede07a93d1eb96904ac4d058958fa1df193
Parents: 9e950ab
Author: sunlan <su...@apache.org>
Authored: Wed Dec 6 17:59:08 2017 +0800
Committer: sunlan <su...@apache.org>
Committed: Wed Dec 6 20:12:43 2017 +0800
----------------------------------------------------------------------
src/main/groovy/lang/BenchmarkInterceptor.java | 8 ++++----
.../groovy/reflection/stdclasses/NumberCachedClass.java | 2 +-
.../runtime/typehandling/DefaultTypeTransformation.java | 2 +-
.../codehaus/groovy/transform/SortableASTTransformation.java | 2 +-
.../codehaus/groovy/binding/SwingTimerTriggerBinding.java | 2 +-
5 files changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/groovy/blob/e7ee5ede/src/main/groovy/lang/BenchmarkInterceptor.java
----------------------------------------------------------------------
diff --git a/src/main/groovy/lang/BenchmarkInterceptor.java b/src/main/groovy/lang/BenchmarkInterceptor.java
index b460a9a..77bcb64 100644
--- a/src/main/groovy/lang/BenchmarkInterceptor.java
+++ b/src/main/groovy/lang/BenchmarkInterceptor.java
@@ -74,7 +74,7 @@ public class BenchmarkInterceptor implements Interceptor {
*/
public Object beforeInvoke(Object object, String methodName, Object[] arguments) {
if (!calls.containsKey(methodName)) calls.put(methodName, new LinkedList());
- ((List) calls.get(methodName)).add(new Long(System.currentTimeMillis()));
+ ((List) calls.get(methodName)).add(Long.valueOf(System.currentTimeMillis()));
return null;
}
@@ -87,7 +87,7 @@ public class BenchmarkInterceptor implements Interceptor {
* @return result
*/
public Object afterInvoke(Object object, String methodName, Object[] arguments, Object result) {
- ((List) calls.get(methodName)).add(new Long(System.currentTimeMillis()));
+ ((List) calls.get(methodName)).add(Long.valueOf(System.currentTimeMillis()));
return result;
}
@@ -112,14 +112,14 @@ public class BenchmarkInterceptor implements Interceptor {
result.add(line);
line[0] = iter.next();
List times = (List) calls.get(line[0]);
- line[1] = new Integer(times.size() / 2);
+ line[1] = Integer.valueOf(times.size() / 2);
int accTime = 0;
for (Iterator it = times.iterator(); it.hasNext();) {
Long start = (Long) it.next();
Long end = (Long) it.next();
accTime += end.longValue() - start.longValue();
}
- line[2] = new Long(accTime);
+ line[2] = Long.valueOf(accTime);
}
return result;
}
http://git-wip-us.apache.org/repos/asf/groovy/blob/e7ee5ede/src/main/org/codehaus/groovy/reflection/stdclasses/NumberCachedClass.java
----------------------------------------------------------------------
diff --git a/src/main/org/codehaus/groovy/reflection/stdclasses/NumberCachedClass.java b/src/main/org/codehaus/groovy/reflection/stdclasses/NumberCachedClass.java
index 5c077f3..311cbc2 100644
--- a/src/main/org/codehaus/groovy/reflection/stdclasses/NumberCachedClass.java
+++ b/src/main/org/codehaus/groovy/reflection/stdclasses/NumberCachedClass.java
@@ -55,7 +55,7 @@ public class NumberCachedClass extends CachedClass {
private Object coerceNumber(Object argument) {
Class param = getTheClass();
if (param == Byte.class /*|| param == Byte.TYPE*/) {
- argument = new Byte(((Number) argument).byteValue());
+ argument = Byte.valueOf(((Number) argument).byteValue());
} else if (param == BigInteger.class) {
argument = new BigInteger(String.valueOf((Number) argument));
}
http://git-wip-us.apache.org/repos/asf/groovy/blob/e7ee5ede/src/main/org/codehaus/groovy/runtime/typehandling/DefaultTypeTransformation.java
----------------------------------------------------------------------
diff --git a/src/main/org/codehaus/groovy/runtime/typehandling/DefaultTypeTransformation.java b/src/main/org/codehaus/groovy/runtime/typehandling/DefaultTypeTransformation.java
index a33d6a0..3efb3c9 100644
--- a/src/main/org/codehaus/groovy/runtime/typehandling/DefaultTypeTransformation.java
+++ b/src/main/org/codehaus/groovy/runtime/typehandling/DefaultTypeTransformation.java
@@ -885,7 +885,7 @@ public class DefaultTypeTransformation {
if (value instanceof String) {
String s = (String) value;
if (s.length() != 1) throw new IllegalArgumentException("String of length 1 expected but got a bigger one");
- return new Character(s.charAt(0));
+ return Character.valueOf(s.charAt(0));
} else {
return ((Character) value);
}
http://git-wip-us.apache.org/repos/asf/groovy/blob/e7ee5ede/src/main/org/codehaus/groovy/transform/SortableASTTransformation.java
----------------------------------------------------------------------
diff --git a/src/main/org/codehaus/groovy/transform/SortableASTTransformation.java b/src/main/org/codehaus/groovy/transform/SortableASTTransformation.java
index f94af2a..e86ad13 100644
--- a/src/main/org/codehaus/groovy/transform/SortableASTTransformation.java
+++ b/src/main/org/codehaus/groovy/transform/SortableASTTransformation.java
@@ -224,7 +224,7 @@ public class SortableASTTransformation extends AbstractASTTransformation {
if (!includes.isEmpty()) {
Comparator<PropertyNode> includeComparator = new Comparator<PropertyNode>() {
public int compare(PropertyNode o1, PropertyNode o2) {
- return new Integer(includes.indexOf(o1.getName())).compareTo(includes.indexOf(o2.getName()));
+ return Integer.valueOf(includes.indexOf(o1.getName())).compareTo(includes.indexOf(o2.getName()));
}
};
Collections.sort(properties, includeComparator);
http://git-wip-us.apache.org/repos/asf/groovy/blob/e7ee5ede/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/SwingTimerTriggerBinding.java
----------------------------------------------------------------------
diff --git a/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/SwingTimerTriggerBinding.java b/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/SwingTimerTriggerBinding.java
index 1111cdb..02ea6d8 100644
--- a/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/SwingTimerTriggerBinding.java
+++ b/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/SwingTimerTriggerBinding.java
@@ -110,7 +110,7 @@ class SwingTimerFullBinding extends AbstractFullBinding implements ActionListene
//in Groovy2.0 use valueOf
} else if (reportElapsed) {
((ClosureSourceBinding)sourceBinding).setClosureArgument(
- new Long(elapsed));
+ Long.valueOf(elapsed));
//in Groovy2.0 use valueOf
}
[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
Posted by su...@apache.org.
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
----------------------------------------------------------------------