From 4269dede06752d23cf5c2f6d48da1ef16ca4049c Mon Sep 17 00:00:00 2001
From: Xavier Le Vourch <xlv@users.sourceforge.net>
Date: Thu, 14 Dec 2006 08:05:47 +0000
Subject: [PATCH] Applied patch 1615519 - controversial/DefaultPackage XPath
 rule is wrong

git-svn-id: https://pmd.svn.sourceforge.net/svnroot/pmd/trunk@4879 51baf565-9d33-0410-a72c-fc3788e3496d
---
 pmd/etc/changelog.txt                                |  1 +
 .../net/sourceforge/pmd/rules/xml/DefaultPackage.xml | 12 ++++++++++++
 pmd/rulesets/controversial.xml                       |  6 ++++--
 pmd/xdocs/credits.xml                                |  2 +-
 4 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/pmd/etc/changelog.txt b/pmd/etc/changelog.txt
index 33da2a8a24..2972e1a0f0 100644
--- a/pmd/etc/changelog.txt
+++ b/pmd/etc/changelog.txt
@@ -26,6 +26,7 @@ Applied patch 1573981 - false + in CloneMethodMustImplementCloneable
 Applied patch 1574988 - false + in OverrideBothEqualsAndHashcode
 Applied patch 1583167 - Better test code management. Internal JUnits can now be written in XML's
 Applied patch 1613674 - Support classpaths with spaces in pmd.bat
+Applied patch 1615519 - controversial/DefaultPackage XPath rule is wrong
 Implemented RFE 1566313 - Command Line now takes minimumpriority attribute to filter out rulesets
 PMD now requires JDK 1.4 to run
 - PMD will still analyze code from earlier JDKs
diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/xml/DefaultPackage.xml b/pmd/regress/test/net/sourceforge/pmd/rules/xml/DefaultPackage.xml
index 39122604a6..cb102dacf3 100644
--- a/pmd/regress/test/net/sourceforge/pmd/rules/xml/DefaultPackage.xml
+++ b/pmd/regress/test/net/sourceforge/pmd/rules/xml/DefaultPackage.xml
@@ -44,4 +44,16 @@ public interface Foo {
 }
      ]]></code>
     </test-code>
+    <test-code>
+        <description><![CDATA[
+bad
+        ]]></description>
+        <expected-problems>1</expected-problems>
+        <code><![CDATA[
+public class Foo {
+ void bar() {
+ }
+}
+        ]]></code>
+    </test-code>
 </test-data>
diff --git a/pmd/rulesets/controversial.xml b/pmd/rulesets/controversial.xml
index 27a57525a6..20b52ffff9 100644
--- a/pmd/rulesets/controversial.xml
+++ b/pmd/rulesets/controversial.xml
@@ -334,8 +334,10 @@ Use explicit scoping instead of the default package private level.
 .[@Interface='false']
 /ClassOrInterfaceBody
 /ClassOrInterfaceBodyDeclaration
-/FieldDeclaration[@PackagePrivate='true']
-| /MethodDeclaration[@PackagePrivate='true']
+[
+FieldDeclaration[@PackagePrivate='true']
+or MethodDeclaration[@PackagePrivate='true']
+]
                 ]]></value>
             </property>
         </properties>
diff --git a/pmd/xdocs/credits.xml b/pmd/xdocs/credits.xml
index 80fe3cec78..4507d54580 100644
--- a/pmd/xdocs/credits.xml
+++ b/pmd/xdocs/credits.xml
@@ -63,7 +63,7 @@
             <li>piair - Implemented StringBufferInstantiationWithChar, AvoidUsingOctalValues</li>
             <li>Christopher Eagan - Reported bug in VariableNamingConventions</li>
             <li><a href="http://www.livejournal.com/users/insac/">Fabio Insaccanebbia</a> - Improvement for UseArraysAsList, UnusedNullCheckInEquals, MisplacedNullCheck, UselessOperationOnImmutable, AvoidArrayLoops, UseArraysAsList, AvoidConstantsInterface, AvoidDecimalLiteralsInBigDecimalConstructor, ClassCastExceptionWithToArray, BigIntegerInstantiation</li>
-            <li>Ryan Gustafson - Patch to fix bug in AvoidDecimalLiteralsInBigDecimalConstructor, patch to add "ref" overrides to RuleSetFactory, patch to fix JDK 1.3 incompatibilities in PMD 2.0, patch to support classpaths with spaces in pmd.bat</li>
+            <li>Ryan Gustafson - Patch to fix bug in AvoidDecimalLiteralsInBigDecimalConstructor, patch to add "ref" overrides to RuleSetFactory, patch to fix JDK 1.3 incompatibilities in PMD 2.0, patch to support classpaths with spaces in pmd.bat, patch to fix controversial/DefaultPackage XPath rule</li>
             <li>Stefan Seidel - Reported JDK 1.5 parsing bug</li>
             <li>Aaron Optimizer Digulla - Tweaks to pmd.bat</li>
             <li>Peter Van de Voorde - Rewrote the 'create rule XML' functionality in the designer utility</li>