Merge branch 'master' into wither

Conflicts:
	src/core/lombok/javac/handlers/JavacHandlerUtil.java

1 files changed, 18 insertions, 18 deletions

diff --git a/test/transform/resource/after-ecj/SetterOnClass.java b/test/transform/resource/after-ecj/SetterOnClass.java
index 370c0335..da928f24 100644
--- a/test/transform/resource/after-ecj/SetterOnClass.java
+++ b/test/transform/resource/after-ecj/SetterOnClass.java
@@ -1,60 +1,63 @@
 @lombok.Setter class SetterOnClass1 {
   @lombok.Setter(lombok.AccessLevel.NONE) boolean isNone;
   boolean isPublic;
-  public @java.lang.SuppressWarnings("all") void setPublic(final boolean isPublic) {
-    this.isPublic = isPublic;
-  }
   SetterOnClass1() {
     super();
   }
+  public @java.lang.SuppressWarnings("all") void setPublic(final boolean isPublic) {
+    this.isPublic = isPublic;
+  }
 }
 @lombok.Setter(lombok.AccessLevel.PROTECTED) class SetterOnClass2 {
   @lombok.Setter(lombok.AccessLevel.NONE) boolean isNone;
   boolean isProtected;
   @lombok.Setter(lombok.AccessLevel.PACKAGE) boolean isPackage;
+  SetterOnClass2() {
+    super();
+  }
   @java.lang.SuppressWarnings("all") void setPackage(final boolean isPackage) {
     this.isPackage = isPackage;
   }
   protected @java.lang.SuppressWarnings("all") void setProtected(final boolean isProtected) {
     this.isProtected = isProtected;
   }
-  SetterOnClass2() {
-    super();
-  }
 }
 @lombok.Setter(lombok.AccessLevel.PACKAGE) class SetterOnClass3 {
   @lombok.Setter(lombok.AccessLevel.NONE) boolean isNone;
   boolean isPackage;
-  @java.lang.SuppressWarnings("all") void setPackage(final boolean isPackage) {
-    this.isPackage = isPackage;
-  }
   SetterOnClass3() {
     super();
   }
+  @java.lang.SuppressWarnings("all") void setPackage(final boolean isPackage) {
+    this.isPackage = isPackage;
+  }
 }
 @lombok.Setter(lombok.AccessLevel.PRIVATE) class SetterOnClass4 {
   @lombok.Setter(lombok.AccessLevel.NONE) boolean isNone;
   boolean isPrivate;
-  private @java.lang.SuppressWarnings("all") void setPrivate(final boolean isPrivate) {
-    this.isPrivate = isPrivate;
-  }
   SetterOnClass4() {
     super();
   }
+  private @java.lang.SuppressWarnings("all") void setPrivate(final boolean isPrivate) {
+    this.isPrivate = isPrivate;
+  }
 }
 @lombok.Setter(lombok.AccessLevel.PUBLIC) class SetterOnClass5 {
   @lombok.Setter(lombok.AccessLevel.NONE) boolean isNone;
   boolean isPublic;
-  public @java.lang.SuppressWarnings("all") void setPublic(final boolean isPublic) {
-    this.isPublic = isPublic;
-  }
   SetterOnClass5() {
     super();
   }
+  public @java.lang.SuppressWarnings("all") void setPublic(final boolean isPublic) {
+    this.isPublic = isPublic;
+  }
 }
 @lombok.Setter class SetterOnClass6 {
   String couldBeNull;
   @lombok.NonNull String nonNull;
+  SetterOnClass6() {
+    super();
+  }
   public @java.lang.SuppressWarnings("all") void setCouldBeNull(final String couldBeNull) {
     this.couldBeNull = couldBeNull;
   }
@@ -63,7 +66,4 @@
         throw new java.lang.NullPointerException("nonNull");
     this.nonNull = nonNull;
   }
-  SetterOnClass6() {
-    super();
-  }
 }