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. --- .../lombok/javac/handlers/JavacHandlerUtil.java | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) (limited to 'src/core/lombok/javac/handlers') diff --git a/src/core/lombok/javac/handlers/JavacHandlerUtil.java b/src/core/lombok/javac/handlers/JavacHandlerUtil.java index acfc82c9..aa4e1bb2 100644 --- a/src/core/lombok/javac/handlers/JavacHandlerUtil.java +++ b/src/core/lombok/javac/handlers/JavacHandlerUtil.java @@ -294,19 +294,15 @@ public class JavacHandlerUtil { JCVariableDecl decl = (JCVariableDecl)field.get(); JavacNode typeNode = field.up(); for (String potentialGetterName : toAllGetterNames(decl)) { - switch (methodExists(potentialGetterName, typeNode, false)) { - case EXISTS_BY_LOMBOK: - case EXISTS_BY_USER: - for (JavacNode potentialGetter : typeNode.down()) { - if (potentialGetter.getKind() != Kind.METHOD) continue; - JCMethodDecl method = (JCMethodDecl) potentialGetter.get(); - if (!method.name.contentEquals(potentialGetterName)) continue; - /** static getX() methods don't count. */ - if ((method.mods.flags & Flags.STATIC) != 0) continue; - /** Nor do getters with a non-empty parameter list. */ - if (method.params != null && method.params.size() > 0) continue; - return new GetterMethod(method.name, method.restype); - } + for (JavacNode potentialGetter : typeNode.down()) { + if (potentialGetter.getKind() != Kind.METHOD) continue; + JCMethodDecl method = (JCMethodDecl) potentialGetter.get(); + if (!method.name.toString().equalsIgnoreCase(potentialGetterName)) continue; + /** static getX() methods don't count. */ + if ((method.mods.flags & Flags.STATIC) != 0) continue; + /** Nor do getters with a non-empty parameter list. */ + if (method.params != null && method.params.size() > 0) continue; + return new GetterMethod(method.name, method.restype); } } -- cgit