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

simplified testing and reduced nested if levels.

This commit is contained in:
Rick Giles 2003-07-10 23:25:58 +00:00
parent 3d734ac416
commit c91964b8d9
1 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/checkstyle/com/puppycrawl/tools/checkstyle/checks/usage/UnusedParameterCheck.java
View File

@ -19,7 +19,6 @@
package com.puppycrawl.tools.checkstyle.checks.usage;
import com.puppycrawl.tools.checkstyle.api.DetailAST;
import com.puppycrawl.tools.checkstyle.api.ScopeUtils;
import com.puppycrawl.tools.checkstyle.api.TokenTypes;
@ -63,19 +62,7 @@ public class UnusedParameterCheck extends AbstractUsageCheck
if (parent.getType() == TokenTypes.PARAMETERS) {
final DetailAST grandparent = parent.getParent();
if (grandparent != null) {
if (grandparent.getType() == TokenTypes.METHOD_DEF) {
final DetailAST modifiersAST =
grandparent.findFirstToken(TokenTypes.MODIFIERS);
if ((modifiersAST != null)
&& !modifiersAST.branchContains(TokenTypes.ABSTRACT)
&& !ScopeUtils.inInterfaceBlock(aAST))
{
result = true;
}
}
else if (grandparent.getType() == TokenTypes.CTOR_DEF) {
result = true;
}
result = hasBody(grandparent);
}
}
else if (parent.getType() == TokenTypes.LITERAL_CATCH) {
@ -85,6 +72,23 @@ public class UnusedParameterCheck extends AbstractUsageCheck
return result;
}
/**
* Determines whether an AST is a method definition with a body, or is
* a constructor definition.
* @param aAST the AST to check.
* @return if AST has a body.
*/
private boolean hasBody(DetailAST aAST)
{
if (aAST.getType() == TokenTypes.METHOD_DEF) {
return aAST.branchContains(TokenTypes.SLIST);
}
else if (aAST.getType() == TokenTypes.CTOR_DEF) {
return true;
}
return false;
}
/**
* Control whether unused catch clause parameters are flagged.
* @param aIgnoreCatch whether unused catch clause parameters