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, 2 insertions, 23 deletions

diff --git a/test/transform/resource/after-delombok/DataOnLocalClass.java b/test/transform/resource/after-delombok/DataOnLocalClass.java
index 4ac77e5c..9fe16070 100644
--- a/test/transform/resource/after-delombok/DataOnLocalClass.java
+++ b/test/transform/resource/after-delombok/DataOnLocalClass.java
@@ -5,32 +5,27 @@ class DataOnLocalClass1 {
 			String name;
 			@java.lang.SuppressWarnings("all")
 			@javax.annotation.Generated("lombok")
-			@lombok.Generated
 			public Local(final int x) {
 				this.x = x;
 			}
 			@java.lang.SuppressWarnings("all")
 			@javax.annotation.Generated("lombok")
-			@lombok.Generated
 			public int getX() {
 				return this.x;
 			}
 			@java.lang.SuppressWarnings("all")
 			@javax.annotation.Generated("lombok")
-			@lombok.Generated
 			public String getName() {
 				return this.name;
 			}
 			@java.lang.SuppressWarnings("all")
 			@javax.annotation.Generated("lombok")
-			@lombok.Generated
 			public void setName(final String name) {
 				this.name = name;
 			}
 			@java.lang.Override
 			@java.lang.SuppressWarnings("all")
 			@javax.annotation.Generated("lombok")
-			@lombok.Generated
 			public boolean equals(final java.lang.Object o) {
 				if (o == this) return true;
 				if (!(o instanceof Local)) return false;
@@ -44,14 +39,12 @@ class DataOnLocalClass1 {
 			}
 			@java.lang.SuppressWarnings("all")
 			@javax.annotation.Generated("lombok")
-			@lombok.Generated
 			protected boolean canEqual(final java.lang.Object other) {
 				return other instanceof Local;
 			}
 			@java.lang.Override
 			@java.lang.SuppressWarnings("all")
 			@javax.annotation.Generated("lombok")
-			@lombok.Generated
 			public int hashCode() {
 				final int PRIME = 59;
 				int result = 1;
@@ -63,7 +56,6 @@ class DataOnLocalClass1 {
 			@java.lang.Override
 			@java.lang.SuppressWarnings("all")
 			@javax.annotation.Generated("lombok")
-			@lombok.Generated
 			public java.lang.String toString() {
 				return "Local(x=" + this.getX() + ", name=" + this.getName() + ")";
 			}
@@ -79,7 +71,6 @@ class DataOnLocalClass2 {
 				String name;
 				@java.lang.SuppressWarnings("all")
 				@javax.annotation.Generated("lombok")
-				@lombok.Generated
 				public InnerLocal(@lombok.NonNull final String name) {
 					if (name == null) {
 						throw new java.lang.NullPointerException("name");
@@ -89,13 +80,11 @@ class DataOnLocalClass2 {
 				@lombok.NonNull
 				@java.lang.SuppressWarnings("all")
 				@javax.annotation.Generated("lombok")
-				@lombok.Generated
 				public String getName() {
 					return this.name;
 				}
 				@java.lang.SuppressWarnings("all")
 				@javax.annotation.Generated("lombok")
-				@lombok.Generated
 				public void setName(@lombok.NonNull final String name) {
 					if (name == null) {
 						throw new java.lang.NullPointerException("name");
@@ -105,11 +94,10 @@ class DataOnLocalClass2 {
 				@java.lang.Override
 				@java.lang.SuppressWarnings("all")
 				@javax.annotation.Generated("lombok")
-				@lombok.Generated
 				public boolean equals(final java.lang.Object o) {
 					if (o == this) return true;
 					if (!(o instanceof Local.InnerLocal)) return false;
-					final InnerLocal other = (InnerLocal) o;
+					final Local.InnerLocal other = (Local.InnerLocal) o;
 					if (!other.canEqual((java.lang.Object) this)) return false;
 					final java.lang.Object this$name = this.getName();
 					final java.lang.Object other$name = other.getName();
@@ -118,14 +106,12 @@ class DataOnLocalClass2 {
 				}
 				@java.lang.SuppressWarnings("all")
 				@javax.annotation.Generated("lombok")
-				@lombok.Generated
 				protected boolean canEqual(final java.lang.Object other) {
 					return other instanceof Local.InnerLocal;
 				}
 				@java.lang.Override
 				@java.lang.SuppressWarnings("all")
 				@javax.annotation.Generated("lombok")
-				@lombok.Generated
 				public int hashCode() {
 					final int PRIME = 59;
 					int result = 1;
@@ -136,27 +122,23 @@ class DataOnLocalClass2 {
 				@java.lang.Override
 				@java.lang.SuppressWarnings("all")
 				@javax.annotation.Generated("lombok")
-				@lombok.Generated
 				public java.lang.String toString() {
 					return "Local.InnerLocal(name=" + this.getName() + ")";
 				}
 			}
 			@java.lang.SuppressWarnings("all")
 			@javax.annotation.Generated("lombok")
-			@lombok.Generated
 			public Local(final int x) {
 				this.x = x;
 			}
 			@java.lang.SuppressWarnings("all")
 			@javax.annotation.Generated("lombok")
-			@lombok.Generated
 			public int getX() {
 				return this.x;
 			}
 			@java.lang.Override
 			@java.lang.SuppressWarnings("all")
 			@javax.annotation.Generated("lombok")
-			@lombok.Generated
 			public boolean equals(final java.lang.Object o) {
 				if (o == this) return true;
 				if (!(o instanceof Local)) return false;
@@ -167,14 +149,12 @@ class DataOnLocalClass2 {
 			}
 			@java.lang.SuppressWarnings("all")
 			@javax.annotation.Generated("lombok")
-			@lombok.Generated
 			protected boolean canEqual(final java.lang.Object other) {
 				return other instanceof Local;
 			}
 			@java.lang.Override
 			@java.lang.SuppressWarnings("all")
 			@javax.annotation.Generated("lombok")
-			@lombok.Generated
 			public int hashCode() {
 				final int PRIME = 59;
 				int result = 1;
@@ -184,10 +164,9 @@ class DataOnLocalClass2 {
 			@java.lang.Override
 			@java.lang.SuppressWarnings("all")
 			@javax.annotation.Generated("lombok")
-			@lombok.Generated
 			public java.lang.String toString() {
 				return "Local(x=" + this.getX() + ")";
 			}
 		}
 	}
-}
\ No newline at end of file
+}