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, 13 insertions, 13 deletions

diff --git a/test/transform/resource/after-ecj/BuilderComplex.java b/test/transform/resource/after-ecj/BuilderComplex.java
index 48995923..c63ad8e6 100644
--- a/test/transform/resource/after-ecj/BuilderComplex.java
+++ b/test/transform/resource/after-ecj/BuilderComplex.java
@@ -1,34 +1,34 @@
 import java.util.List;
 import lombok.experimental.Builder;
 class BuilderComplex {
-  public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated class VoidBuilder<T extends Number> {
-    private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated T number;
-    private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int arg2;
-    private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated String arg3;
-    private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderComplex selfRef;
-    @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated VoidBuilder() {
+  public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") class VoidBuilder<T extends Number> {
+    private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") T number;
+    private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int arg2;
+    private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") String arg3;
+    private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderComplex selfRef;
+    @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") VoidBuilder() {
       super();
     }
-    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated VoidBuilder<T> number(final T number) {
+    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") VoidBuilder<T> number(final T number) {
       this.number = number;
       return this;
     }
-    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated VoidBuilder<T> arg2(final int arg2) {
+    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") VoidBuilder<T> arg2(final int arg2) {
       this.arg2 = arg2;
       return this;
     }
-    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated VoidBuilder<T> arg3(final String arg3) {
+    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") VoidBuilder<T> arg3(final String arg3) {
       this.arg3 = arg3;
       return this;
     }
-    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated VoidBuilder<T> selfRef(final BuilderComplex selfRef) {
+    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") VoidBuilder<T> selfRef(final BuilderComplex selfRef) {
       this.selfRef = selfRef;
       return this;
     }
-    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated void execute() {
+    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void execute() {
       BuilderComplex.<T>testVoidWithGenerics(number, arg2, arg3, selfRef);
     }
-    public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated java.lang.String toString() {
+    public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() {
       return (((((((("BuilderComplex.VoidBuilder(number=" + this.number) + ", arg2=") + this.arg2) + ", arg3=") + this.arg3) + ", selfRef=") + this.selfRef) + ")");
     }
   }
@@ -37,7 +37,7 @@ class BuilderComplex {
   }
   private static @Builder(buildMethodName = "execute") <T extends Number>void testVoidWithGenerics(T number, int arg2, String arg3, BuilderComplex selfRef) {
   }
-  public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated <T extends Number>VoidBuilder<T> builder() {
+  public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") <T extends Number>VoidBuilder<T> builder() {
     return new VoidBuilder<T>();
   }
 }