Merge remote-tracking branch 'upstream/master'

# Conflicts:
#	src/core/lombok/eclipse/handlers/HandleBuilder.java
#	src/core/lombok/eclipse/handlers/HandleConstructor.java
#	src/core/lombok/javac/handlers/HandleBuilder.java
#	src/core/lombok/javac/handlers/HandleConstructor.java

1 files changed, 1 insertions, 9 deletions

diff --git a/test/transform/resource/after-delombok/SetterOnClass.java b/test/transform/resource/after-delombok/SetterOnClass.java
index 2821ed05..9c376d43 100644
--- a/test/transform/resource/after-delombok/SetterOnClass.java
+++ b/test/transform/resource/after-delombok/SetterOnClass.java
@@ -3,7 +3,6 @@ class SetterOnClass1 {
 	boolean isPublic;
 	@java.lang.SuppressWarnings("all")
 	@javax.annotation.Generated("lombok")
-	@lombok.Generated
 	public void setPublic(final boolean isPublic) {
 		this.isPublic = isPublic;
 	}
@@ -14,13 +13,11 @@ class SetterOnClass2 {
 	boolean isPackage;
 	@java.lang.SuppressWarnings("all")
 	@javax.annotation.Generated("lombok")
-	@lombok.Generated
 	protected void setProtected(final boolean isProtected) {
 		this.isProtected = isProtected;
 	}
 	@java.lang.SuppressWarnings("all")
 	@javax.annotation.Generated("lombok")
-	@lombok.Generated
 	void setPackage(final boolean isPackage) {
 		this.isPackage = isPackage;
 	}
@@ -30,7 +27,6 @@ class SetterOnClass3 {
 	boolean isPackage;
 	@java.lang.SuppressWarnings("all")
 	@javax.annotation.Generated("lombok")
-	@lombok.Generated
 	void setPackage(final boolean isPackage) {
 		this.isPackage = isPackage;
 	}
@@ -40,7 +36,6 @@ class SetterOnClass4 {
 	boolean isPrivate;
 	@java.lang.SuppressWarnings("all")
 	@javax.annotation.Generated("lombok")
-	@lombok.Generated
 	private void setPrivate(final boolean isPrivate) {
 		this.isPrivate = isPrivate;
 	}
@@ -50,7 +45,6 @@ class SetterOnClass5 {
 	boolean isPublic;
 	@java.lang.SuppressWarnings("all")
 	@javax.annotation.Generated("lombok")
-	@lombok.Generated
 	public void setPublic(final boolean isPublic) {
 		this.isPublic = isPublic;
 	}
@@ -61,17 +55,15 @@ class SetterOnClass6 {
 	String nonNull;
 	@java.lang.SuppressWarnings("all")
 	@javax.annotation.Generated("lombok")
-	@lombok.Generated
 	public void setCouldBeNull(final String couldBeNull) {
 		this.couldBeNull = couldBeNull;
 	}
 	@java.lang.SuppressWarnings("all")
 	@javax.annotation.Generated("lombok")
-	@lombok.Generated
 	public void setNonNull(@lombok.NonNull final String nonNull) {
 		if (nonNull == null) {
 			throw new java.lang.NullPointerException("nonNull");
 		}
 		this.nonNull = nonNull;
 	}
-}
\ No newline at end of file
+}