Merge branch 'master' into wither

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

1 files changed, 12 insertions, 12 deletions

diff --git a/test/transform/resource/after-ecj/ToStringInner.java b/test/transform/resource/after-ecj/ToStringInner.java
index dc8696c5..a8624823 100644
--- a/test/transform/resource/after-ecj/ToStringInner.java
+++ b/test/transform/resource/after-ecj/ToStringInner.java
@@ -2,31 +2,31 @@ import lombok.ToString;
 @ToString class ToStringOuter {
   @ToString class ToStringInner {
     int y;
-    public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
-      return (("ToStringOuter.ToStringInner(y=" + this.y) + ")");
-    }
     ToStringInner() {
       super();
     }
+    public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
+      return (("ToStringOuter.ToStringInner(y=" + this.y) + ")");
+    }
   }
   static @ToString class ToStringStaticInner {
     int y;
-    public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
-      return (("ToStringOuter.ToStringStaticInner(y=" + this.y) + ")");
-    }
     ToStringStaticInner() {
       super();
     }
+    public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
+      return (("ToStringOuter.ToStringStaticInner(y=" + this.y) + ")");
+    }
   }
   class ToStringMiddle {
     @ToString class ToStringMoreInner {
       String name;
-      public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
-        return (("ToStringOuter.ToStringMiddle.ToStringMoreInner(name=" + this.name) + ")");
-      }
       ToStringMoreInner() {
         super();
       }
+      public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
+        return (("ToStringOuter.ToStringMiddle.ToStringMoreInner(name=" + this.name) + ")");
+      }
     }
     ToStringMiddle() {
       super();
@@ -34,10 +34,10 @@ import lombok.ToString;
   }
   int x;
   String name;
-  public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
-    return (((("ToStringOuter(x=" + this.x) + ", name=") + this.name) + ")");
-  }
   ToStringOuter() {
     super();
   }
+  public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
+    return (((("ToStringOuter(x=" + this.x) + ", name=") + this.name) + ")");
+  }
 }