From dc64e2df771ac87a98c66263065edbaad3cb56ea Mon Sep 17 00:00:00 2001
From: Andreas Dangel <adangel@users.sourceforge.net>
Date: Sat, 3 Aug 2013 17:13:38 +0200
Subject: [PATCH] pmd: fix #1111 False positive: Useless parentheses

---
 pmd/etc/changelog.txt                                    | 1 +
 pmd/src/main/resources/rulesets/java/unnecessary.xml     | 2 +-
 .../java/rule/unnecessary/xml/UselessParentheses.xml     | 9 +++++++++
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/pmd/etc/changelog.txt b/pmd/etc/changelog.txt
index a955d8ebb1..64bddd15e1 100644
--- a/pmd/etc/changelog.txt
+++ b/pmd/etc/changelog.txt
@@ -1,6 +1,7 @@
 ????? ??, 2013 - 5.0.5:
 
 Fixed bug  991: AvoidSynchronizedAtMethodLevel for static methods
+Fixed bug 1111: False positive: Useless parentheses
 Fixed bug 1114: CPD - Tokenizer not initialized with requested properties
 Fixed bug 1118: ClassCastException in pmd.lang.ecmascript.ast.ASTElementGet
 
diff --git a/pmd/src/main/resources/rulesets/java/unnecessary.xml b/pmd/src/main/resources/rulesets/java/unnecessary.xml
index 87ef218961..fe991c712b 100644
--- a/pmd/src/main/resources/rulesets/java/unnecessary.xml
+++ b/pmd/src/main/resources/rulesets/java/unnecessary.xml
@@ -220,7 +220,7 @@ public class Test {
        <property name="xpath">
           <value>
           <![CDATA[
-//Expression/PrimaryExpression/PrimaryPrefix/Expression[count(*)=1 and count(./CastExpression)=0]
+//Expression/PrimaryExpression/PrimaryPrefix/Expression[count(*)=1 and count(./CastExpression)=0 and count(./ConditionalExpression[@Ternary='true'])=0]
 |
 //Expression/ConditionalAndExpression/PrimaryExpression/PrimaryPrefix/Expression[
     count(*)=1 and
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/unnecessary/xml/UselessParentheses.xml b/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/unnecessary/xml/UselessParentheses.xml
index 48e8b181b2..5c51bedab6 100644
--- a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/unnecessary/xml/UselessParentheses.xml
+++ b/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/unnecessary/xml/UselessParentheses.xml
@@ -196,4 +196,13 @@ public class Test {
 }
         ]]></code>
     </test-code>
+    <test-code>
+        <description>#1111 False positive: Useless parentheses</description>
+        <expected-problems>0</expected-problems>
+        <code><![CDATA[
+public class Test { public String check() {
+return (absolute ? amount.abs() : amount).toString();
+} }
+        ]]></code>
+    </test-code>
 </test-data>