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

Issue #1566: partial fix of ReturnCount violations

This commit is contained in:
Ruslan Diachenko 2015-08-26 22:11:18 +01:00 committed by Roman Ivanov
parent 98a3157200
commit 044889b26a
1 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/PkgControl.java
View File

@ -82,23 +82,23 @@ class PkgControl {
* @return the finest match, or null if no match at all.
*/
PkgControl locateFinest(final String forPkg) {
PkgControl finestMatch = null;
// Check if we are a match.
// This algormithm should be improved to check for a trailing "."
// This algorithm should be improved to check for a trailing "."
// or nothing following.
if (!forPkg.startsWith(fullPackage)) {
return null;
}
// Check if any of the children match.
for (PkgControl pc : children) {
final PkgControl match = pc.locateFinest(forPkg);
if (match != null) {
return match;
if (forPkg.startsWith(fullPackage)) {
// If there won't be match so I am the best there is.
finestMatch = this;
// Check if any of the children match.
for (PkgControl pc : children) {
final PkgControl match = pc.locateFinest(forPkg);
if (match != null) {
finestMatch = match;
break;
}
}
}
// No match so I am the best there is.
return this;
return finestMatch;
}
/**
@ -112,16 +112,19 @@ class PkgControl {
* @return an {@link AccessResult}.
*/
AccessResult checkAccess(final String forImport, final String inPkg) {
AccessResult result;
final AccessResult retVal = localCheckAccess(forImport, inPkg);
if (retVal != AccessResult.UNKNOWN) {
return retVal;
result = retVal;
}
if (parent == null) {
else if (parent == null) {
// we are the top, so default to not allowed.
return AccessResult.DISALLOWED;
result = AccessResult.DISALLOWED;
}
return parent.checkAccess(forImport, inPkg);
else {
result = parent.checkAccess(forImport, inPkg);
}
return result;
}
/**