From aa5d3b8bb2cb2bf068f4b4728a9e765968c673d4 Mon Sep 17 00:00:00 2001
From: Reinier Zwitserloot <reinier@zwitserloot.com>
Date: Thu, 22 Mar 2012 16:53:09 +0100
Subject: Bug fixes for updates to getter/setter stuff based on @Accessors.

---
 .../lombok/javac/handlers/JavacHandlerUtil.java    | 23 ++++++++++------------
 1 file changed, 10 insertions(+), 13 deletions(-)

(limited to 'src/core/lombok/javac')

diff --git a/src/core/lombok/javac/handlers/JavacHandlerUtil.java b/src/core/lombok/javac/handlers/JavacHandlerUtil.java
index 245636b7..c8538296 100644
--- a/src/core/lombok/javac/handlers/JavacHandlerUtil.java
+++ b/src/core/lombok/javac/handlers/JavacHandlerUtil.java
@@ -279,9 +279,7 @@ public class JavacHandlerUtil {
 	 */
 	public static java.util.List<String> toAllGetterNames(JavacNode field) {
 		String fieldName = field.getName();
-		
-		boolean isBoolean = ((JCVariableDecl) field.get()).vartype.toString().equals("boolean");
-		
+		boolean isBoolean = isBoolean(field);
 		AnnotationValues<Accessors> accessors = JavacHandlerUtil.getAccessorsForField(field);
 		
 		return TransformationsUtil.toAllGetterNames(accessors, fieldName, isBoolean);
@@ -294,9 +292,7 @@ public class JavacHandlerUtil {
 	 */
 	public static String toGetterName(JavacNode field) {
 		String fieldName = field.getName();
-		
-		boolean isBoolean = ((JCVariableDecl) field.get()).vartype.toString().equals("boolean");
-		
+		boolean isBoolean = isBoolean(field);
 		AnnotationValues<Accessors> accessors = JavacHandlerUtil.getAccessorsForField(field);
 		
 		return TransformationsUtil.toGetterName(accessors, fieldName, isBoolean);
@@ -308,9 +304,7 @@ public class JavacHandlerUtil {
 	 */
 	public static java.util.List<String> toAllSetterNames(JavacNode field) {
 		String fieldName = field.getName();
-		
-		boolean isBoolean = ((JCVariableDecl) field.get()).vartype.toString().equals("boolean");
-		
+		boolean isBoolean = isBoolean(field);
 		AnnotationValues<Accessors> accessors = JavacHandlerUtil.getAccessorsForField(field);
 		
 		return TransformationsUtil.toAllSetterNames(accessors, fieldName, isBoolean);
@@ -323,14 +317,17 @@ public class JavacHandlerUtil {
 	 */
 	public static String toSetterName(JavacNode field) {
 		String fieldName = field.getName();
-		
-		boolean isBoolean = ((JCVariableDecl) field.get()).toString().equals("boolean");
-		
+		boolean isBoolean = isBoolean(field);
 		AnnotationValues<Accessors> accessors = JavacHandlerUtil.getAccessorsForField(field);
 		
 		return TransformationsUtil.toSetterName(accessors, fieldName, isBoolean);
 	}
 	
+	private static boolean isBoolean(JavacNode field) {
+		JCExpression varType = ((JCVariableDecl) field.get()).vartype;
+		return varType != null && varType.toString().equals("boolean");
+	}
+	
 	public static AnnotationValues<Accessors> getAccessorsForField(JavacNode field) {
 		for (JavacNode node : field.down()) {
 			if (annotationTypeMatches(Accessors.class, node)) {
@@ -345,7 +342,7 @@ public class JavacHandlerUtil {
 					return createAnnotation(Accessors.class, node);
 				}
 			}
-			current = field.up();
+			current = current.up();
 		}
 		
 		return AnnotationValues.of(Accessors.class, field);
-- 
cgit