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/eclipse/handlers/HandleData.java | 2 +- src/core/lombok/eclipse/handlers/HandleGetter.java | 2 +- src/core/lombok/eclipse/handlers/HandleSetter.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src/core/lombok/eclipse') diff --git a/src/core/lombok/eclipse/handlers/HandleData.java b/src/core/lombok/eclipse/handlers/HandleData.java index 4e23bbf4..bbf1822e 100644 --- a/src/core/lombok/eclipse/handlers/HandleData.java +++ b/src/core/lombok/eclipse/handlers/HandleData.java @@ -119,7 +119,7 @@ public class HandleData implements EclipseAnnotationHandler { } if (ann.staticConstructor().length() > 0) { - if (methodExists("of", typeNode) == MemberExistsResult.NOT_EXISTS) { + if (methodExists("of", typeNode, false) == MemberExistsResult.NOT_EXISTS) { MethodDeclaration staticConstructor = createStaticConstructor( ann.staticConstructor(), typeNode, nodesForConstructor, ast); injectMethod(typeNode, staticConstructor); diff --git a/src/core/lombok/eclipse/handlers/HandleGetter.java b/src/core/lombok/eclipse/handlers/HandleGetter.java index a020aeed..d786f20f 100644 --- a/src/core/lombok/eclipse/handlers/HandleGetter.java +++ b/src/core/lombok/eclipse/handlers/HandleGetter.java @@ -99,7 +99,7 @@ public class HandleGetter implements EclipseAnnotationHandler { int modifier = toEclipseModifier(level) | (field.modifiers & ClassFileConstants.AccStatic); for (String altName : TransformationsUtil.toAllGetterNames(fieldName, isBoolean)) { - 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/eclipse/handlers/HandleSetter.java b/src/core/lombok/eclipse/handlers/HandleSetter.java index d1f47513..7760acd9 100644 --- a/src/core/lombok/eclipse/handlers/HandleSetter.java +++ b/src/core/lombok/eclipse/handlers/HandleSetter.java @@ -103,7 +103,7 @@ public class HandleSetter implements EclipseAnnotationHandler { int modifier = toEclipseModifier(level) | (field.modifiers & ClassFileConstants.AccStatic); - switch (methodExists(setterName, fieldNode)) { + switch (methodExists(setterName, fieldNode, false)) { case EXISTS_BY_LOMBOK: return true; case EXISTS_BY_USER: -- cgit