Cleanup
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/8ab58a5e Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/8ab58a5e Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/8ab58a5e Branch: refs/heads/GROOVY_2_4_X Commit: 8ab58a5e516316b6a205baa95a4d99452e6eec65 Parents: 0fcaf69 Author: graemerocher <graeme.roc...@gmail.com> Authored: Fri May 27 11:36:20 2016 +0200 Committer: paulk <pa...@asert.com.au> Committed: Tue May 31 14:21:11 2016 +1000 ---------------------------------------------------------------------- .../org/codehaus/groovy/transform/trait/TraitComposer.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/groovy/blob/8ab58a5e/src/main/org/codehaus/groovy/transform/trait/TraitComposer.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/transform/trait/TraitComposer.java b/src/main/org/codehaus/groovy/transform/trait/TraitComposer.java index 6804aae..afcc0fd 100644 --- a/src/main/org/codehaus/groovy/transform/trait/TraitComposer.java +++ b/src/main/org/codehaus/groovy/transform/trait/TraitComposer.java @@ -62,7 +62,6 @@ import java.lang.reflect.Modifier; import java.util.*; import static org.codehaus.groovy.ast.tools.GenericsUtils.correctToGenericsSpecRecurse; -import static org.codehaus.groovy.ast.tools.GenericsUtils.newClass; /** * This class contains a static utility method {@link #doExtendTraits(org.codehaus.groovy.ast.ClassNode, org.codehaus.groovy.control.SourceUnit, org.codehaus.groovy.control.CompilationUnit)} @@ -282,8 +281,6 @@ public abstract class TraitComposer { mce.setImplicitThis(false); genericsSpec = GenericsUtils.addMethodGenerics(helperMethod,genericsSpec); - Map<String,ClassNode> methodSpec = new HashMap<String, ClassNode>(); - methodSpec = GenericsUtils.addMethodGenerics(helperMethod,methodSpec); ClassNode[] exceptionNodes = correctToGenericsSpecRecurse(genericsSpec, copyExceptions(helperMethod.getExceptions())); ClassNode fixedReturnType = correctToGenericsSpecRecurse(genericsSpec, helperMethod.getReturnType()); @@ -323,6 +320,9 @@ public abstract class TraitComposer { else { GenericsType[] genericsTypes = helperMethod.getGenericsTypes(); if(genericsTypes != null) { + Map<String,ClassNode> methodSpec = new HashMap<String, ClassNode>(); + methodSpec = GenericsUtils.addMethodGenerics(helperMethod,methodSpec); + GenericsType[] newGt = GenericsUtils.applyGenericsContextToPlaceHolders(methodSpec, helperMethod.getGenericsTypes()); forwarder.setGenericsTypes(newGt); }
