From 3cff4f3d22fbd6c1dc6aa15140b2c4a9c63609d5 Mon Sep 17 00:00:00 2001
From: Tomi De Lucca <tomas.delucca@mercadolibre.com>
Date: Sat, 16 Feb 2019 01:19:05 -0300
Subject: [PATCH] Minor fixes

---
 .../sourceforge/pmd/cpd/AntlrTokenizer.java   |  8 ++++----
 .../pmd/cpd/token/AntlrTokenFilter.java       |  1 -
 .../pmd/cpd/token/BaseTokenFilter.java        | 20 +++++++++----------
 .../pmd/cpd/token/JavaCCTokenFilter.java      |  5 +++++
 4 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/cpd/AntlrTokenizer.java b/pmd-core/src/main/java/net/sourceforge/pmd/cpd/AntlrTokenizer.java
index 22a2b5d5c5..2b0d2c56ea 100644
--- a/pmd-core/src/main/java/net/sourceforge/pmd/cpd/AntlrTokenizer.java
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/cpd/AntlrTokenizer.java
@@ -22,8 +22,8 @@ public abstract class AntlrTokenizer implements Tokenizer {
     @Override
     public void tokenize(final SourceCode sourceCode, final Tokens tokenEntries) {
 
-        AntlrTokenManager tokenManager = getLexerForSource(sourceCode);
-        AntlrTokenFilter tokenFilter = getTokenFilter(tokenManager);
+        final AntlrTokenManager tokenManager = getLexerForSource(sourceCode);
+        final AntlrTokenFilter tokenFilter = getTokenFilter(tokenManager);
 
         try {
             AntlrToken currentToken = tokenFilter.getNextToken();
@@ -42,7 +42,7 @@ public abstract class AntlrTokenizer implements Tokenizer {
         }
     }
 
-    protected AntlrTokenFilter getTokenFilter(AntlrTokenManager tokenManager) {
+    protected AntlrTokenFilter getTokenFilter(final AntlrTokenManager tokenManager) {
         return new AntlrTokenFilter(tokenManager);
     }
 
@@ -51,7 +51,7 @@ public abstract class AntlrTokenizer implements Tokenizer {
         return CharStreams.fromString(buffer.toString());
     }
 
-    private void processToken(Tokens tokenEntries, String fileName, AntlrToken token) {
+    private void processToken(final Tokens tokenEntries, final String fileName, final AntlrToken token) {
         final TokenEntry tokenEntry = new TokenEntry(token.getImage(), fileName, token.getBeginLine());
         tokenEntries.add(tokenEntry);
     }
diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/cpd/token/AntlrTokenFilter.java b/pmd-core/src/main/java/net/sourceforge/pmd/cpd/token/AntlrTokenFilter.java
index e15aff8b34..e1eee7b77b 100644
--- a/pmd-core/src/main/java/net/sourceforge/pmd/cpd/token/AntlrTokenFilter.java
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/cpd/token/AntlrTokenFilter.java
@@ -31,7 +31,6 @@ public class AntlrTokenFilter extends BaseTokenFilter<AntlrToken> {
 
     @Override
     protected void analyzeToken(final AntlrToken currentToken) {
-        super.analyzeToken(currentToken);
         analyzeHiddenTokens(currentToken);
     }
 
diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/cpd/token/BaseTokenFilter.java b/pmd-core/src/main/java/net/sourceforge/pmd/cpd/token/BaseTokenFilter.java
index 5fe73fdd2a..4be453b919 100644
--- a/pmd-core/src/main/java/net/sourceforge/pmd/cpd/token/BaseTokenFilter.java
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/cpd/token/BaseTokenFilter.java
@@ -61,14 +61,6 @@ public abstract class BaseTokenFilter<T extends GenericToken> implements TokenFi
         }
     }
 
-    /**
-     * Extension point for subclasses to indicate when to stop filtering tokens.
-     *
-     * @param currentToken The token to be analyzed
-     * @return True if the token filter has finished consuming all tokens, false otherwise
-     */
-    protected abstract boolean shouldStopProcessing(T currentToken);
-
     /**
      * Extension point for subclasses to indicate tokens are to be filtered.
      *
@@ -78,6 +70,14 @@ public abstract class BaseTokenFilter<T extends GenericToken> implements TokenFi
         return false;
     }
 
+    /**
+     * Extension point for subclasses to indicate when to stop filtering tokens.
+     *
+     * @param currentToken The token to be analyzed
+     * @return True if the token filter has finished consuming all tokens, false otherwise
+     */
+    protected abstract boolean shouldStopProcessing(T currentToken);
+
     /**
      * Extension point for subclasses to analyze all tokens (before filtering)
      * and update internal status to decide on custom discard rules.
@@ -85,8 +85,6 @@ public abstract class BaseTokenFilter<T extends GenericToken> implements TokenFi
      * @param currentToken The token to be analyzed
      * @see #isLanguageSpecificDiscarding()
      */
-    protected void analyzeToken(final T currentToken) {
-        // noop
-    }
+    protected abstract void analyzeToken(T currentToken);
 
 }
diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/cpd/token/JavaCCTokenFilter.java b/pmd-core/src/main/java/net/sourceforge/pmd/cpd/token/JavaCCTokenFilter.java
index 734b9fcff3..3231e353e2 100644
--- a/pmd-core/src/main/java/net/sourceforge/pmd/cpd/token/JavaCCTokenFilter.java
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/cpd/token/JavaCCTokenFilter.java
@@ -25,4 +25,9 @@ public class JavaCCTokenFilter extends BaseTokenFilter<GenericToken> {
     protected boolean shouldStopProcessing(final GenericToken currentToken) {
         return currentToken.getImage().isEmpty();
     }
+
+    @Override
+    protected void analyzeToken(final GenericToken currentToken) {
+        // noop
+    }
 }