diff options
| author | Jan Rieke <rieke@subshell.com> | 2017-03-13 16:49:20 +0100 |
|---|---|---|
| committer | Jan Rieke <rieke@subshell.com> | 2017-03-13 16:49:20 +0100 |
| commit | 2346b15c8d2809b6efa9fc94f4f6cc56dcaa54b8 (patch) | |
| tree | 238b9877ce1daa83b3e8d422eb4d2f7ab89f3864 /test/transform/resource/after-delombok/EqualsAndHashCodeWithExistingMethods.java | |
| parent | f51bbce3e396a0151bc0242d00e250f2bc720316 (diff) | |
| parent | a2c10c70fa8e2c8736464a5c3d445e2ca6e8a296 (diff) | |
| download | lombok-2346b15c8d2809b6efa9fc94f4f6cc56dcaa54b8.tar.gz lombok-2346b15c8d2809b6efa9fc94f4f6cc56dcaa54b8.tar.bz2 lombok-2346b15c8d2809b6efa9fc94f4f6cc56dcaa54b8.zip | |
Merge remote-tracking branch 'upstream/master'
# Conflicts:
# src/core/lombok/eclipse/handlers/HandleBuilder.java
# src/core/lombok/eclipse/handlers/HandleConstructor.java
# src/core/lombok/javac/handlers/HandleBuilder.java
# src/core/lombok/javac/handlers/HandleConstructor.java
Diffstat (limited to 'test/transform/resource/after-delombok/EqualsAndHashCodeWithExistingMethods.java')
| -rw-r--r-- | test/transform/resource/after-delombok/EqualsAndHashCodeWithExistingMethods.java | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/test/transform/resource/after-delombok/EqualsAndHashCodeWithExistingMethods.java b/test/transform/resource/after-delombok/EqualsAndHashCodeWithExistingMethods.java index 026a74ad..d9e4a913 100644 --- a/test/transform/resource/after-delombok/EqualsAndHashCodeWithExistingMethods.java +++ b/test/transform/resource/after-delombok/EqualsAndHashCodeWithExistingMethods.java @@ -18,7 +18,6 @@ final class EqualsAndHashCodeWithExistingMethods3 extends EqualsAndHashCodeWithE @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") - @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof EqualsAndHashCodeWithExistingMethods3)) return false; @@ -31,7 +30,6 @@ final class EqualsAndHashCodeWithExistingMethods3 extends EqualsAndHashCodeWithE @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") - @lombok.Generated public int hashCode() { final int PRIME = 59; int result = 1; @@ -39,4 +37,4 @@ final class EqualsAndHashCodeWithExistingMethods3 extends EqualsAndHashCodeWithE result = result * PRIME + this.x; return result; } -}
\ No newline at end of file +} |