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

clean up the code

This commit is contained in:
Oliver Burn 2010-12-31 18:07:57 +11:00
parent e28ebec1e0
commit cfcab692dd
1 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/checkstyle/com/puppycrawl/tools/checkstyle/checks/coding/MagicNumberCheck.java
View File

@ -71,7 +71,7 @@ public class MagicNumberCheck extends Check
/** Whether to ignore magic numbers in a hash code method. */
private boolean mIgnoreHashCodeMethod;
/** Whether to ignore magic numbers in annotation. */
private boolean mIgnoreAnnotation = true;
private boolean mIgnoreAnnotation;
@Override
public int[] getDefaultTokens()
@ -289,18 +289,14 @@ public class MagicNumberCheck extends Check
*/
private boolean isInAnnotation(DetailAST aAST)
{
if (aAST.getParent() == null || aAST.getParent().getParent() == null) {
if ((null == aAST.getParent())
|| (null == aAST.getParent().getParent()))
{
return false;
}
if (TokenTypes.ANNOTATION == aAST.getParent().getParent().getType()
|| TokenTypes.ANNOTATION_MEMBER_VALUE_PAIR == aAST.getParent()
.getParent().getType())
{
return true;
}
else {
return false;
}
return (TokenTypes.ANNOTATION == aAST.getParent().getParent().getType())
|| (TokenTypes.ANNOTATION_MEMBER_VALUE_PAIR ==
aAST.getParent().getParent().getType());
}
}