Merge branch 'master' into wither

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

1 files changed, 25 insertions, 0 deletions

diff --git a/test/transform/resource/after-ecj/ConflictingStaticConstructorNames.java b/test/transform/resource/after-ecj/ConflictingStaticConstructorNames.java
new file mode 100644
index 00000000..8da11258
--- /dev/null
+++ b/test/transform/resource/after-ecj/ConflictingStaticConstructorNames.java
@@ -0,0 +1,25 @@
+@lombok.Data(staticConstructor = "of") @lombok.NoArgsConstructor class ConflictingStaticConstructorNames {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) {
+    if ((o == this))
+        return true;
+    if ((! (o instanceof ConflictingStaticConstructorNames)))
+        return false;
+    final @java.lang.SuppressWarnings("all") ConflictingStaticConstructorNames other = (ConflictingStaticConstructorNames) o;
+    if ((! other.canEqual((java.lang.Object) this)))
+        return false;
+    return true;
+  }
+  public @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) {
+    return (other instanceof ConflictingStaticConstructorNames);
+  }
+  public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() {
+    int result = 1;
+    return result;
+  }
+  public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
+    return "ConflictingStaticConstructorNames()";
+  }
+  public @java.lang.SuppressWarnings("all") ConflictingStaticConstructorNames() {
+    super();
+  }
+}
\ No newline at end of file