From a2ed8a53c5ff2fa293cb02556e6ef4ae05515991 Mon Sep 17 00:00:00 2001 From: Rick Giles Date: Fri, 30 May 2003 20:41:00 +0000 Subject: [PATCH] efficiency improvement - don't go up the tree twice. --- .../tools/checkstyle/checks/MagicNumberCheck.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/MagicNumberCheck.java b/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/MagicNumberCheck.java index 3ac6b6fbb..088862dba 100644 --- a/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/MagicNumberCheck.java +++ b/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/MagicNumberCheck.java @@ -142,9 +142,6 @@ public class MagicNumberCheck extends Check */ private boolean isConstantDefinition(DetailAST aAST) { - if (ScopeUtils.inInterfaceBlock(aAST)) { - return true; - } DetailAST parent = aAST.getParent(); //expression? @@ -169,10 +166,11 @@ public class MagicNumberCheck extends Check return false; } - //final? + //final or interface constant final DetailAST modifiersAST = parent.findFirstToken(TokenTypes.MODIFIERS); - return modifiersAST.branchContains(TokenTypes.FINAL); + return modifiersAST.branchContains(TokenTypes.FINAL) + || ScopeUtils.inInterfaceBlock(parent); } /**