From 89d60fcebbd86c971b9b564c7bd68903978c0649 Mon Sep 17 00:00:00 2001 From: Reinier Zwitserloot Date: Fri, 4 Dec 2009 21:16:33 +0100 Subject: Fix for issue #75: If 'setURL' exists, then lombok will no longer make a 'setUrl' field if you have a field named 'url'. --- src/core/lombok/javac/handlers/HandleData.java | 2 +- src/core/lombok/javac/handlers/HandleGetter.java | 2 +- src/core/lombok/javac/handlers/HandleSetter.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src/core/lombok/javac') diff --git a/src/core/lombok/javac/handlers/HandleData.java b/src/core/lombok/javac/handlers/HandleData.java index 128db8b0..88c0553c 100644 --- a/src/core/lombok/javac/handlers/HandleData.java +++ b/src/core/lombok/javac/handlers/HandleData.java @@ -101,7 +101,7 @@ public class HandleData implements JavacAnnotationHandler { injectMethod(typeNode, constructor); } - if (!staticConstructorName.isEmpty() && methodExists("of", typeNode) == MemberExistsResult.NOT_EXISTS) { + if (!staticConstructorName.isEmpty() && methodExists("of", typeNode, false) == MemberExistsResult.NOT_EXISTS) { JCMethodDecl staticConstructor = createStaticConstructor(staticConstructorName, typeNode, nodesForConstructor); injectMethod(typeNode, staticConstructor); } diff --git a/src/core/lombok/javac/handlers/HandleGetter.java b/src/core/lombok/javac/handlers/HandleGetter.java index 46d245b6..14570187 100644 --- a/src/core/lombok/javac/handlers/HandleGetter.java +++ b/src/core/lombok/javac/handlers/HandleGetter.java @@ -100,7 +100,7 @@ public class HandleGetter implements JavacAnnotationHandler { String methodName = toGetterName(fieldDecl); for (String altName : toAllGetterNames(fieldDecl)) { - switch (methodExists(altName, fieldNode)) { + switch (methodExists(altName, fieldNode, false)) { case EXISTS_BY_LOMBOK: return true; case EXISTS_BY_USER: diff --git a/src/core/lombok/javac/handlers/HandleSetter.java b/src/core/lombok/javac/handlers/HandleSetter.java index 4726f771..1d1421b9 100644 --- a/src/core/lombok/javac/handlers/HandleSetter.java +++ b/src/core/lombok/javac/handlers/HandleSetter.java @@ -101,7 +101,7 @@ public class HandleSetter implements JavacAnnotationHandler { JCVariableDecl fieldDecl = (JCVariableDecl)fieldNode.get(); String methodName = toSetterName(fieldDecl); - switch (methodExists(methodName, fieldNode)) { + switch (methodExists(methodName, fieldNode, false)) { case EXISTS_BY_LOMBOK: return true; case EXISTS_BY_USER: -- cgit