From 2e2047a853cac4a6fd6ab90bf77a6c189adbfa2c Mon Sep 17 00:00:00 2001
From: Oleg Sukhodolsky <os97673@gmail.com>
Date: Sun, 14 Aug 2005 09:38:04 +0000
Subject: [PATCH] Fixed 1257599 - RequireThis should know that there are enum
 and inteface definitions :)

---
 .../checks/coding/RequireThisCheck.java          |  2 ++
 .../tools/checkstyle/Input15Extensions.java      | 16 ++++++++++++++++
 .../checks/coding/RequireThisCheckTest.java      |  8 ++++++++
 src/xdocs/releasenotes.xml                       |  6 +++++-
 4 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/coding/RequireThisCheck.java b/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/coding/RequireThisCheck.java
index c4fda8e65..fd5adcabd 100755
--- a/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/coding/RequireThisCheck.java
+++ b/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/coding/RequireThisCheck.java
@@ -175,6 +175,8 @@ public class RequireThisCheck extends DeclarationCollector
             || parentType == TokenTypes.CTOR_DEF
             || parentType == TokenTypes.METHOD_DEF
             || parentType == TokenTypes.CLASS_DEF
+            || parentType == TokenTypes.ENUM_DEF
+            || parentType == TokenTypes.INTERFACE_DEF
             || parentType == TokenTypes.PARAMETER_DEF)
         {
             // it's being declared; no problem
diff --git a/src/testinputs/com/puppycrawl/tools/checkstyle/Input15Extensions.java b/src/testinputs/com/puppycrawl/tools/checkstyle/Input15Extensions.java
index 5fa85ca2e..16d4cbab4 100644
--- a/src/testinputs/com/puppycrawl/tools/checkstyle/Input15Extensions.java
+++ b/src/testinputs/com/puppycrawl/tools/checkstyle/Input15Extensions.java
@@ -19,3 +19,19 @@ enum Enum1
         return ""; //some custom implementation
     }
 }
+
+interface TestRequireThisEnum
+{
+    enum DAY_OF_WEEK
+    {
+        SUNDAY,
+        MONDAY,
+        TUESDAY,
+        WEDNESDAY,
+        THURSDAY,
+        FRIDAY,
+        SATURDAY
+    }
+}
+
+
diff --git a/src/tests/com/puppycrawl/tools/checkstyle/checks/coding/RequireThisCheckTest.java b/src/tests/com/puppycrawl/tools/checkstyle/checks/coding/RequireThisCheckTest.java
index ceb4b9b0e..9ce0b5c70 100755
--- a/src/tests/com/puppycrawl/tools/checkstyle/checks/coding/RequireThisCheckTest.java
+++ b/src/tests/com/puppycrawl/tools/checkstyle/checks/coding/RequireThisCheckTest.java
@@ -51,4 +51,12 @@ public class RequireThisCheckTest extends BaseCheckTestCase
                getPath("coding" + File.separator + "InputRequireThis.java"),
                expected);
     }
+
+    public void testGenerics() throws Exception
+    {
+        final DefaultConfiguration checkConfig =
+            createCheckConfig(RequireThisCheck.class);
+        final String[] expected = {};
+        verify(checkConfig, getPath("Input15Extensions.java"), expected);
+    }
 }
diff --git a/src/xdocs/releasenotes.xml b/src/xdocs/releasenotes.xml
index b349f48f3..251419683 100755
--- a/src/xdocs/releasenotes.xml
+++ b/src/xdocs/releasenotes.xml
@@ -20,7 +20,11 @@
       <p>Fixed Bugs:</p>
 
       <ul>
-        <li>Removed all reference to the usage checks (bug 1256662).</li>
+        <li>Removed all reference to the usage checks (bug
+        1256662).</li>
+
+        <li>RequireThis now handle inner enums better (bug 1257599)</li>
+
       </ul>
 
       <p>Other improvements:</p>