From d7ee0bc8a5a36e5968741e0e0a445a165b32f1e5 Mon Sep 17 00:00:00 2001 From: Reinier Zwitserloot Date: Tue, 20 Jul 2010 11:58:56 +0200 Subject: @Getter int x, y; used to only apply to 'x', now it applies to both x and y. Fixes issue #54 --- src/core/lombok/core/LombokNode.java | 26 ++++++++++++++++++++++ src/core/lombok/eclipse/EclipseNode.java | 10 +++++++++ src/core/lombok/eclipse/handlers/HandleGetter.java | 12 +++++++++- src/core/lombok/eclipse/handlers/HandleSetter.java | 10 ++++++++- src/core/lombok/javac/JavacNode.java | 10 +++++++++ src/core/lombok/javac/handlers/HandleGetter.java | 14 +++++++++++- src/core/lombok/javac/handlers/HandleSetter.java | 13 ++++++++++- 7 files changed, 91 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/core/lombok/core/LombokNode.java b/src/core/lombok/core/LombokNode.java index c58eadf3..211092ec 100644 --- a/src/core/lombok/core/LombokNode.java +++ b/src/core/lombok/core/LombokNode.java @@ -23,6 +23,7 @@ package lombok.core; import java.util.ArrayList; import java.util.Collection; +import java.util.Collections; import java.util.IdentityHashMap; import java.util.List; import java.util.Map; @@ -167,6 +168,31 @@ public abstract class LombokNode, L extends LombokNode upFromAnnotationToFields() { + if (getKind() != Kind.ANNOTATION) return Collections.emptyList(); + L field = up(); + if (field == null || field.getKind() != Kind.FIELD) return Collections.emptyList(); + L type = field.up(); + if (type == null || type.getKind() != Kind.TYPE) return Collections.emptyList(); + + List fields = new ArrayList(); + for (L potentialField : type.down()) { + if (potentialField.getKind() != Kind.FIELD) continue; + if (fieldContainsAnnotation(potentialField.get(), get())) fields.add(potentialField); + } + + return fields; + } + + /** + * Return {@code true} if the annotation is attached to the field. + */ + protected abstract boolean fieldContainsAnnotation(N field, N annotation); + /** * Returns the direct parent node in the AST tree of this node. For example, a local variable declaration's * direct parent can be e.g. an If block, but its {@code up()} {@code LombokNode} is the {@code Method} that contains it. diff --git a/src/core/lombok/eclipse/EclipseNode.java b/src/core/lombok/eclipse/EclipseNode.java index 668e6a6e..335845b5 100644 --- a/src/core/lombok/eclipse/EclipseNode.java +++ b/src/core/lombok/eclipse/EclipseNode.java @@ -122,6 +122,16 @@ public class EclipseNode extends lombok.core.LombokNode { if (node == null) return false; if (node.getKind() == Kind.FIELD) { - return createGetterForField(level, node, annotationNode, annotationNode.get(), true); + return createGetterForFields(level, annotationNode.upFromAnnotationToFields(), annotationNode, annotationNode.get(), true); } if (node.getKind() == Kind.TYPE) { TypeDeclaration typeDecl = null; @@ -117,6 +120,13 @@ public class HandleGetter implements EclipseAnnotationHandler { return false; } + private boolean createGetterForFields(AccessLevel level, Collection fieldNodes, EclipseNode errorNode, ASTNode source, boolean whineIfExists) { + for (EclipseNode fieldNode : fieldNodes) { + createGetterForField(level, fieldNode, errorNode, source, whineIfExists); + } + return true; + } + private boolean createGetterForField(AccessLevel level, EclipseNode fieldNode, EclipseNode errorNode, ASTNode source, boolean whineIfExists) { if (fieldNode.getKind() != Kind.FIELD) { diff --git a/src/core/lombok/eclipse/handlers/HandleSetter.java b/src/core/lombok/eclipse/handlers/HandleSetter.java index 3dbbb2b5..ccdbbb2c 100644 --- a/src/core/lombok/eclipse/handlers/HandleSetter.java +++ b/src/core/lombok/eclipse/handlers/HandleSetter.java @@ -25,6 +25,7 @@ import static lombok.eclipse.Eclipse.*; import static lombok.eclipse.handlers.EclipseHandlerUtil.*; import java.lang.reflect.Modifier; +import java.util.Collection; import lombok.AccessLevel; import lombok.Setter; @@ -101,7 +102,7 @@ public class HandleSetter implements EclipseAnnotationHandler { if (node == null) return false; if (node.getKind() == Kind.FIELD) { - return createSetterForField(level, node, annotationNode, annotationNode.get(), true); + return createSetterForFields(level, annotationNode.upFromAnnotationToFields(), annotationNode, annotationNode.get(), true); } if (node.getKind() == Kind.TYPE) { TypeDeclaration typeDecl = null; @@ -124,6 +125,13 @@ public class HandleSetter implements EclipseAnnotationHandler { return false; } + private boolean createSetterForFields(AccessLevel level, Collection fieldNodes, EclipseNode errorNode, ASTNode source, boolean whineIfExists) { + for (EclipseNode fieldNode : fieldNodes) { + createSetterForField(level, fieldNode, errorNode, source, whineIfExists); + } + return true; + } + private boolean createSetterForField(AccessLevel level, EclipseNode fieldNode, EclipseNode errorNode, ASTNode pos, boolean whineIfExists) { if (fieldNode.getKind() != Kind.FIELD) { diff --git a/src/core/lombok/javac/JavacNode.java b/src/core/lombok/javac/JavacNode.java index 4981a24e..286672d8 100644 --- a/src/core/lombok/javac/JavacNode.java +++ b/src/core/lombok/javac/JavacNode.java @@ -146,6 +146,16 @@ public class JavacNode extends lombok.core.LombokNode { } @Override public boolean handle(AnnotationValues annotation, JCAnnotation ast, JavacNode annotationNode) { + Collection fields = annotationNode.upFromAnnotationToFields(); markAnnotationAsProcessed(annotationNode, Getter.class); deleteImportFromCompilationUnit(annotationNode, "lombok.AccessLevel"); JavacNode node = annotationNode.up(); @@ -102,7 +106,7 @@ public class HandleGetter implements JavacAnnotationHandler { if (node == null) return false; if (node.getKind() == Kind.FIELD) { - return createGetterForField(level, node, annotationNode, true); + return createGetterForFields(level, fields, annotationNode, true); } if (node.getKind() == Kind.TYPE) { JCClassDecl typeDecl = null; @@ -124,6 +128,14 @@ public class HandleGetter implements JavacAnnotationHandler { return false; } + private boolean createGetterForFields(AccessLevel level, Collection fieldNodes, JavacNode errorNode, boolean whineIfExists) { + for (JavacNode fieldNode : fieldNodes) { + createGetterForField(level, fieldNode, errorNode, whineIfExists); + } + + return true; + } + private boolean createGetterForField(AccessLevel level, JavacNode fieldNode, JavacNode errorNode, boolean whineIfExists) { if (fieldNode.getKind() != Kind.FIELD) { diff --git a/src/core/lombok/javac/handlers/HandleSetter.java b/src/core/lombok/javac/handlers/HandleSetter.java index dfc9c8ba..8728ceb3 100644 --- a/src/core/lombok/javac/handlers/HandleSetter.java +++ b/src/core/lombok/javac/handlers/HandleSetter.java @@ -24,6 +24,8 @@ package lombok.javac.handlers; import static com.sun.tools.javac.code.TypeTags.*; import static lombok.javac.handlers.JavacHandlerUtil.*; +import java.util.Collection; + import javax.lang.model.type.NoType; import javax.lang.model.type.TypeKind; import javax.lang.model.type.TypeVisitor; @@ -103,6 +105,7 @@ public class HandleSetter implements JavacAnnotationHandler { } @Override public boolean handle(AnnotationValues annotation, JCAnnotation ast, JavacNode annotationNode) { + Collection fields = annotationNode.upFromAnnotationToFields(); markAnnotationAsProcessed(annotationNode, Setter.class); deleteImportFromCompilationUnit(annotationNode, "lombok.AccessLevel"); JavacNode node = annotationNode.up(); @@ -112,7 +115,7 @@ public class HandleSetter implements JavacAnnotationHandler { if (node == null) return false; if (node.getKind() == Kind.FIELD) { - return createSetterForField(level, node, annotationNode, true); + return createSetterForFields(level, fields, annotationNode, true); } if (node.getKind() == Kind.TYPE) { JCClassDecl typeDecl = null; @@ -134,6 +137,14 @@ public class HandleSetter implements JavacAnnotationHandler { return false; } + private boolean createSetterForFields(AccessLevel level, Collection fieldNodes, JavacNode errorNode, boolean whineIfExists) { + for (JavacNode fieldNode : fieldNodes) { + createSetterForField(level, fieldNode, errorNode, whineIfExists); + } + + return true; + } + private boolean createSetterForField(AccessLevel level, JavacNode fieldNode, JavacNode errorNode, boolean whineIfExists) { if (fieldNode.getKind() != Kind.FIELD) { -- cgit