From 15c7162ea43a4e7517227a281f6f34d4a2ecb5a5 Mon Sep 17 00:00:00 2001
From: Oliver Burn <oliver@puppycrawl.com>
Date: Wed, 23 Jan 2002 12:28:49 +0000
Subject: [PATCH] Refactored Checker to not take a PrintStream. All errors are
 not logged to standard output.

---
 .../tools/checkstyle/CheckStyleTask.java          |  2 +-
 .../com/puppycrawl/tools/checkstyle/Checker.java  |  6 ++----
 .../com/puppycrawl/tools/checkstyle/Main.java     |  3 +--
 .../tools/checkstyle/PropertyCacheFile.java       | 15 +++++----------
 .../puppycrawl/tools/checkstyle/CheckerTest.java  |  2 +-
 5 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/src/checkstyle/com/puppycrawl/tools/checkstyle/CheckStyleTask.java b/src/checkstyle/com/puppycrawl/tools/checkstyle/CheckStyleTask.java
index 22f8faf2b..c37fe3488 100644
--- a/src/checkstyle/com/puppycrawl/tools/checkstyle/CheckStyleTask.java
+++ b/src/checkstyle/com/puppycrawl/tools/checkstyle/CheckStyleTask.java
@@ -288,7 +288,7 @@ public class CheckStyleTask
         final int numErrs;
         Checker c = null;
         try {
-            c = new Checker(mConfig, System.out);
+            c = new Checker(mConfig);
             AuditListener[] listeners = getListeners();
             for (int i = 0; i < listeners.length; i++) {
                 c.addListener(listeners[i]);
diff --git a/src/checkstyle/com/puppycrawl/tools/checkstyle/Checker.java b/src/checkstyle/com/puppycrawl/tools/checkstyle/Checker.java
index 06c14f4cf..2519898ee 100644
--- a/src/checkstyle/com/puppycrawl/tools/checkstyle/Checker.java
+++ b/src/checkstyle/com/puppycrawl/tools/checkstyle/Checker.java
@@ -26,7 +26,6 @@ import java.io.FileReader;
 import java.io.IOException;
 import java.io.LineNumberReader;
 import java.io.OutputStream;
-import java.io.PrintStream;
 import java.io.Reader;
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -49,13 +48,12 @@ public class Checker
     /**
      * Constructs the object.
      * @param aConfig contains the configuration to check with
-     * @param aLog the PrintStream to log messages to
      * @throws RESyntaxException unable to create a regexp object
      **/
-    public Checker(Configuration aConfig, PrintStream aLog)
+    public Checker(Configuration aConfig)
         throws RESyntaxException
     {
-        mCache = new PropertyCacheFile(aConfig.getCacheFile(), aLog);
+        mCache = new PropertyCacheFile(aConfig.getCacheFile());
         final Verifier v = new Verifier(aConfig);
         VerifierSingleton.setInstance(v);
     }
diff --git a/src/checkstyle/com/puppycrawl/tools/checkstyle/Main.java b/src/checkstyle/com/puppycrawl/tools/checkstyle/Main.java
index 6da04f181..2a0c4ae31 100644
--- a/src/checkstyle/com/puppycrawl/tools/checkstyle/Main.java
+++ b/src/checkstyle/com/puppycrawl/tools/checkstyle/Main.java
@@ -86,8 +86,7 @@ public final class Main
         Checker c = null;
         try {
             c = new Checker(new Configuration(System.getProperties(),
-                                              System.out),
-                            System.out);
+                                              System.out));
             c.addListener(listener);
         }
         catch (RESyntaxException rese) {
diff --git a/src/checkstyle/com/puppycrawl/tools/checkstyle/PropertyCacheFile.java b/src/checkstyle/com/puppycrawl/tools/checkstyle/PropertyCacheFile.java
index c76c6ae53..f42bceadb 100644
--- a/src/checkstyle/com/puppycrawl/tools/checkstyle/PropertyCacheFile.java
+++ b/src/checkstyle/com/puppycrawl/tools/checkstyle/PropertyCacheFile.java
@@ -22,7 +22,6 @@ import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.IOException;
-import java.io.PrintStream;
 import java.util.Properties;
 
 /**
@@ -35,8 +34,6 @@ class PropertyCacheFile
 {
     /** name of file to store details **/
     private final String mDetailsFile;
-    /** where to log messages **/
-    private final PrintStream mLog;
     /** the details on files **/
     private final Properties mDetails = new Properties();
 
@@ -45,11 +42,9 @@ class PropertyCacheFile
      *
      * @param aFileName name of properties file that contains details. if the
                         file does not exist, it will be created
-     * @param aLog where to log errors
      */
-    PropertyCacheFile(String aFileName, PrintStream aLog)
+    PropertyCacheFile(String aFileName)
     {
-        mLog = aLog;
         boolean setInActive = true;
         if (aFileName != null) {
             try {
@@ -61,8 +56,8 @@ class PropertyCacheFile
                 setInActive = false;
             }
             catch (IOException e) {
-                mLog.println("Unable to open cache file, ignoring.");
-                e.printStackTrace(mLog);
+                System.out.println("Unable to open cache file, ignoring.");
+                e.printStackTrace(System.out);
             }
         }
         mDetailsFile = (setInActive) ? null : aFileName;
@@ -76,8 +71,8 @@ class PropertyCacheFile
                 mDetails.store(new FileOutputStream(mDetailsFile), null);
             }
             catch (IOException e) {
-                mLog.println("Unable to save cache file");
-                e.printStackTrace(mLog);
+                System.out.println("Unable to save cache file");
+                e.printStackTrace(System.out);
             }
         }
     }
diff --git a/src/tests/com/puppycrawl/tools/checkstyle/CheckerTest.java b/src/tests/com/puppycrawl/tools/checkstyle/CheckerTest.java
index a64656dfd..a865eef5e 100644
--- a/src/tests/com/puppycrawl/tools/checkstyle/CheckerTest.java
+++ b/src/tests/com/puppycrawl/tools/checkstyle/CheckerTest.java
@@ -55,7 +55,7 @@ public class CheckerTest
         throws RESyntaxException
     {
         final AuditListener listener = new BriefLogger(mStream);
-        final Checker c = new Checker(mConfig, mStream);
+        final Checker c = new Checker(mConfig);
         c.addListener(listener);
         return c;
     }