From 0b30a5695022649c0e9288b167fe15893e06887b Mon Sep 17 00:00:00 2001
From: Reinier Zwitserloot <reinier@tipit.to>
Date: Thu, 3 Sep 2009 02:25:51 +0200
Subject: Fixed a problem in AnnotationValues where 'isExplicit' always
 returned true.

---
 src/lombok/javac/handlers/HandleToString.java | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'src/lombok/javac/handlers/HandleToString.java')

diff --git a/src/lombok/javac/handlers/HandleToString.java b/src/lombok/javac/handlers/HandleToString.java
index 7cdbb6e1..eb2013c7 100644
--- a/src/lombok/javac/handlers/HandleToString.java
+++ b/src/lombok/javac/handlers/HandleToString.java
@@ -81,6 +81,11 @@ public class HandleToString implements JavacAnnotationHandler<ToString> {
 		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