From e737d64242329391ef681e51b36886aaf4d6fe35 Mon Sep 17 00:00:00 2001 From: Reinier Zwitserloot Date: Wed, 17 Jun 2009 20:12:03 +0200 Subject: Renamed the Handler implementations. --- src/lombok/eclipse/handlers/HandleGetter.java | 101 ++++++++++++++++++++++ src/lombok/eclipse/handlers/HandleGetter_ecj.java | 101 ---------------------- src/lombok/javac/handlers/HandleGetter.java | 60 +++++++++++++ src/lombok/javac/handlers/HandleGetter_javac.java | 60 ------------- 4 files changed, 161 insertions(+), 161 deletions(-) create mode 100644 src/lombok/eclipse/handlers/HandleGetter.java delete mode 100644 src/lombok/eclipse/handlers/HandleGetter_ecj.java create mode 100644 src/lombok/javac/handlers/HandleGetter.java delete mode 100644 src/lombok/javac/handlers/HandleGetter_javac.java diff --git a/src/lombok/eclipse/handlers/HandleGetter.java b/src/lombok/eclipse/handlers/HandleGetter.java new file mode 100644 index 00000000..bf1aa9b0 --- /dev/null +++ b/src/lombok/eclipse/handlers/HandleGetter.java @@ -0,0 +1,101 @@ +package lombok.eclipse.handlers; + +import java.lang.reflect.Modifier; + +import lombok.AccessLevel; +import lombok.Getter; +import lombok.core.AnnotationValues; +import lombok.core.TransformationsUtil; +import lombok.eclipse.EclipseAnnotationHandler; +import lombok.eclipse.EclipseAST.Node; + +import org.eclipse.jdt.internal.compiler.ast.ASTNode; +import org.eclipse.jdt.internal.compiler.ast.AbstractMethodDeclaration; +import org.eclipse.jdt.internal.compiler.ast.Annotation; +import org.eclipse.jdt.internal.compiler.ast.Expression; +import org.eclipse.jdt.internal.compiler.ast.FieldDeclaration; +import org.eclipse.jdt.internal.compiler.ast.MethodDeclaration; +import org.eclipse.jdt.internal.compiler.ast.ReturnStatement; +import org.eclipse.jdt.internal.compiler.ast.SingleNameReference; +import org.eclipse.jdt.internal.compiler.ast.Statement; +import org.eclipse.jdt.internal.compiler.ast.TypeDeclaration; +import org.eclipse.jdt.internal.compiler.ast.TypeReference; +import org.eclipse.jdt.internal.compiler.lookup.MethodScope; +import org.mangosdk.spi.ProviderFor; + +@ProviderFor(EclipseAnnotationHandler.class) +public class HandleGetter implements EclipseAnnotationHandler { + private void generateDuplicateGetterWarning(Node annotationNode, String methodName) { + annotationNode.addWarning(String.format("Not generating %s(): A method with that name already exists", methodName)); + } + + @Override public void handle(AnnotationValues annotation, Annotation ast, Node annotationNode) { + if ( !(annotationNode.up().get() instanceof FieldDeclaration) ) return; + FieldDeclaration field = (FieldDeclaration) annotationNode.up().get(); + TypeReference fieldType = field.type; + String getterName = TransformationsUtil.toGetterName( + new String(field.name), nameEquals(fieldType.getTypeName(), "boolean")); + + TypeDeclaration parent = (TypeDeclaration) annotationNode.up().up().get(); + if ( parent.methods != null ) for ( AbstractMethodDeclaration method : parent.methods ) { + if ( method.selector != null && new String(method.selector).equals(getterName) ) { + generateDuplicateGetterWarning(annotationNode, getterName); + return; + } + } + + MethodDeclaration method = new MethodDeclaration(parent.compilationResult); + method.modifiers = toModifier(annotation.getInstance().value()); + method.returnType = field.type; + method.annotations = null; + method.arguments = null; + method.selector = getterName.toCharArray(); + method.binding = null; + method.thrownExceptions = null; + method.typeParameters = null; + method.scope = parent.scope == null ? null : new MethodScope(parent.scope, method, false); + method.bits |= ASTNode.Bit24; + Expression fieldExpression = new SingleNameReference(field.name, (field.declarationSourceStart << 32) | field.declarationSourceEnd); + Statement returnStatement = new ReturnStatement(fieldExpression, field.sourceStart, field.sourceEnd); + method.bodyStart = method.declarationSourceStart = method.sourceStart = ast.sourceStart; + method.bodyEnd = method.declarationSourceEnd = method.sourceEnd = ast.sourceEnd; + method.statements = new Statement[] { returnStatement }; + if ( parent.methods == null ) { + parent.methods = new AbstractMethodDeclaration[1]; + parent.methods[0] = method; + } else { + AbstractMethodDeclaration[] newArray = new AbstractMethodDeclaration[parent.methods.length + 1]; + System.arraycopy(parent.methods, 0, newArray, 0, parent.methods.length); + newArray[parent.methods.length] = method; + parent.methods = newArray; + } + } + + private int toModifier(AccessLevel value) { + switch ( value ) { + case MODULE: + case PACKAGE: + return 0; + default: + case PUBLIC: + return Modifier.PUBLIC; + case PROTECTED: + return Modifier.PROTECTED; + case PRIVATE: + return Modifier.PRIVATE; + } + } + + private boolean nameEquals(char[][] typeName, String string) { + StringBuilder sb = new StringBuilder(); + boolean first = true; + for ( char[] elem : typeName ) { + if ( first ) first = false; + else sb.append('.'); + sb.append(elem); + } + + return string.contentEquals(sb); + } + +} diff --git a/src/lombok/eclipse/handlers/HandleGetter_ecj.java b/src/lombok/eclipse/handlers/HandleGetter_ecj.java deleted file mode 100644 index cde71f83..00000000 --- a/src/lombok/eclipse/handlers/HandleGetter_ecj.java +++ /dev/null @@ -1,101 +0,0 @@ -package lombok.eclipse.handlers; - -import java.lang.reflect.Modifier; - -import lombok.AccessLevel; -import lombok.Getter; -import lombok.core.AnnotationValues; -import lombok.core.TransformationsUtil; -import lombok.eclipse.EclipseAnnotationHandler; -import lombok.eclipse.EclipseAST.Node; - -import org.eclipse.jdt.internal.compiler.ast.ASTNode; -import org.eclipse.jdt.internal.compiler.ast.AbstractMethodDeclaration; -import org.eclipse.jdt.internal.compiler.ast.Annotation; -import org.eclipse.jdt.internal.compiler.ast.Expression; -import org.eclipse.jdt.internal.compiler.ast.FieldDeclaration; -import org.eclipse.jdt.internal.compiler.ast.MethodDeclaration; -import org.eclipse.jdt.internal.compiler.ast.ReturnStatement; -import org.eclipse.jdt.internal.compiler.ast.SingleNameReference; -import org.eclipse.jdt.internal.compiler.ast.Statement; -import org.eclipse.jdt.internal.compiler.ast.TypeDeclaration; -import org.eclipse.jdt.internal.compiler.ast.TypeReference; -import org.eclipse.jdt.internal.compiler.lookup.MethodScope; -import org.mangosdk.spi.ProviderFor; - -@ProviderFor(EclipseAnnotationHandler.class) -public class HandleGetter_ecj implements EclipseAnnotationHandler { - private void generateDuplicateGetterWarning(Node annotationNode, String methodName) { - annotationNode.addWarning(String.format("Not generating %s(): A method with that name already exists", methodName)); - } - - @Override public void handle(AnnotationValues annotation, Annotation ast, Node annotationNode) { - if ( !(annotationNode.up().get() instanceof FieldDeclaration) ) return; - FieldDeclaration field = (FieldDeclaration) annotationNode.up().get(); - TypeReference fieldType = field.type; - String getterName = TransformationsUtil.toGetterName( - new String(field.name), nameEquals(fieldType.getTypeName(), "boolean")); - - TypeDeclaration parent = (TypeDeclaration) annotationNode.up().up().get(); - if ( parent.methods != null ) for ( AbstractMethodDeclaration method : parent.methods ) { - if ( method.selector != null && new String(method.selector).equals(getterName) ) { - generateDuplicateGetterWarning(annotationNode, getterName); - return; - } - } - - MethodDeclaration method = new MethodDeclaration(parent.compilationResult); - method.modifiers = toModifier(annotation.getInstance().value()); - method.returnType = field.type; - method.annotations = null; - method.arguments = null; - method.selector = getterName.toCharArray(); - method.binding = null; - method.thrownExceptions = null; - method.typeParameters = null; - method.scope = parent.scope == null ? null : new MethodScope(parent.scope, method, false); - method.bits |= ASTNode.Bit24; - Expression fieldExpression = new SingleNameReference(field.name, (field.declarationSourceStart << 32) | field.declarationSourceEnd); - Statement returnStatement = new ReturnStatement(fieldExpression, field.sourceStart, field.sourceEnd); - method.bodyStart = method.declarationSourceStart = method.sourceStart = ast.sourceStart; - method.bodyEnd = method.declarationSourceEnd = method.sourceEnd = ast.sourceEnd; - method.statements = new Statement[] { returnStatement }; - if ( parent.methods == null ) { - parent.methods = new AbstractMethodDeclaration[1]; - parent.methods[0] = method; - } else { - AbstractMethodDeclaration[] newArray = new AbstractMethodDeclaration[parent.methods.length + 1]; - System.arraycopy(parent.methods, 0, newArray, 0, parent.methods.length); - newArray[parent.methods.length] = method; - parent.methods = newArray; - } - } - - private int toModifier(AccessLevel value) { - switch ( value ) { - case MODULE: - case PACKAGE: - return 0; - default: - case PUBLIC: - return Modifier.PUBLIC; - case PROTECTED: - return Modifier.PROTECTED; - case PRIVATE: - return Modifier.PRIVATE; - } - } - - private boolean nameEquals(char[][] typeName, String string) { - StringBuilder sb = new StringBuilder(); - boolean first = true; - for ( char[] elem : typeName ) { - if ( first ) first = false; - else sb.append('.'); - sb.append(elem); - } - - return string.contentEquals(sb); - } - -} diff --git a/src/lombok/javac/handlers/HandleGetter.java b/src/lombok/javac/handlers/HandleGetter.java new file mode 100644 index 00000000..6e695c63 --- /dev/null +++ b/src/lombok/javac/handlers/HandleGetter.java @@ -0,0 +1,60 @@ +package lombok.javac.handlers; + +import static lombok.javac.handlers.PKG.*; + +import lombok.Getter; +import lombok.core.AnnotationValues; +import lombok.core.AST.Kind; +import lombok.javac.JavacAnnotationHandler; +import lombok.javac.JavacAST; + +import org.mangosdk.spi.ProviderFor; + +import com.sun.source.tree.MethodTree; +import com.sun.tools.javac.tree.JCTree; +import com.sun.tools.javac.tree.TreeMaker; +import com.sun.tools.javac.tree.JCTree.JCAnnotation; +import com.sun.tools.javac.tree.JCTree.JCBlock; +import com.sun.tools.javac.tree.JCTree.JCClassDecl; +import com.sun.tools.javac.tree.JCTree.JCExpression; +import com.sun.tools.javac.tree.JCTree.JCStatement; +import com.sun.tools.javac.tree.JCTree.JCTypeParameter; +import com.sun.tools.javac.tree.JCTree.JCVariableDecl; +import com.sun.tools.javac.util.List; +import com.sun.tools.javac.util.Name; + +@ProviderFor(JavacAnnotationHandler.class) +public class HandleGetter implements JavacAnnotationHandler { + @Override public void handle(AnnotationValues annotation, JCAnnotation ast, JavacAST.Node node) { + if ( node.up().getKind() != Kind.FIELD ) { + node.addError("@Getter is only supported on a field."); + return; + } + + Getter getter = annotation.getInstance(); + + JCClassDecl javacClassTree = (JCClassDecl) node.up().up().get(); + + int access = toJavacModifier(getter.value()); + + MethodTree getterMethod = createGetter(access, node.up(), node.getTreeMaker()); + javacClassTree.defs = javacClassTree.defs.append((JCTree)getterMethod); + } + + private MethodTree createGetter(int access, JavacAST.Node field, TreeMaker treeMaker) { + JCVariableDecl fieldNode = (JCVariableDecl) field.get(); + JCStatement returnStatement = treeMaker.Return(treeMaker.Ident(fieldNode.getName())); + + JCBlock methodBody = treeMaker.Block(0, List.of(returnStatement)); + Name methodName = field.toName(toGetterName((JCVariableDecl)field.get())); + JCExpression methodType = fieldNode.type != null ? treeMaker.Type(fieldNode.type) : fieldNode.vartype; + + List methodGenericParams = List.nil(); + List parameters = List.nil(); + List throwsClauses = List.nil(); + JCExpression annotationMethodDefaultValue = null; + + return treeMaker.MethodDef(treeMaker.Modifiers(access, List.nil()), methodName, methodType, + methodGenericParams, parameters, throwsClauses, methodBody, annotationMethodDefaultValue); + } +} diff --git a/src/lombok/javac/handlers/HandleGetter_javac.java b/src/lombok/javac/handlers/HandleGetter_javac.java deleted file mode 100644 index 8501b65f..00000000 --- a/src/lombok/javac/handlers/HandleGetter_javac.java +++ /dev/null @@ -1,60 +0,0 @@ -package lombok.javac.handlers; - -import static lombok.javac.handlers.PKG.*; - -import lombok.Getter; -import lombok.core.AnnotationValues; -import lombok.core.AST.Kind; -import lombok.javac.JavacAnnotationHandler; -import lombok.javac.JavacAST; - -import org.mangosdk.spi.ProviderFor; - -import com.sun.source.tree.MethodTree; -import com.sun.tools.javac.tree.JCTree; -import com.sun.tools.javac.tree.TreeMaker; -import com.sun.tools.javac.tree.JCTree.JCAnnotation; -import com.sun.tools.javac.tree.JCTree.JCBlock; -import com.sun.tools.javac.tree.JCTree.JCClassDecl; -import com.sun.tools.javac.tree.JCTree.JCExpression; -import com.sun.tools.javac.tree.JCTree.JCStatement; -import com.sun.tools.javac.tree.JCTree.JCTypeParameter; -import com.sun.tools.javac.tree.JCTree.JCVariableDecl; -import com.sun.tools.javac.util.List; -import com.sun.tools.javac.util.Name; - -@ProviderFor(JavacAnnotationHandler.class) -public class HandleGetter_javac implements JavacAnnotationHandler { - @Override public void handle(AnnotationValues annotation, JCAnnotation ast, JavacAST.Node node) { - if ( node.up().getKind() != Kind.FIELD ) { - node.addError("@Getter is only supported on a field."); - return; - } - - Getter getter = annotation.getInstance(); - - JCClassDecl javacClassTree = (JCClassDecl) node.up().up().get(); - - int access = toJavacModifier(getter.value()); - - MethodTree getterMethod = createGetter(access, node.up(), node.getTreeMaker()); - javacClassTree.defs = javacClassTree.defs.append((JCTree)getterMethod); - } - - private MethodTree createGetter(int access, JavacAST.Node field, TreeMaker treeMaker) { - JCVariableDecl fieldNode = (JCVariableDecl) field.get(); - JCStatement returnStatement = treeMaker.Return(treeMaker.Ident(fieldNode.getName())); - - JCBlock methodBody = treeMaker.Block(0, List.of(returnStatement)); - Name methodName = field.toName(toGetterName((JCVariableDecl)field.get())); - JCExpression methodType = fieldNode.type != null ? treeMaker.Type(fieldNode.type) : fieldNode.vartype; - - List methodGenericParams = List.nil(); - List parameters = List.nil(); - List throwsClauses = List.nil(); - JCExpression annotationMethodDefaultValue = null; - - return treeMaker.MethodDef(treeMaker.Modifiers(access, List.nil()), methodName, methodType, - methodGenericParams, parameters, throwsClauses, methodBody, annotationMethodDefaultValue); - } -} -- cgit