diff options
author | Reinier Zwitserloot <reinier@zwitserloot.com> | 2017-01-20 00:38:10 +0100 |
---|---|---|
committer | Reinier Zwitserloot <reinier@zwitserloot.com> | 2017-01-20 00:38:10 +0100 |
commit | ce9fa7fb06fda7c459e381022f38564c31b41744 (patch) | |
tree | 87bd0cf8593b008e37a5b152c698e1f3c0ebfea1 /test/transform/resource/after-ecj/ConflictingStaticConstructorNames.java | |
parent | 00ce9a72e6625f685da485b3338a9f52ce4227e5 (diff) | |
parent | ac2bedb8f31c73a9b92793611c9199ba95f904af (diff) | |
download | lombok-ce9fa7fb06fda7c459e381022f38564c31b41744.tar.gz lombok-ce9fa7fb06fda7c459e381022f38564c31b41744.tar.bz2 lombok-ce9fa7fb06fda7c459e381022f38564c31b41744.zip |
Merge remote-tracking branch 'origin/master' into playNiceWithOtherAP
Diffstat (limited to 'test/transform/resource/after-ecj/ConflictingStaticConstructorNames.java')
-rw-r--r-- | test/transform/resource/after-ecj/ConflictingStaticConstructorNames.java | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/test/transform/resource/after-ecj/ConflictingStaticConstructorNames.java b/test/transform/resource/after-ecj/ConflictingStaticConstructorNames.java index f9437f0e..e508ed14 100644 --- a/test/transform/resource/after-ecj/ConflictingStaticConstructorNames.java +++ b/test/transform/resource/after-ecj/ConflictingStaticConstructorNames.java @@ -1,5 +1,5 @@ @lombok.Data(staticConstructor = "of") @lombok.NoArgsConstructor class ConflictingStaticConstructorNames { - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof ConflictingStaticConstructorNames))) @@ -9,17 +9,17 @@ return false; return true; } - protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean canEqual(final java.lang.Object other) { + protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated boolean canEqual(final java.lang.Object other) { return (other instanceof ConflictingStaticConstructorNames); } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int hashCode() { int result = 1; return result; } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated java.lang.String toString() { return "ConflictingStaticConstructorNames()"; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") ConflictingStaticConstructorNames() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated ConflictingStaticConstructorNames() { super(); } }
\ No newline at end of file |