Merge branch 'master' into jdk8. Also added some major fixes whilst merging.

Conflicts:
	src/core/lombok/javac/handlers/JavacHandlerUtil.java
	src/utils/lombok/javac/CommentCatcher.java
	src/utils/lombok/javac/Javac.java

1 files changed, 6 insertions, 2 deletions

diff --git a/test/transform/resource/after-ecj/DataOnLocalClass.java b/test/transform/resource/after-ecj/DataOnLocalClass.java
index 137edf50..2f8dcca1 100644
--- a/test/transform/resource/after-ecj/DataOnLocalClass.java
+++ b/test/transform/resource/after-ecj/DataOnLocalClass.java
@@ -63,7 +63,9 @@ class DataOnLocalClass2 {
         }
         public @java.lang.SuppressWarnings("all") void setName(final @lombok.NonNull String name) {
           if ((name == null))
-              throw new java.lang.NullPointerException("name");
+              {
+                throw new java.lang.NullPointerException("name");
+              }
           this.name = name;
         }
         public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) {
@@ -96,7 +98,9 @@ class DataOnLocalClass2 {
         public @java.lang.SuppressWarnings("all") InnerLocal(final @lombok.NonNull String name) {
           super();
           if ((name == null))
-              throw new java.lang.NullPointerException("name");
+              {
+                throw new java.lang.NullPointerException("name");
+              }
           this.name = name;
         }
       }