From 889f470ea6ca16b3067e35e2463282d9678f7bf0 Mon Sep 17 00:00:00 2001
From: Oliver Burn <oliver@puppycrawl.com>
Date: Wed, 21 Jul 2004 11:15:46 +0000
Subject: [PATCH] General cleanup

---
 .../com/puppycrawl/tools/checkstyle/filters/CSVFilter.java    | 4 +---
 .../puppycrawl/tools/checkstyle/filters/IntMatchFilter.java   | 4 +---
 .../puppycrawl/tools/checkstyle/filters/IntRangeFilter.java   | 4 +---
 .../tools/checkstyle/filters/SeverityMatchFilter.java         | 4 +---
 .../puppycrawl/tools/checkstyle/filters/SuppressElement.java  | 4 +---
 .../tools/checkstyle/filters/SuppressionFilter.java           | 4 +---
 6 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/src/checkstyle/com/puppycrawl/tools/checkstyle/filters/CSVFilter.java b/src/checkstyle/com/puppycrawl/tools/checkstyle/filters/CSVFilter.java
index c280f4117..dec4104ec 100644
--- a/src/checkstyle/com/puppycrawl/tools/checkstyle/filters/CSVFilter.java
+++ b/src/checkstyle/com/puppycrawl/tools/checkstyle/filters/CSVFilter.java
@@ -120,8 +120,6 @@ class CSVFilter implements IntFilter
             final CSVFilter other = (CSVFilter) aObject;
             return this.mFilters.equals(other.mFilters);
         }
-        else {
-            return false;
-        }
+        return false;
     }
 }
diff --git a/src/checkstyle/com/puppycrawl/tools/checkstyle/filters/IntMatchFilter.java b/src/checkstyle/com/puppycrawl/tools/checkstyle/filters/IntMatchFilter.java
index cc7930420..2ebe83ae2 100644
--- a/src/checkstyle/com/puppycrawl/tools/checkstyle/filters/IntMatchFilter.java
+++ b/src/checkstyle/com/puppycrawl/tools/checkstyle/filters/IntMatchFilter.java
@@ -61,8 +61,6 @@ class IntMatchFilter implements IntFilter
             final IntMatchFilter other = (IntMatchFilter) aObject;
             return (this.mMatchValue).equals(other.mMatchValue);
         }
-        else {
-            return false;
-        }
+        return false;
     }
 }
diff --git a/src/checkstyle/com/puppycrawl/tools/checkstyle/filters/IntRangeFilter.java b/src/checkstyle/com/puppycrawl/tools/checkstyle/filters/IntRangeFilter.java
index 407398d34..92a8cc6ae 100644
--- a/src/checkstyle/com/puppycrawl/tools/checkstyle/filters/IntRangeFilter.java
+++ b/src/checkstyle/com/puppycrawl/tools/checkstyle/filters/IntRangeFilter.java
@@ -66,9 +66,7 @@ class IntRangeFilter implements IntFilter
             return (this.mLowerBound.equals(other.mLowerBound)
                 && this.mUpperBound.equals(other.mUpperBound));
         }
-        else {
-            return false;
-        }
+        return false;
     }
     /** @see java.lang.Object#toString() */
     public String toString()
diff --git a/src/checkstyle/com/puppycrawl/tools/checkstyle/filters/SeverityMatchFilter.java b/src/checkstyle/com/puppycrawl/tools/checkstyle/filters/SeverityMatchFilter.java
index f535f3ec8..eb720cad9 100644
--- a/src/checkstyle/com/puppycrawl/tools/checkstyle/filters/SeverityMatchFilter.java
+++ b/src/checkstyle/com/puppycrawl/tools/checkstyle/filters/SeverityMatchFilter.java
@@ -68,8 +68,6 @@ public class SeverityMatchFilter
         if (mAcceptOnMatch) {
             return result;
         }
-        else {
-            return !result;
-        }
+        return !result;
     }
 }
diff --git a/src/checkstyle/com/puppycrawl/tools/checkstyle/filters/SuppressElement.java b/src/checkstyle/com/puppycrawl/tools/checkstyle/filters/SuppressElement.java
index 0060d5cd2..e8582ba4f 100644
--- a/src/checkstyle/com/puppycrawl/tools/checkstyle/filters/SuppressElement.java
+++ b/src/checkstyle/com/puppycrawl/tools/checkstyle/filters/SuppressElement.java
@@ -209,8 +209,6 @@ public class SuppressElement
             // everything is the same
             return true;
         }
-        else {
-            return false;
-        }
+        return false;
     }
 }
diff --git a/src/checkstyle/com/puppycrawl/tools/checkstyle/filters/SuppressionFilter.java b/src/checkstyle/com/puppycrawl/tools/checkstyle/filters/SuppressionFilter.java
index 5c3fd7934..0e9258fbc 100644
--- a/src/checkstyle/com/puppycrawl/tools/checkstyle/filters/SuppressionFilter.java
+++ b/src/checkstyle/com/puppycrawl/tools/checkstyle/filters/SuppressionFilter.java
@@ -74,8 +74,6 @@ public class SuppressionFilter
             final SuppressionFilter other = (SuppressionFilter) aObject;
             return this.mFilters.equals(other.mFilters);
         }
-        else {
-            return false;
-        }
+        return false;
     }
 }