diff options
author | Reinier Zwitserloot <reinier@zwitserloot.com> | 2010-12-31 10:24:47 +0100 |
---|---|---|
committer | Reinier Zwitserloot <reinier@zwitserloot.com> | 2010-12-31 10:24:47 +0100 |
commit | 59e2a0ff1d347bb1a7d02b7ac37b1f9d38647e60 (patch) | |
tree | d4bd142aa6111db9681870bd2b7e87b2eb725f5b /src/core/lombok/eclipse | |
parent | 49100b43c084f6774d43d93eee98440253965047 (diff) | |
download | lombok-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/eclipse')
-rw-r--r-- | src/core/lombok/eclipse/handlers/EclipseHandlerUtil.java | 24 |
1 files changed, 10 insertions, 14 deletions
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); } } |