From 8da3b6dea4b446e055bb86b2bffb619008ee97b5 Mon Sep 17 00:00:00 2001 From: Ruslan Diachenko Date: Fri, 28 Aug 2015 23:47:28 +0100 Subject: [PATCH] Issue #1566: ReturnCount violation fixed for AbstractJavadocCheck --- .../checks/javadoc/AbstractJavadocCheck.java | 27 ++++++++++--------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/AbstractJavadocCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/AbstractJavadocCheck.java index 1de6df5a0..565286d0b 100755 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/AbstractJavadocCheck.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/AbstractJavadocCheck.java @@ -376,24 +376,25 @@ public abstract class AbstractJavadocCheck extends Check { * @return next sibling of ParseTree node. */ private static ParseTree getNextSibling(ParseTree node) { - if (node.getParent() == null) { - return null; - } + ParseTree nextSibling = null; - final ParseTree parent = node.getParent(); - final int childCount = parent.getChildCount(); + if (node.getParent() != null) { + final ParseTree parent = node.getParent(); + final int childCount = parent.getChildCount(); - int i = 0; - while (true) { - final ParseTree currentNode = parent.getChild(i); - if (currentNode.equals(node)) { - if (i == childCount - 1) { - return null; + int i = 0; + while (true) { + final ParseTree currentNode = parent.getChild(i); + if (currentNode.equals(node)) { + if (i != childCount - 1) { + nextSibling = parent.getChild(i + 1); + } + break; } - return parent.getChild(i + 1); + i++; } - i++; } + return nextSibling; } /**