aboutsummaryrefslogtreecommitdiff
path: root/src/core
diff options
context:
space:
mode:
authorCaleb Brinkman <cbrinkman@sonatype.com>2019-10-28 12:09:15 -0500
committerCaleb Brinkman <cbrinkman@sonatype.com>2019-10-28 12:09:15 -0500
commit65302bc13a1ab670dac552e2214989c7381f71a8 (patch)
treee209bced6ea5bc42ea48c5e0bbdb80a3ff3ba1b1 /src/core
parent666defaff365d9841d5136063fc6f9e6ee5c0403 (diff)
downloadlombok-65302bc13a1ab670dac552e2214989c7381f71a8.tar.gz
lombok-65302bc13a1ab670dac552e2214989c7381f71a8.tar.bz2
lombok-65302bc13a1ab670dac552e2214989c7381f71a8.zip
More test fixes
Diffstat (limited to 'src/core')
-rwxr-xr-xsrc/core/lombok/eclipse/handlers/HandleBuilder.java12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/core/lombok/eclipse/handlers/HandleBuilder.java b/src/core/lombok/eclipse/handlers/HandleBuilder.java
index 017cde17..70b07fb8 100755
--- a/src/core/lombok/eclipse/handlers/HandleBuilder.java
+++ b/src/core/lombok/eclipse/handlers/HandleBuilder.java
@@ -931,12 +931,6 @@ public class HandleBuilder extends EclipseAnnotationHandler<Builder> {
FieldDeclaration fd = (FieldDeclaration) fieldNode.get();
char[] name = fd.name;
- for (int i = 0; i < len; i++) {
- if (!(existing[i] instanceof MethodDeclaration)) continue;
- char[] existingName = existing[i].selector;
- if (Arrays.equals(name, existingName) && !isTolerate(fieldNode, existing[i])) return;
- }
-
String setterPrefix = prefix.isEmpty() ? "set" : prefix;
String setterName;
if(fluent) {
@@ -945,6 +939,12 @@ public class HandleBuilder extends EclipseAnnotationHandler<Builder> {
setterName = HandlerUtil.buildAccessorName(setterPrefix, new String(paramName));
}
+ for (int i = 0; i < len; i++) {
+ if (!(existing[i] instanceof MethodDeclaration)) continue;
+ char[] existingName = existing[i].selector;
+ if (Arrays.equals(setterName.toCharArray(), existingName) && !isTolerate(fieldNode, existing[i])) return;
+ }
+
List<Annotation> methodAnnsList = Collections.<Annotation>emptyList();
Annotation[] methodAnns = EclipseHandlerUtil.findCopyableToSetterAnnotations(originalFieldNode);
if (methodAnns != null && methodAnns.length > 0) methodAnnsList = Arrays.asList(methodAnns);