From 4ac32a7c0cf72ee35630432ce260293f80d886b8 Mon Sep 17 00:00:00 2001
From: Michal Kordas <kontakt@michalkordas.com>
Date: Fri, 24 Apr 2015 21:21:29 +0200
Subject: [PATCH] Fix PMD violations from ShortMethodName rule, issue #982

---
 config/pmd.xml                                                | 1 -
 .../checkstyle/checks/indentation/ExpressionHandler.java      | 4 ++--
 .../tools/checkstyle/checks/indentation/IndentLevel.java      | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/config/pmd.xml b/config/pmd.xml
index 9f8b90b75..6d10ba41d 100644
--- a/config/pmd.xml
+++ b/config/pmd.xml
@@ -165,7 +165,6 @@
     <exclude name="AvoidFieldNameMatchingMethodName"/>
     <exclude name="LongVariable"/>
     <exclude name="ShortClassName"/>
-    <exclude name="ShortMethodName"/>
     <exclude name="ShortVariable"/>
   </rule>
   <rule ref="rulesets/java/optimizations.xml">
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/ExpressionHandler.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/ExpressionHandler.java
index e9237d281..c98fbb15f 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/ExpressionHandler.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/ExpressionHandler.java
@@ -345,7 +345,7 @@ public abstract class ExpressionHandler
     {
         final String line = indentCheck.getLine(lineNum - 1);
         final int start = getLineStart(line);
-        if (indentLevel.gt(start)) {
+        if (indentLevel.greaterThan(start)) {
             logChildError(lineNum, start, indentLevel);
         }
     }
@@ -369,7 +369,7 @@ public abstract class ExpressionHandler
         // error if this statement starts the line and it is less than
         // the correct indentation level
         if (mustMatch ? !indentLevel.accept(start)
-            : colNum == start && indentLevel.gt(start))
+            : colNum == start && indentLevel.greaterThan(start))
         {
             logChildError(lineNum, start, indentLevel);
         }
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/IndentLevel.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/IndentLevel.java
index 595de0232..25d677ea9 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/IndentLevel.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/IndentLevel.java
@@ -80,7 +80,7 @@ public class IndentLevel
      * @return true if <code>indent</code> less then minimal of
      *         acceptable indentation levels, false otherwise.
      */
-    public boolean gt(int indent)
+    public boolean greaterThan(int indent)
     {
         return levels.nextSetBit(0) > indent;
     }