1 files changed, 14 insertions, 13 deletions

diff --git a/src/lombok/javac/handlers/HandleGetter_javac.java b/src/lombok/javac/handlers/HandleGetter_javac.java
index 7863a097..8501b65f 100644
--- a/src/lombok/javac/handlers/HandleGetter_javac.java
+++ b/src/lombok/javac/handlers/HandleGetter_javac.java
@@ -2,17 +2,15 @@ package lombok.javac.handlers;
 
 import static lombok.javac.handlers.PKG.*;
 
-import javax.lang.model.element.Element;
-
 import lombok.Getter;
+import lombok.core.AnnotationValues;
+import lombok.core.AST.Kind;
 import lombok.javac.JavacAnnotationHandler;
-import lombok.javac.JavacNode;
+import lombok.javac.JavacAST;
 
 import org.mangosdk.spi.ProviderFor;
 
 import com.sun.source.tree.MethodTree;
-import com.sun.tools.javac.code.Symbol;
-import com.sun.tools.javac.code.Type;
 import com.sun.tools.javac.tree.JCTree;
 import com.sun.tools.javac.tree.TreeMaker;
 import com.sun.tools.javac.tree.JCTree.JCAnnotation;
@@ -27,26 +25,29 @@ import com.sun.tools.javac.util.Name;
 
 @ProviderFor(JavacAnnotationHandler.class)
 public class HandleGetter_javac implements JavacAnnotationHandler<Getter> {
-	@Override public void handle(JavacNode node, Getter getter) {
-		if ( !node.getJavacAST().getKind().isField() ) {
+	@Override public void handle(AnnotationValues<Getter> annotation, JCAnnotation ast, JavacAST.Node node) {
+		if ( node.up().getKind() != Kind.FIELD ) {
 			node.addError("@Getter is only supported on a field.");
 			return;
 		}
 		
-		JCClassDecl javacClassTree = node.getEnclosingType();
+		Getter getter = annotation.getInstance();
+		
+		JCClassDecl javacClassTree = (JCClassDecl) node.up().up().get();
 		
 		int access = toJavacModifier(getter.value());
 		
-		MethodTree getterMethod = createGetter(access, node.getJavacAST(), node.createTreeMaker(), node.createNameTable());
+		MethodTree getterMethod = createGetter(access, node.up(), node.getTreeMaker());
 		javacClassTree.defs = javacClassTree.defs.append((JCTree)getterMethod);
 	}
 	
-	private MethodTree createGetter(int access, Element field, TreeMaker treeMaker, Name.Table nameTable) {
-		JCStatement returnStatement = treeMaker.Return(treeMaker.Ident((Symbol)field));
+	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 = Name.fromString(nameTable, toGetterName(field));
-		JCExpression methodType = treeMaker.Type((Type)field.asType());
+		Name methodName = field.toName(toGetterName((JCVariableDecl)field.get()));
+		JCExpression methodType = fieldNode.type != null ? treeMaker.Type(fieldNode.type) : fieldNode.vartype;
 		
 		List<JCTypeParameter> methodGenericParams = List.nil();
 		List<JCVariableDecl> parameters = List.nil();