From 59e2a0ff1d347bb1a7d02b7ac37b1f9d38647e60 Mon Sep 17 00:00:00 2001 From: Reinier Zwitserloot Date: Fri, 31 Dec 2010 10:24:47 +0100 Subject: Presence of i.e. getABC() stops lombok from generating getAbc, but lombok will still attempt to call this nonexistent getAbc instead of getABC. Fixed. Fixes issue #173. --- .../eclipse/handlers/EclipseHandlerUtil.java | 24 +++++++++------------- 1 file changed, 10 insertions(+), 14 deletions(-) (limited to 'src/core/lombok/eclipse/handlers') diff --git a/src/core/lombok/eclipse/handlers/EclipseHandlerUtil.java b/src/core/lombok/eclipse/handlers/EclipseHandlerUtil.java index 293359dc..64eaa7e2 100644 --- a/src/core/lombok/eclipse/handlers/EclipseHandlerUtil.java +++ b/src/core/lombok/eclipse/handlers/EclipseHandlerUtil.java @@ -122,20 +122,16 @@ public class EclipseHandlerUtil { boolean isBoolean = nameEquals(fieldType.getTypeName(), "boolean") && fieldType.dimensions() == 0; EclipseNode typeNode = field.up(); for (String potentialGetterName : TransformationsUtil.toAllGetterNames(field.getName(), isBoolean)) { - switch (methodExists(potentialGetterName, typeNode, false)) { - case EXISTS_BY_LOMBOK: - case EXISTS_BY_USER: - for (EclipseNode potentialGetter : typeNode.down()) { - if (potentialGetter.getKind() != Kind.METHOD) continue; - if (!(potentialGetter.get() instanceof MethodDeclaration)) continue; - MethodDeclaration method = (MethodDeclaration) potentialGetter.get(); - if (!potentialGetterName.equals(new String(method.selector))) continue; - /** static getX() methods don't count. */ - if ((method.modifiers & ClassFileConstants.AccStatic) != 0) continue; - /** Nor do getters with a non-empty parameter list. */ - if (method.arguments != null && method.arguments.length > 0) continue; - return new GetterMethod(method.selector, method.returnType); - } + for (EclipseNode potentialGetter : typeNode.down()) { + if (potentialGetter.getKind() != Kind.METHOD) continue; + if (!(potentialGetter.get() instanceof MethodDeclaration)) continue; + MethodDeclaration method = (MethodDeclaration) potentialGetter.get(); + if (!potentialGetterName.equalsIgnoreCase(new String(method.selector))) continue; + /** static getX() methods don't count. */ + if ((method.modifiers & ClassFileConstants.AccStatic) != 0) continue; + /** Nor do getters with a non-empty parameter list. */ + if (method.arguments != null && method.arguments.length > 0) continue; + return new GetterMethod(method.selector, method.returnType); } } -- cgit