From 0b30a5695022649c0e9288b167fe15893e06887b Mon Sep 17 00:00:00 2001 From: Reinier Zwitserloot Date: Thu, 3 Sep 2009 02:25:51 +0200 Subject: Fixed a problem in AnnotationValues where 'isExplicit' always returned true. --- src/lombok/javac/handlers/HandleEqualsAndHashCode.java | 5 +++++ src/lombok/javac/handlers/HandleToString.java | 5 +++++ 2 files changed, 10 insertions(+) (limited to 'src/lombok/javac/handlers') diff --git a/src/lombok/javac/handlers/HandleEqualsAndHashCode.java b/src/lombok/javac/handlers/HandleEqualsAndHashCode.java index 16a04da7..21966be2 100644 --- a/src/lombok/javac/handlers/HandleEqualsAndHashCode.java +++ b/src/lombok/javac/handlers/HandleEqualsAndHashCode.java @@ -84,6 +84,11 @@ public class HandleEqualsAndHashCode implements JavacAnnotationHandler { if ( !annotation.isExplicit("exclude") ) excludes = null; if ( !annotation.isExplicit("of") ) includes = null; + if ( excludes != null && includes != null ) { + excludes = null; + annotation.setWarning("exclude", "exclude and of are mutually exclusive; the 'exclude' parameter will be ignored."); + } + return generateToString(typeNode, annotationNode, excludes, includes, ann.includeFieldNames(), callSuper, true); } -- cgit