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

Issue #1566: ReturnCount violation fixed for IllegalInstantiationCheck

This commit is contained in:
Ruslan Diachenko 2015-08-28 00:22:11 +01:00 committed by Roman Ivanov
parent 12bd833406
commit 46378dadb5
1 changed files with 23 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalInstantiationCheck.java
View File

@ -226,32 +226,36 @@ public class IllegalInstantiationCheck
* or null if instantiation of className is OK
*/
private String getIllegalInstantiation(String className) {
if (illegalClasses.contains(className)) {
return className;
}
final int pkgNameLen;
String fullClassName = null;
if (pkgName == null) {
pkgNameLen = 0;
if (illegalClasses.contains(className)) {
fullClassName = className;
}
else {
pkgNameLen = pkgName.length();
}
final int pkgNameLen;
for (String illegal : illegalClasses) {
if (pkgName == null) {
pkgNameLen = 0;
}
else {
pkgNameLen = pkgName.length();
}
if (isStandardClass(className, illegal)) {
return illegal;
}
if (isSamePackage(className, pkgNameLen, illegal)) {
return illegal;
}
final String importArg = checkImportStatements(className);
if (importArg != null) {
return importArg;
for (String illegal : illegalClasses) {
if (isStandardClass(className, illegal)
|| isSamePackage(className, pkgNameLen, illegal)) {
fullClassName = illegal;
}
else {
fullClassName = checkImportStatements(className);
}
if (fullClassName != null) {
break;
}
}
}
return null;
return fullClassName;
}
/**