TouchInstinct
/
checkstyle
306
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Issue #46. Statements shouldn't be nested too deep

This commit is contained in:
Ilja Dubinin 2015-08-31 16:44:14 +01:00 committed by Roman Ivanov
parent 1a205d4b43
commit faa8a0b7a4
1 changed files with 27 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocMethodCheck.java
View File

@ -750,19 +750,8 @@ public class JavadocMethodCheck extends AbstractTypeAwareCheck {
boolean found = removeMatchingParam(params, arg1);
if (CommonUtils.startsWithChar(arg1, '<') && CommonUtils.endsWithChar(arg1, '>')) {
// Loop looking for matching type param
final Iterator<DetailAST> typeParamsIt = typeParams.iterator();
while (typeParamsIt.hasNext()) {
final DetailAST typeParam = typeParamsIt.next();
if (typeParam.findFirstToken(TokenTypes.IDENT).getText()
.equals(
arg1.substring(1,
arg1.length() - 1))) {
found = true;
typeParamsIt.remove();
break;
}
}
found = searchMatchingTypeParameter(typeParams,
arg1.substring(1, arg1.length() - 1));
}
@ -790,6 +779,31 @@ public class JavadocMethodCheck extends AbstractTypeAwareCheck {
}
}
/**
* Returns true if required type found in type parameters.
* @param typeParams
* list of type parameters
* @param requiredTypeName
* name of required type
* @return true if required type found in type parameters.
*/
private static boolean searchMatchingTypeParameter(List<DetailAST> typeParams,
String requiredTypeName) {
// Loop looking for matching type param
final Iterator<DetailAST> typeParamsIt = typeParams.iterator();
boolean found = false;
while (typeParamsIt.hasNext()) {
final DetailAST typeParam = typeParamsIt.next();
if (typeParam.findFirstToken(TokenTypes.IDENT).getText()
.equals(requiredTypeName)) {
found = true;
typeParamsIt.remove();
break;
}
}
return found;
}
/**
* Remove parameter from params collection by name.
* @param params collection of DetailAST parameters