fixing things reported by FindBugs

src/checkstyle/com/puppycrawl/tools/checkstyle/CheckStyleTask.java

@@ -514,7 +514,7 @@ public class CheckStyleTask extends Task
         @Override
         public String[] getValues()
         {
-            return VALUES;
+            return VALUES.clone();
         }
     }
 

src/checkstyle/com/puppycrawl/tools/checkstyle/TreeWalker.java

@@ -296,7 +296,7 @@ public final class TreeWalker
     private void registerCheck(Check aCheck)
         throws CheckstyleException
     {
-        int[] tokens = new int[] {}; //safety initialization
+        final int[] tokens;
         final Set<String> checkTokens = aCheck.getTokenNames();
         if (!checkTokens.isEmpty()) {
             tokens = aCheck.getRequiredTokens();

src/checkstyle/com/puppycrawl/tools/checkstyle/api/AuditEvent.java

@@ -42,7 +42,7 @@ public final class AuditEvent
     /** filename event associated with **/
     private final String mFileName;
     /** message associated with the event **/
-    private final LocalizedMessage mMessage;
+    private final transient LocalizedMessage mMessage;
 
     /**
      * Creates a new instance.

src/checkstyle/com/puppycrawl/tools/checkstyle/api/FileContents.java

@@ -73,7 +73,7 @@ public final class FileContents implements CommentListener
     public FileContents(String aFilename, String[] aLines)
     {
         mFilename = aFilename;
-        mLines = aLines;
+        mLines = aLines.clone();
     }
 
     /** {@inheritDoc} */
@@ -208,7 +208,7 @@ public final class FileContents implements CommentListener
     /** @return the lines in the file */
     public String[] getLines()
     {
-        return mLines;
+        return mLines.clone();
     }
 
     /** @return the name of the file */

src/checkstyle/com/puppycrawl/tools/checkstyle/api/LocalizedMessage.java

@@ -149,7 +149,7 @@ public final class LocalizedMessage
         mLineNo = aLineNo;
         mColNo = aColNo;
         mKey = aKey;
-        mArgs = aArgs;
+        mArgs = (null == aArgs) ? null : aArgs.clone();
         mBundle = aBundle;
         mSeverityLevel = aSeverityLevel;
         mModuleId = aModuleId;

src/checkstyle/com/puppycrawl/tools/checkstyle/api/Scope.java

@@ -122,6 +122,19 @@ public final class Scope implements Comparable<Scope>, Serializable
         return this.mCode - aObject.mCode;
     }
 
+    @Override
+    public boolean equals(Object aOther)
+    {
+        // Since this is an Enum class, can do a simple implementation.
+        return (this == aOther);
+    }
+
+    @Override
+    public int hashCode()
+    {
+        return mCode;
+    }
+
     /**
      * Checks if this scope is a subscope of another scope.
      * Example: PUBLIC is a subscope of PRIVATE.

src/checkstyle/com/puppycrawl/tools/checkstyle/checks/TodoCommentCheck.java

@@ -81,10 +81,10 @@ public class TodoCommentCheck
     private void checkCppComments(FileContents aContents)
     {
         final Map<Integer, TextBlock> comments = aContents.getCppComments();
-        for (Integer key : comments.keySet()) {
-            final String cmt = (comments.get(key)).getText()[0];
+        for (Map.Entry<Integer, TextBlock> entry : comments.entrySet()) {
+            final String cmt = entry.getValue().getText()[0];
             if (getRegexp().matcher(cmt).find()) {
-                log(key.intValue(), "todo.match", getFormat());
+                log(entry.getKey().intValue(), "todo.match", getFormat());
             }
         }
     }
@@ -97,13 +97,14 @@ public class TodoCommentCheck
     {
         final Map<Integer, List<TextBlock>> allComments = aContents
                 .getCComments();
-        for (Integer key : allComments.keySet()) {
-            final List<TextBlock> lineComments = allComments.get(key);
-            for (TextBlock line : lineComments) {
+        for (Map.Entry<Integer, List<TextBlock>> entry : allComments.entrySet())
+        {
+            for (TextBlock line : entry.getValue()) {
                 final String[] cmt = line.getText();
                 for (int i = 0; i < cmt.length; i++) {
                     if (getRegexp().matcher(cmt[i]).find()) {
-                        log(key.intValue() + i, "todo.match", getFormat());
+                        log(entry.getKey().intValue() + i, "todo.match",
+                                getFormat());
                     }
                 }
             }

src/checkstyle/com/puppycrawl/tools/checkstyle/checks/coding/AbstractSuperCheck.java

@@ -42,7 +42,7 @@ public abstract class AbstractSuperCheck
      * whether the method has a call to the super method.
      * @author Rick Giles
      */
-    private class MethodNode
+    private static class MethodNode
     {
         /** method definition */
         private final DetailAST mMethod;

src/checkstyle/com/puppycrawl/tools/checkstyle/checks/coding/DeclarationOrderCheck.java

@@ -77,7 +77,7 @@ public class DeclarationOrderCheck extends Check
     /**
      * private class to encapsulate the state
      */
-    private class ScopeState
+    private static class ScopeState
     {
         /** The state the check is in */
         private int mScopeState = STATE_STATIC_VARIABLE_DEF;

src/checkstyle/com/puppycrawl/tools/checkstyle/checks/imports/AvoidStaticImportCheck.java

@@ -81,7 +81,7 @@ public class AvoidStaticImportCheck
      */
     public void setExcludes(String[] aExcludes)
     {
-        mExcludes = aExcludes;
+        mExcludes = aExcludes.clone();
     }
 
     @Override

src/checkstyle/com/puppycrawl/tools/checkstyle/checks/imports/IllegalImportCheck.java

@@ -78,7 +78,7 @@ public class IllegalImportCheck
      */
     public void setIllegalPkgs(String[] aFrom)
     {
-        mIllegalPkgs = aFrom;
+        mIllegalPkgs = aFrom.clone();
     }
 
     @Override

src/checkstyle/com/puppycrawl/tools/checkstyle/checks/metrics/JavaNCSSCheck.java

@@ -330,7 +330,7 @@ public class JavaNCSSCheck extends Check
      *
      * Class representing a counter,
      */
-    private class Counter
+    private static class Counter
     {
         /** the counters internal integer */
         private int mIvCount;

src/checkstyle/com/puppycrawl/tools/checkstyle/checks/sizes/ExecutableStatementCountCheck.java

@@ -185,7 +185,7 @@ public final class ExecutableStatementCountCheck
      * Class to encapsulate counting information about one member.
      * @author Simon Harris
      */
-    private class Context
+    private static class Context
     {
         /** Member AST node. */
         private final DetailAST mAST;

src/checkstyle/com/puppycrawl/tools/checkstyle/doclets/CheckDocsDoclet.java

@@ -19,14 +19,14 @@
 
 package com.puppycrawl.tools.checkstyle.doclets;
 
-import com.sun.javadoc.RootDoc;
 import com.sun.javadoc.ClassDoc;
+import com.sun.javadoc.RootDoc;
 import com.sun.javadoc.Tag;
-
-import java.io.IOException;
-import java.io.PrintWriter;
 import java.io.File;
 import java.io.FileWriter;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.io.Serializable;
 import java.util.Arrays;
 import java.util.Comparator;
 
@@ -47,7 +47,7 @@ public final class CheckDocsDoclet
      * by their check name.
      */
     private static class ClassDocByCheckNameComparator implements
-            Comparator<ClassDoc>
+            Comparator<ClassDoc>, Serializable
     {
         /** {@inheritDoc} */
         public int compare(ClassDoc aObject1, ClassDoc aObject2)

src/tests/com/puppycrawl/tools/checkstyle/XMLLoggerTest.java

@@ -206,7 +206,7 @@ public class XMLLoggerTest
         assertEquals("last line.", "</checkstyle>", lines[lines.length - 1]);
     }
 
-    private class TestThrowable extends Exception
+    private static class TestThrowable extends Exception
     {
         @Override
         public void printStackTrace(PrintWriter s)

src/tests/com/puppycrawl/tools/checkstyle/api/AutomaticBeanTest.java

@@ -5,7 +5,7 @@ import org.junit.Test;
 
 public class AutomaticBeanTest
 {
-    private class TestBean extends AutomaticBean
+    private static class TestBean extends AutomaticBean
     {
         public void setName(String aName)
         {

src/tests/com/puppycrawl/tools/checkstyle/checks/NewlineAtEndOfFileCheckTest.java

@@ -1,6 +1,5 @@
 package com.puppycrawl.tools.checkstyle.checks;
 
-import static org.junit.Assert.fail;
 import com.puppycrawl.tools.checkstyle.BaseCheckTestSupport;
 import com.puppycrawl.tools.checkstyle.DefaultConfiguration;
 import com.puppycrawl.tools.checkstyle.api.CheckstyleException;
@@ -49,20 +48,14 @@ public class NewlineAtEndOfFileCheckTest
             expected);
     }
 
-    @Test
+    @Test(expected=CheckstyleException.class)
     public void testSetLineSeparatorFailure()
         throws Exception
     {
         final DefaultConfiguration checkConfig =
             createCheckConfig(NewlineAtEndOfFileCheck.class);
         checkConfig.addAttribute("lineSeparator", "ct");
-        try {
-            createChecker(checkConfig);
-        }
-        catch (CheckstyleException ex) {
-            return;
-        }
-        fail("should throw conversion exception");
+        createChecker(checkConfig);
     }
 
     @Test

src/tests/com/puppycrawl/tools/checkstyle/checks/indentation/IndentationCheckTest.java

@@ -647,8 +647,8 @@ public class IndentationCheckTest extends BaseCheckTestSupport
             throws Exception
     {
         final DefaultConfiguration checkConfig = createCheckConfig(IndentationCheck.class);
-        checkConfig.addAttribute("basicOffset", new Integer(4).toString());
-        checkConfig.addAttribute("tabWidth", new Integer(4).toString());
+        checkConfig.addAttribute("basicOffset", Integer.valueOf(4).toString());
+        checkConfig.addAttribute("tabWidth", Integer.valueOf(4).toString());
         final String[] expected = {
             "25: ctor def child at indentation level 9 not at correct indentation, 8",
         };
@@ -660,7 +660,7 @@ public class IndentationCheckTest extends BaseCheckTestSupport
             throws Exception
     {
         final DefaultConfiguration checkConfig = createCheckConfig(IndentationCheck.class);
-        checkConfig.addAttribute("basicOffset", new Integer(2).toString());
+        checkConfig.addAttribute("basicOffset", Integer.valueOf(2).toString());
         final String[] expected = {
             "25: ctor def child at indentation level 5 not at correct indentation, 4",
         };
@@ -672,7 +672,7 @@ public class IndentationCheckTest extends BaseCheckTestSupport
             throws Exception
     {
         final DefaultConfiguration checkConfig = createCheckConfig(IndentationCheck.class);
-        checkConfig.addAttribute("caseIndent", new Integer(0).toString());
+        checkConfig.addAttribute("caseIndent", Integer.valueOf(0).toString());
         final String[] expected = {
             "23: case child at indentation level 10 not at correct indentation, 8",
         };
@@ -684,7 +684,7 @@ public class IndentationCheckTest extends BaseCheckTestSupport
             throws Exception
     {
         final DefaultConfiguration checkConfig = createCheckConfig(IndentationCheck.class);
-        checkConfig.addAttribute("braceAdjustment", new Integer(2).toString());
+        checkConfig.addAttribute("braceAdjustment", Integer.valueOf(2).toString());
         final String[] expected = {
             "24: if rcurly at indentation level 8 not at correct indentation, 10",
         };

src/tests/com/puppycrawl/tools/checkstyle/filters/CSVFilterTest.java

@@ -2,7 +2,6 @@ package com.puppycrawl.tools.checkstyle.filters;
 
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
-
 import org.junit.Test;
 
 /** Tests CSVFilter */
@@ -12,52 +11,52 @@ public class CSVFilterTest
     public void testDecideSingle()
     {
         final IntFilter filter = new CSVFilter("0");
-        assertFalse("less than", filter.accept(new Integer(-1)));
-        assertTrue("equal", filter.accept(new Integer(0)));
-        assertFalse("greater than", filter.accept(new Integer(1)));
+        assertFalse("less than", filter.accept(Integer.valueOf(-1)));
+        assertTrue("equal", filter.accept(Integer.valueOf(0)));
+        assertFalse("greater than", filter.accept(Integer.valueOf(1)));
     }
 
     @Test
     public void testDecidePair()
     {
         final IntFilter filter = new CSVFilter("0, 2");
-        assertFalse("less than", filter.accept(new Integer(-1)));
-        assertTrue("equal 0", filter.accept(new Integer(0)));
-        assertFalse("greater than", filter.accept(new Integer(1)));
-        assertTrue("equal 2", filter.accept(new Integer(2)));
+        assertFalse("less than", filter.accept(Integer.valueOf(-1)));
+        assertTrue("equal 0", filter.accept(Integer.valueOf(0)));
+        assertFalse("greater than", filter.accept(Integer.valueOf(1)));
+        assertTrue("equal 2", filter.accept(Integer.valueOf(2)));
     }
 
     @Test
     public void testDecideRange()
     {
         final IntFilter filter = new CSVFilter("0-2");
-        assertFalse("less than", filter.accept(new Integer(-1)));
-        assertTrue("equal 0", filter.accept(new Integer(0)));
-        assertTrue("equal 1", filter.accept(new Integer(1)));
-        assertTrue("equal 2", filter.accept(new Integer(2)));
-        assertFalse("greater than", filter.accept(new Integer(3)));
+        assertFalse("less than", filter.accept(Integer.valueOf(-1)));
+        assertTrue("equal 0", filter.accept(Integer.valueOf(0)));
+        assertTrue("equal 1", filter.accept(Integer.valueOf(1)));
+        assertTrue("equal 2", filter.accept(Integer.valueOf(2)));
+        assertFalse("greater than", filter.accept(Integer.valueOf(3)));
     }
 
     @Test
     public void testDecideEmptyRange()
     {
         final IntFilter filter = new CSVFilter("2-0");
-        assertFalse("less than", filter.accept(new Integer(-1)));
-        assertFalse("equal 0", filter.accept(new Integer(0)));
-        assertFalse("equal 1", filter.accept(new Integer(1)));
-        assertFalse("equal 2", filter.accept(new Integer(2)));
-        assertFalse("greater than", filter.accept(new Integer(3)));
+        assertFalse("less than", filter.accept(Integer.valueOf(-1)));
+        assertFalse("equal 0", filter.accept(Integer.valueOf(0)));
+        assertFalse("equal 1", filter.accept(Integer.valueOf(1)));
+        assertFalse("equal 2", filter.accept(Integer.valueOf(2)));
+        assertFalse("greater than", filter.accept(Integer.valueOf(3)));
     }
 
     @Test
     public void testDecideRangePlusValue()
     {
         final IntFilter filter = new CSVFilter("0-2, 10");
-        assertFalse("less than", filter.accept(new Integer(-1)));
-        assertTrue("equal 0", filter.accept(new Integer(0)));
-        assertTrue("equal 1", filter.accept(new Integer(1)));
-        assertTrue("equal 2", filter.accept(new Integer(2)));
-        assertFalse("greater than", filter.accept(new Integer(3)));
-        assertTrue("equal 10", filter.accept(new Integer(10)));
+        assertFalse("less than", filter.accept(Integer.valueOf(-1)));
+        assertTrue("equal 0", filter.accept(Integer.valueOf(0)));
+        assertTrue("equal 1", filter.accept(Integer.valueOf(1)));
+        assertTrue("equal 2", filter.accept(Integer.valueOf(2)));
+        assertFalse("greater than", filter.accept(Integer.valueOf(3)));
+        assertTrue("equal 10", filter.accept(Integer.valueOf(10)));
     }
 }

src/tests/com/puppycrawl/tools/checkstyle/filters/FilterSetTest.java

@@ -2,7 +2,6 @@ package com.puppycrawl.tools.checkstyle.filters;
 
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
-
 import org.junit.Before;
 import org.junit.Test;
 
@@ -21,15 +20,15 @@ public class FilterSetTest
     @Test
     public void testEmptyChain()
     {
-        assertFalse("0", filter.accept(new Integer(0)));
+        assertFalse("0", filter.accept(Integer.valueOf(0)));
     }
 
     @Test
     public void testOneFilter()
     {
         filter.addFilter(new IntMatchFilter(0));
-        assertTrue("0", filter.accept(new Integer(0)));
-        assertFalse("1", filter.accept(new Integer(1)));
+        assertTrue("0", filter.accept(Integer.valueOf(0)));
+        assertFalse("1", filter.accept(Integer.valueOf(1)));
     }
 
     @Test
@@ -37,9 +36,9 @@ public class FilterSetTest
     {
         filter.addFilter(new IntMatchFilter(0));
         filter.addFilter(new IntRangeFilter(0, 2));
-        assertTrue("0", filter.accept(new Integer(0)));
-        assertTrue("1", filter.accept(new Integer(1)));
+        assertTrue("0", filter.accept(Integer.valueOf(0)));
+        assertTrue("1", filter.accept(Integer.valueOf(1)));
         filter.addFilter(new IntRangeFilter(3, 4));
-        assertTrue("0 is in [3,4]", filter.accept(new Integer(0)));
+        assertTrue("0 is in [3,4]", filter.accept(Integer.valueOf(0)));
     }
 }

src/tests/com/puppycrawl/tools/checkstyle/filters/IntMatchFilterTest.java

@@ -3,7 +3,6 @@ package com.puppycrawl.tools.checkstyle.filters;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
-
 import org.junit.Test;
 
 /** Tests IntMatchFilter */
@@ -13,9 +12,9 @@ public class IntMatchFilterTest
     public void testDecide()
     {
         final IntFilter filter = new IntMatchFilter(0);
-        assertFalse("less than", filter.accept(new Integer(-1)));
-        assertTrue("equal", filter.accept(new Integer(0)));
-        assertFalse("greater than", filter.accept(new Integer(1)));
+        assertFalse("less than", filter.accept(Integer.valueOf(-1)));
+        assertTrue("equal", filter.accept(Integer.valueOf(0)));
+        assertFalse("greater than", filter.accept(Integer.valueOf(1)));
     }
 
     @Test

src/tests/com/puppycrawl/tools/checkstyle/filters/IntRangeFilterTest.java

@@ -3,7 +3,6 @@ package com.puppycrawl.tools.checkstyle.filters;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
-
 import org.junit.Test;
 
 /** Tests IntRangeFilter */
@@ -13,31 +12,31 @@ public class IntRangeFilterTest
     public void testDecide()
     {
         final IntFilter filter = new IntRangeFilter(0, 10);
-        assertFalse("less than", filter.accept(new Integer(-1)));
-        assertTrue("in range", filter.accept(new Integer(0)));
-        assertTrue("in range", filter.accept(new Integer(5)));
-        assertTrue("in range", filter.accept(new Integer(10)));
-        assertFalse("greater than", filter.accept(new Integer(11)));
+        assertFalse("less than", filter.accept(Integer.valueOf(-1)));
+        assertTrue("in range", filter.accept(Integer.valueOf(0)));
+        assertTrue("in range", filter.accept(Integer.valueOf(5)));
+        assertTrue("in range", filter.accept(Integer.valueOf(10)));
+        assertFalse("greater than", filter.accept(Integer.valueOf(11)));
     }
 
     @Test
     public void testDecideSingle()
     {
         final IntFilter filter = new IntRangeFilter(0, 0);
-        assertFalse("less than", filter.accept(new Integer(-1)));
-        assertTrue("in range", filter.accept(new Integer(0)));
-        assertFalse("greater than", filter.accept(new Integer(1)));
+        assertFalse("less than", filter.accept(Integer.valueOf(-1)));
+        assertTrue("in range", filter.accept(Integer.valueOf(0)));
+        assertFalse("greater than", filter.accept(Integer.valueOf(1)));
     }
 
     @Test
     public void testDecideEmpty()
     {
         final IntFilter filter = new IntRangeFilter(10, 0);
-        assertFalse("out", filter.accept(new Integer(-1)));
-        assertFalse("out", filter.accept(new Integer(0)));
-        assertFalse("out", filter.accept(new Integer(5)));
-        assertFalse("out", filter.accept(new Integer(10)));
-        assertFalse("out", filter.accept(new Integer(11)));
+        assertFalse("out", filter.accept(Integer.valueOf(-1)));
+        assertFalse("out", filter.accept(Integer.valueOf(0)));
+        assertFalse("out", filter.accept(Integer.valueOf(5)));
+        assertFalse("out", filter.accept(Integer.valueOf(10)));
+        assertFalse("out", filter.accept(Integer.valueOf(11)));
     }
 
     @Test