aboutsummaryrefslogtreecommitdiff
path: root/src/core/lombok/javac/handlers
diff options
context:
space:
mode:
authorReinier Zwitserloot <reinier@zwitserloot.com>2010-12-31 10:24:47 +0100
committerReinier Zwitserloot <reinier@zwitserloot.com>2010-12-31 10:24:47 +0100
commit59e2a0ff1d347bb1a7d02b7ac37b1f9d38647e60 (patch)
treed4bd142aa6111db9681870bd2b7e87b2eb725f5b /src/core/lombok/javac/handlers
parent49100b43c084f6774d43d93eee98440253965047 (diff)
downloadlombok-59e2a0ff1d347bb1a7d02b7ac37b1f9d38647e60.tar.gz
lombok-59e2a0ff1d347bb1a7d02b7ac37b1f9d38647e60.tar.bz2
lombok-59e2a0ff1d347bb1a7d02b7ac37b1f9d38647e60.zip
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.
Diffstat (limited to 'src/core/lombok/javac/handlers')
-rw-r--r--src/core/lombok/javac/handlers/JavacHandlerUtil.java22
1 files changed, 9 insertions, 13 deletions
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);
}
}