From 079ffeb4dfa7405f501fa14bcd63d7a948323c02 Mon Sep 17 00:00:00 2001
From: Andreas Dangel <adangel@users.sourceforge.net>
Date: Sun, 7 Feb 2016 12:31:49 +0100
Subject: [PATCH] fixes #1457 TooManyMethods counts inner class methods

---
 .../main/resources/rulesets/java/codesize.xml |  2 +-
 .../java/rule/codesize/xml/TooManyMethods.xml | 32 +++++++++++++++++++
 src/site/markdown/overview/changelog.md       |  2 ++
 3 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/pmd-java/src/main/resources/rulesets/java/codesize.xml b/pmd-java/src/main/resources/rulesets/java/codesize.xml
index e56fa25cdc..ba41cd6477 100644
--- a/pmd-java/src/main/resources/rulesets/java/codesize.xml
+++ b/pmd-java/src/main/resources/rulesets/java/codesize.xml
@@ -495,7 +495,7 @@ have more fine grained objects.
                     <![CDATA[
  //ClassOrInterfaceDeclaration/ClassOrInterfaceBody
      [
-      count(descendant::MethodDeclarator[
+      count(./ClassOrInterfaceBodyDeclaration/MethodDeclaration/MethodDeclarator[
          not (
                 starts-with(@Image,'get')
                 or
diff --git a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/codesize/xml/TooManyMethods.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/codesize/xml/TooManyMethods.xml
index 69a750eca6..dbe1ccbb9f 100644
--- a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/codesize/xml/TooManyMethods.xml
+++ b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/codesize/xml/TooManyMethods.xml
@@ -90,4 +90,36 @@ public class Foo
         </code>
     </test-code>
 
+    <test-code>
+        <description>#1457 TooManyMethods counts inner class methods</description>
+        <expected-problems>0</expected-problems>
+        <code><![CDATA[
+public class OuterClass {
+    public void method1() {}
+    public void method2() {}
+    public void method3() {}
+    public void method4() {}
+    public void method5() {}
+    public void method6() {}
+    public void method7() {}
+
+    public static class InnerClass extends OuterClass {
+        @Override
+        public void method1() {}
+        @Override
+        public void method2() {}
+        @Override
+        public void method3() {}
+        @Override
+        public void method4() {}
+        @Override
+        public void method5() {}
+        @Override
+        public void method6() {}
+        @Override
+        public void method7() {}
+    }
+}
+        ]]></code>
+    </test-code>
 </test-data>
diff --git a/src/site/markdown/overview/changelog.md b/src/site/markdown/overview/changelog.md
index ab14c00a5e..ca78f966a6 100644
--- a/src/site/markdown/overview/changelog.md
+++ b/src/site/markdown/overview/changelog.md
@@ -25,6 +25,8 @@
 
 **Bugfixes:**
 
+*   java-codesize/TooManyMethods:
+    *   [#1457](https://sourceforge.net/p/pmd/bugs/1457/): TooManyMethods counts inner class methods
 *   java-controversial/AvoidUsingShortType:
     *   [#1449](https://sourceforge.net/p/pmd/bugs/1449/): false positive when casting a variable to short
 *   java-design/AccessorClassGeneration: