Repository: groovy Updated Branches: refs/heads/master 7b7ff8076 -> d2a66120d
Revert "grammar correction" This reverts commit 7b7ff8076e7678b0295514d69df680c3cc0e94cf. Project: http://git-wip-us.apache.org/repos/asf/groovy/repo Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/15c7fef8 Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/15c7fef8 Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/15c7fef8 Branch: refs/heads/master Commit: 15c7fef87c6412b9b6496ae12ea131621adf91de Parents: 7b7ff80 Author: Paul King <[email protected]> Authored: Sun Aug 19 19:53:45 2018 +1000 Committer: Paul King <[email protected]> Committed: Sun Aug 19 19:53:45 2018 +1000 ---------------------------------------------------------------------- .../org/codehaus/groovy/ast/decompiled/Annotations.java | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/groovy/blob/15c7fef8/src/main/java/org/codehaus/groovy/ast/decompiled/Annotations.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/codehaus/groovy/ast/decompiled/Annotations.java b/src/main/java/org/codehaus/groovy/ast/decompiled/Annotations.java index 297dbb0..2974d00 100644 --- a/src/main/java/org/codehaus/groovy/ast/decompiled/Annotations.java +++ b/src/main/java/org/codehaus/groovy/ast/decompiled/Annotations.java @@ -48,22 +48,14 @@ class Annotations { AnnotationNode node = new DecompiledAnnotationNode(classNode); for (Map.Entry<String, Object> entry : annotation.members.entrySet()) { - addMemberIfFound(resolver, node, entry); + node.addMember(entry.getKey(), annotationValueToExpression(entry.getValue(), resolver)); } return node; } - private static void addMemberIfFound(AsmReferenceResolver resolver, AnnotationNode node, Map.Entry<String, Object> entry) { - Expression value = annotationValueToExpression(entry.getValue(), resolver); - if (value != null) { - node.addMember(entry.getKey(), value); - } - } - private static Expression annotationValueToExpression(Object value, AsmReferenceResolver resolver) { if (value instanceof TypeWrapper) { - ClassNode type = resolver.resolveClassNullable(Type.getType(((TypeWrapper) value).desc).getClassName()); - return type != null ? new ClassExpression(type) : null; + return new ClassExpression(resolver.resolveType(Type.getType(((TypeWrapper) value).desc))); } if (value instanceof EnumConstantWrapper) {
