From 8517deb8be4a164644f5f884e8be0dec351b40ad Mon Sep 17 00:00:00 2001 From: Reinier Zwitserloot Date: Fri, 12 Jun 2009 03:44:40 +0200 Subject: Moved HandleGetter to its own package. This package should soon see HandleSetter, HandleAutoClose, etc. --- src/lombok/eclipse/HandleGetter_ecj.java | 70 ----------------------- src/lombok/eclipse/TransformEclipseAST.java | 1 + src/lombok/eclipse/handlers/HandleGetter_ecj.java | 70 +++++++++++++++++++++++ 3 files changed, 71 insertions(+), 70 deletions(-) delete mode 100644 src/lombok/eclipse/HandleGetter_ecj.java create mode 100644 src/lombok/eclipse/handlers/HandleGetter_ecj.java (limited to 'src') diff --git a/src/lombok/eclipse/HandleGetter_ecj.java b/src/lombok/eclipse/HandleGetter_ecj.java deleted file mode 100644 index fdfbd7be..00000000 --- a/src/lombok/eclipse/HandleGetter_ecj.java +++ /dev/null @@ -1,70 +0,0 @@ -package lombok.eclipse; - -import java.lang.reflect.Modifier; - -import lombok.eclipse.EclipseAST.Node; -import lombok.transformations.TransformationsUtil; - -import org.eclipse.jdt.internal.compiler.ast.AbstractMethodDeclaration; -import org.eclipse.jdt.internal.compiler.ast.Annotation; -import org.eclipse.jdt.internal.compiler.ast.ASTNode; -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; - -public class HandleGetter_ecj { - public void apply(Annotation annotation, Node node, FieldDeclaration field) { - TypeReference fieldType = field.type; - String getterName = TransformationsUtil.toGetterName( - new String(field.name), nameEquals(fieldType.getTypeName(), "boolean")); - - TypeDeclaration parent = (TypeDeclaration) node.up().getEclipseNode(); - if ( parent.methods != null ) for ( AbstractMethodDeclaration method : parent.methods ) { - if ( method.selector != null && new String(method.selector).equals(getterName) ) return; - } - - MethodDeclaration method = new MethodDeclaration(parent.compilationResult); - method.modifiers = Modifier.PUBLIC; - 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 = annotation.sourceStart; - method.bodyEnd = method.declarationSourceEnd = method.sourceEnd = annotation.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 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/TransformEclipseAST.java b/src/lombok/eclipse/TransformEclipseAST.java index 498b403f..d0685d1d 100644 --- a/src/lombok/eclipse/TransformEclipseAST.java +++ b/src/lombok/eclipse/TransformEclipseAST.java @@ -4,6 +4,7 @@ import java.util.Map; import java.util.WeakHashMap; import lombok.eclipse.EclipseAST.Node; +import lombok.eclipse.handlers.HandleGetter_ecj; import org.eclipse.jdt.internal.compiler.ast.Annotation; import org.eclipse.jdt.internal.compiler.ast.CompilationUnitDeclaration; diff --git a/src/lombok/eclipse/handlers/HandleGetter_ecj.java b/src/lombok/eclipse/handlers/HandleGetter_ecj.java new file mode 100644 index 00000000..e61eb64b --- /dev/null +++ b/src/lombok/eclipse/handlers/HandleGetter_ecj.java @@ -0,0 +1,70 @@ +package lombok.eclipse.handlers; + +import java.lang.reflect.Modifier; + +import lombok.eclipse.EclipseAST.Node; +import lombok.transformations.TransformationsUtil; + +import org.eclipse.jdt.internal.compiler.ast.AbstractMethodDeclaration; +import org.eclipse.jdt.internal.compiler.ast.Annotation; +import org.eclipse.jdt.internal.compiler.ast.ASTNode; +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; + +public class HandleGetter_ecj { + public void apply(Annotation annotation, Node node, FieldDeclaration field) { + TypeReference fieldType = field.type; + String getterName = TransformationsUtil.toGetterName( + new String(field.name), nameEquals(fieldType.getTypeName(), "boolean")); + + TypeDeclaration parent = (TypeDeclaration) node.up().getEclipseNode(); + if ( parent.methods != null ) for ( AbstractMethodDeclaration method : parent.methods ) { + if ( method.selector != null && new String(method.selector).equals(getterName) ) return; + } + + MethodDeclaration method = new MethodDeclaration(parent.compilationResult); + method.modifiers = Modifier.PUBLIC; + 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 = annotation.sourceStart; + method.bodyEnd = method.declarationSourceEnd = method.sourceEnd = annotation.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 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); + } +} -- cgit