From 2aff2159fcaf35c2cda4f837c5ceb65318b81db9 Mon Sep 17 00:00:00 2001 From: Reinier Zwitserloot Date: Sun, 8 Feb 2015 22:53:19 +0100 Subject: marking generated fields in builders as generated. This seems superfluous as the entire builder class is marked as such, but it won’t be if that part is manually written but builder is supposed to fill in a few blanks. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/core/lombok/eclipse/handlers/HandleBuilder.java | 4 ++-- .../lombok/eclipse/handlers/singulars/EclipseGuavaSingularizer.java | 2 +- .../handlers/singulars/EclipseJavaUtilListSetSingularizer.java | 2 +- .../eclipse/handlers/singulars/EclipseJavaUtilMapSingularizer.java | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) (limited to 'src/core/lombok/eclipse/handlers') diff --git a/src/core/lombok/eclipse/handlers/HandleBuilder.java b/src/core/lombok/eclipse/handlers/HandleBuilder.java index 45f4342e..c1b0d8a3 100644 --- a/src/core/lombok/eclipse/handlers/HandleBuilder.java +++ b/src/core/lombok/eclipse/handlers/HandleBuilder.java @@ -273,7 +273,7 @@ public class HandleBuilder extends EclipseAnnotationHandler { cleanDecl.modifiers = ClassFileConstants.AccPrivate; cleanDecl.type = TypeReference.baseTypeReference(TypeIds.T_boolean, 0); System.out.println("INJECTING: cleaning"); - injectField(builderType, cleanDecl); + injectFieldAndMarkGenerated(builderType, cleanDecl); } if (constructorExists(builderType) == MemberExistsResult.NOT_EXISTS) { @@ -444,7 +444,7 @@ public class HandleBuilder extends EclipseAnnotationHandler { fd.modifiers = ClassFileConstants.AccPrivate; fd.type = copyType(bfd.type); fd.traverse(new SetGeneratedByVisitor(source), (MethodScope) null); - bfd.createdFields.add(injectField(builderType, fd)); + bfd.createdFields.add(injectFieldAndMarkGenerated(builderType, fd)); } } } diff --git a/src/core/lombok/eclipse/handlers/singulars/EclipseGuavaSingularizer.java b/src/core/lombok/eclipse/handlers/singulars/EclipseGuavaSingularizer.java index 3b2ca875..fa121328 100644 --- a/src/core/lombok/eclipse/handlers/singulars/EclipseGuavaSingularizer.java +++ b/src/core/lombok/eclipse/handlers/singulars/EclipseGuavaSingularizer.java @@ -98,7 +98,7 @@ abstract class EclipseGuavaSingularizer extends EclipseSingularizer { buildField.declarationSourceEnd = -1; buildField.type = type; data.setGeneratedByRecursive(buildField); - return Collections.singletonList(injectField(builderType, buildField)); + return Collections.singletonList(injectFieldAndMarkGenerated(builderType, buildField)); } @Override public void generateMethods(SingularData data, EclipseNode builderType, boolean fluent, boolean chain) { diff --git a/src/core/lombok/eclipse/handlers/singulars/EclipseJavaUtilListSetSingularizer.java b/src/core/lombok/eclipse/handlers/singulars/EclipseJavaUtilListSetSingularizer.java index 1d1c4dbd..4b59f7a8 100644 --- a/src/core/lombok/eclipse/handlers/singulars/EclipseJavaUtilListSetSingularizer.java +++ b/src/core/lombok/eclipse/handlers/singulars/EclipseJavaUtilListSetSingularizer.java @@ -80,7 +80,7 @@ abstract class EclipseJavaUtilListSetSingularizer extends EclipseJavaUtilSingula buildField.declarationSourceEnd = -1; buildField.type = type; data.setGeneratedByRecursive(buildField); - return Collections.singletonList(injectField(builderType, buildField)); + return Collections.singletonList(injectFieldAndMarkGenerated(builderType, buildField)); } @Override public void generateMethods(SingularData data, EclipseNode builderType, boolean fluent, boolean chain) { diff --git a/src/core/lombok/eclipse/handlers/singulars/EclipseJavaUtilMapSingularizer.java b/src/core/lombok/eclipse/handlers/singulars/EclipseJavaUtilMapSingularizer.java index 640bd396..1c6b1ff3 100644 --- a/src/core/lombok/eclipse/handlers/singulars/EclipseJavaUtilMapSingularizer.java +++ b/src/core/lombok/eclipse/handlers/singulars/EclipseJavaUtilMapSingularizer.java @@ -123,8 +123,8 @@ public class EclipseJavaUtilMapSingularizer extends EclipseJavaUtilSingularizer } data.setGeneratedByRecursive(buildKeyField); data.setGeneratedByRecursive(buildValueField); - EclipseNode keyFieldNode = injectField(builderType, buildKeyField); - EclipseNode valueFieldNode = injectField(builderType, buildValueField); + EclipseNode keyFieldNode = injectFieldAndMarkGenerated(builderType, buildKeyField); + EclipseNode valueFieldNode = injectFieldAndMarkGenerated(builderType, buildValueField); return Arrays.asList(keyFieldNode, valueFieldNode); } -- cgit