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

minor: Extracts isCharacterValidAfterGenericEnd method in GenericWhitespaceCheck

This commit is contained in:
liscju 2015-12-02 11:26:20 +01:00 committed by Roman Ivanov
parent b4c351b03d
commit 3989e7b803
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/GenericWhitespaceCheck.java
View File

@ -215,10 +215,7 @@ public class GenericWhitespaceCheck extends Check {
log(ast.getLineNo(), after, WS_FOLLOWED, CLOSE_ANGLE_BRACKET);
}
}
else if (!Character.isWhitespace(charAfter)
&& charAfter != '(' && charAfter != ')'
&& charAfter != ',' && charAfter != '['
&& charAfter != '.' && charAfter != ':') {
else if (!isCharacterValidAfterGenericEnd(charAfter)) {
log(ast.getLineNo(), after, WS_ILLEGAL_FOLLOW, CLOSE_ANGLE_BRACKET);
}
}
@ -303,4 +300,16 @@ public class GenericWhitespaceCheck extends Check {
}
return true;
}
/**
* Checks whether given character is valid to be right after generic ends
* @param charAfter character to check
* @return checks if given character is valid
*/
private static boolean isCharacterValidAfterGenericEnd(char charAfter) {
return Character.isWhitespace(charAfter)
|| charAfter == '(' || charAfter == ')'
|| charAfter == ',' || charAfter == '['
|| charAfter == '.' || charAfter == ':';
}
}