1 files changed, 25 insertions, 48 deletions

diff --git a/src/lombok/eclipse/handlers/HandleGetter.java b/src/lombok/eclipse/handlers/HandleGetter.java
index 6be978c6..ca561a48 100644
--- a/src/lombok/eclipse/handlers/HandleGetter.java
+++ b/src/lombok/eclipse/handlers/HandleGetter.java
@@ -1,8 +1,7 @@
 package lombok.eclipse.handlers;
 
-import java.lang.reflect.Modifier;
+import static lombok.eclipse.handlers.PKG.*;
 
-import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.core.AnnotationValues;
 import lombok.core.TransformationsUtil;
@@ -25,10 +24,6 @@ import org.mangosdk.spi.ProviderFor;
 
 @ProviderFor(EclipseAnnotationHandler.class)
 public class HandleGetter implements EclipseAnnotationHandler<Getter> {
-	private void generateDuplicateGetterWarning(Node annotationNode, String methodName) {
-		annotationNode.addWarning(String.format("Not generating %s(): A method with that name already exists",  methodName));
-	}
-	
 	@Override public boolean handle(AnnotationValues<Getter> annotation, Annotation ast, Node annotationNode) {
 		if ( !(annotationNode.up().get() instanceof FieldDeclaration) ) return false;
 		FieldDeclaration field = (FieldDeclaration) annotationNode.up().get();
@@ -39,17 +34,37 @@ public class HandleGetter implements EclipseAnnotationHandler<Getter> {
 		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);
+				annotationNode.addWarning(String.format(
+						"Not generating %s(): A method with that name already exists",  getterName));
 				return false;
 			}
 		}
 		
+		int modifier = toModifier(annotation.getInstance().value());
+		
+		MethodDeclaration method = generateGetter(parent, field, getterName, modifier, ast);
+		
+		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;
+		}
+		
+		return true;
+	}
+	
+	private MethodDeclaration generateGetter(TypeDeclaration parent, FieldDeclaration field, String name,
+			int modifier, Annotation ast) {
 		MethodDeclaration method = new MethodDeclaration(parent.compilationResult);
-		method.modifiers = toModifier(annotation.getInstance().value());
+		method.modifiers = modifier;
 		method.returnType = field.type;
 		method.annotations = null;
 		method.arguments = null;
-		method.selector = getterName.toCharArray();
+		method.selector = name.toCharArray();
 		method.binding = null;
 		method.thrownExceptions = null;
 		method.typeParameters = null;
@@ -60,44 +75,6 @@ public class HandleGetter implements EclipseAnnotationHandler<Getter> {
 		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;
-		}
-		
-		return true;
+		return method;
 	}
-	
-	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);
-	}
-	
 }