From 6c11cedd3bc24183534dd10d6442149d267693b5 Mon Sep 17 00:00:00 2001
From: Roman Ivanov <ivanov-jr@mail.ru>
Date: Sat, 13 Jun 2015 17:27:24 -0700
Subject: [PATCH] DeclarationCollector updated to follow Cyclomatic Complexity
 rule. #954

---
 .../checks/DeclarationCollector.java          | 41 +++++++++++--------
 1 file changed, 25 insertions(+), 16 deletions(-)

diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/DeclarationCollector.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/DeclarationCollector.java
index 624f8a75a..4bb99b3dc 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/DeclarationCollector.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/DeclarationCollector.java
@@ -99,22 +99,7 @@ public abstract class DeclarationCollector extends Check {
         final LexicalFrame frame = frameStack.peek();
         switch (ast.getType()) {
             case TokenTypes.VARIABLE_DEF :  {
-                final String name =
-                        ast.findFirstToken(TokenTypes.IDENT).getText();
-                if (frame instanceof ClassFrame) {
-                    final DetailAST mods =
-                            ast.findFirstToken(TokenTypes.MODIFIERS);
-                    if (ScopeUtils.inInterfaceBlock(ast)
-                            || mods.branchContains(TokenTypes.LITERAL_STATIC)) {
-                        ((ClassFrame) frame).addStaticMember(name);
-                    }
-                    else {
-                        ((ClassFrame) frame).addInstanceMember(name);
-                    }
-                }
-                else {
-                    frame.addName(name);
-                }
+                collectVariableDeclarations(ast, frame);
                 break;
             }
             case TokenTypes.PARAMETER_DEF : {
@@ -156,6 +141,30 @@ public abstract class DeclarationCollector extends Check {
         }
     }
 
+    /**
+     * collect Variable Declarations
+     * @param ast variable token
+     * @param frame current frame
+     */
+    private void collectVariableDeclarations(DetailAST ast, LexicalFrame frame) {
+        final String name =
+                ast.findFirstToken(TokenTypes.IDENT).getText();
+        if (frame instanceof ClassFrame) {
+            final DetailAST mods =
+                    ast.findFirstToken(TokenTypes.MODIFIERS);
+            if (ScopeUtils.inInterfaceBlock(ast)
+                    || mods.branchContains(TokenTypes.LITERAL_STATIC)) {
+                ((ClassFrame) frame).addStaticMember(name);
+            }
+            else {
+                ((ClassFrame) frame).addInstanceMember(name);
+            }
+        }
+        else {
+            frame.addName(name);
+        }
+    }
+
 
     /**
      * End parsing of the AST for declarations.