diff options
| author | Reinier Zwitserloot <reinier@zwitserloot.com> | 2013-09-24 01:18:32 +0200 |
|---|---|---|
| committer | Reinier Zwitserloot <reinier@zwitserloot.com> | 2013-09-24 01:18:32 +0200 |
| commit | 86a635876dd75c4f3a61593491fa2ce53f8444b8 (patch) | |
| tree | 86b3a14390f64fcc61375da89bd62764d73a867f /src/core/lombok/javac/handlers/HandleEqualsAndHashCode.java | |
| parent | 7ee868659f4ff3cb286b676d649e8c57e9248d87 (diff) | |
| parent | 72b55dccb18f38b8aefd0ac8e7c2e8bd2dd5c057 (diff) | |
| download | lombok-86a635876dd75c4f3a61593491fa2ce53f8444b8.tar.gz lombok-86a635876dd75c4f3a61593491fa2ce53f8444b8.tar.bz2 lombok-86a635876dd75c4f3a61593491fa2ce53f8444b8.zip | |
Merge branch 'master' into jdk8check
Conflicts:
src/core/lombok/core/Version.java
src/core/lombok/javac/handlers/HandleConstructor.java
test/transform/resource/messages-delombok/EqualsAndHashCodeWithSomeExistingMethods.java.messages
test/transform/resource/messages-ecj/EqualsAndHashCodeWithSomeExistingMethods.java.messages
Diffstat (limited to 'src/core/lombok/javac/handlers/HandleEqualsAndHashCode.java')
| -rw-r--r-- | src/core/lombok/javac/handlers/HandleEqualsAndHashCode.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/lombok/javac/handlers/HandleEqualsAndHashCode.java b/src/core/lombok/javac/handlers/HandleEqualsAndHashCode.java index 9e871b4e..ad3b571a 100644 --- a/src/core/lombok/javac/handlers/HandleEqualsAndHashCode.java +++ b/src/core/lombok/javac/handlers/HandleEqualsAndHashCode.java @@ -195,7 +195,7 @@ public class HandleEqualsAndHashCode extends JavacAnnotationHandler<EqualsAndHas // The user code couldn't possibly (barring really weird subclassing shenanigans) be in a shippable state anyway; the implementations of these 3 methods are // all inter-related and should be written by the same entity. String msg = String.format("Not generating %s: One of equals, hashCode, and canEqual exists. " + - "You should either write all of these are none of these (in the latter case, lombok generates them).", + "You should either write all of these or none of these (in the latter case, lombok generates them).", equalsExists == MemberExistsResult.NOT_EXISTS && hashCodeExists == MemberExistsResult.NOT_EXISTS ? "equals and hashCode" : equalsExists == MemberExistsResult.NOT_EXISTS ? "equals" : "hashCode"); source.addWarning(msg); |