diff options
| author | Reinier Zwitserloot <reinier@zwitserloot.com> | 2011-05-30 22:30:16 +0200 |
|---|---|---|
| committer | Reinier Zwitserloot <reinier@zwitserloot.com> | 2011-05-30 22:30:16 +0200 |
| commit | 339b4a6ab18a5dc7a39ca68314fb906fc1dcf6c8 (patch) | |
| tree | eb1a32664526f9dd5a71634da8d6cdbd9aef36af /src/core/lombok | |
| parent | aa8a627349bb68f376b98847b6f73c2c89e989fd (diff) | |
| download | lombok-339b4a6ab18a5dc7a39ca68314fb906fc1dcf6c8.tar.gz lombok-339b4a6ab18a5dc7a39ca68314fb906fc1dcf6c8.tar.bz2 lombok-339b4a6ab18a5dc7a39ca68314fb906fc1dcf6c8.zip | |
Whoops, we broke @Delegate with the last update. Now the CAS check on handled is only done if we are -actually- going to call a handler.
Diffstat (limited to 'src/core/lombok')
| -rw-r--r-- | src/core/lombok/eclipse/HandlerLibrary.java | 4 | ||||
| -rw-r--r-- | src/core/lombok/javac/HandlerLibrary.java | 14 |
2 files changed, 10 insertions, 8 deletions
diff --git a/src/core/lombok/eclipse/HandlerLibrary.java b/src/core/lombok/eclipse/HandlerLibrary.java index 109f6fe1..231a00d6 100644 --- a/src/core/lombok/eclipse/HandlerLibrary.java +++ b/src/core/lombok/eclipse/HandlerLibrary.java @@ -155,8 +155,6 @@ public class HandlerLibrary { * @param annotation 'node.get()' - convenience parameter. */ public void handleAnnotation(CompilationUnitDeclaration ast, EclipseNode annotationNode, org.eclipse.jdt.internal.compiler.ast.Annotation annotation) { - if (!checkAndSetHandled(annotation)) return; - String pkgName = annotationNode.getPackageDeclaration(); Collection<String> imports = annotationNode.getImportStatements(); @@ -171,7 +169,7 @@ public class HandlerLibrary { if (container == null) continue; try { - container.handle(annotation, annotationNode); + if (checkAndSetHandled(annotation)) container.handle(annotation, annotationNode); } catch (AnnotationValueDecodeFail fail) { fail.owner.setError(fail.getMessage(), fail.idx); } catch (Throwable t) { diff --git a/src/core/lombok/javac/HandlerLibrary.java b/src/core/lombok/javac/HandlerLibrary.java index 0c753c02..f0bd3442 100644 --- a/src/core/lombok/javac/HandlerLibrary.java +++ b/src/core/lombok/javac/HandlerLibrary.java @@ -170,8 +170,6 @@ public class HandlerLibrary { * @param annotation 'node.get()' - convenience parameter. */ public void handleAnnotation(JCCompilationUnit unit, JavacNode node, JCAnnotation annotation) { - if (!checkAndSetHandled(annotation)) return; - TypeResolver resolver = new TypeResolver(typeLibrary, node.getPackageDeclaration(), node.getImportStatements()); String rawType = annotation.annotationType.toString(); for (String fqn : resolver.findTypeMatches(node, rawType)) { @@ -182,9 +180,15 @@ public class HandlerLibrary { if (container == null) continue; try { - if (container.isResolutionBased() && phase == 1) container.handle(node); - if (!container.isResolutionBased() && phase == 0) container.handle(node); - if (container.annotationClass == PrintAST.class && phase == 2) container.handle(node); + if (container.isResolutionBased() && phase == 1) { + if (checkAndSetHandled(annotation)) container.handle(node); + } + if (!container.isResolutionBased() && phase == 0) { + if (checkAndSetHandled(annotation)) container.handle(node); + } + if (container.annotationClass == PrintAST.class && phase == 2) { + if (checkAndSetHandled(annotation)) container.handle(node); + } } catch (AnnotationValueDecodeFail fail) { fail.owner.setError(fail.getMessage(), fail.idx); } catch (Throwable t) { |