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

AbbreviationAsWordInNameCheck updated to follow Cyclomatic Complexity rule. #954

This commit is contained in:
Roman Ivanov 2015-06-15 00:12:35 -07:00
parent fd33eb9c26
commit bdda55ed1b
1 changed files with 25 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/AbbreviationAsWordInNameCheck.java
View File

@ -301,30 +301,38 @@ public class AbbreviationAsWordInNameCheck extends Check {
if (abbrStarted) {
abbrStarted = false;
// -1 as a first capital is usually beginning of next word
final int endIndex = index - 1;
final int abbrLength = endIndex - beginIndex;
if (abbrLength > allowedAbbreviationLength) {
result = str.substring(beginIndex, endIndex);
if (!allowedAbbreviations.contains(result)) {
break;
}
else {
result = null;
}
// -1 as a first capital is usually beginning of next word
result = getAbbreviationIfIllegal(str, beginIndex, endIndex);
if (result != null) {
break;
}
beginIndex = -1;
}
}
}
if (abbrStarted) {
// if abbreviation at the end of name and it is not single character (example: scaleX)
if (abbrStarted && beginIndex != str.length() - 1) {
final int endIndex = str.length();
final int abbrLength = endIndex - beginIndex;
if (abbrLength > 1 && abbrLength > allowedAbbreviationLength) {
result = str.substring(beginIndex, endIndex);
if (allowedAbbreviations.contains(result)) {
result = null;
}
result = getAbbreviationIfIllegal(str, beginIndex, endIndex);
}
return result;
}
/**
* get Abbreviation if it is illegal
* @param str name
* @param beginIndex begin index
* @param endIndex end index
* @return true is abbreviation is bigger that requierd and not in ignore list
*/
private String getAbbreviationIfIllegal(String str, int beginIndex, int endIndex) {
String result = null;
final int abbrLength = endIndex - beginIndex;
if (abbrLength > allowedAbbreviationLength) {
final String abbr = str.substring(beginIndex, endIndex);
if (!allowedAbbreviations.contains(abbr)) {
result = abbr;
}
}
return result;