From bb7c548ba5f9003336679bb705b28923268314ac Mon Sep 17 00:00:00 2001 From: Tom Copeland Date: Sat, 20 Jul 2002 16:24:58 +0000 Subject: [PATCH] refactoring git-svn-id: https://pmd.svn.sourceforge.net/svnroot/pmd/trunk@458 51baf565-9d33-0410-a72c-fc3788e3496d --- .../net/sourceforge/pmd/rules/BracesRule.java | 17 +++++++++++++++++ .../pmd/rules/ForLoopsMustUseBracesRule.java | 5 +---- .../pmd/rules/IfElseStmtsMustUseBracesRule.java | 7 ++----- .../pmd/rules/WhileLoopsMustUseBracesRule.java | 6 +----- 4 files changed, 21 insertions(+), 14 deletions(-) create mode 100644 pmd/src/net/sourceforge/pmd/rules/BracesRule.java diff --git a/pmd/src/net/sourceforge/pmd/rules/BracesRule.java b/pmd/src/net/sourceforge/pmd/rules/BracesRule.java new file mode 100644 index 0000000000..91ca16f776 --- /dev/null +++ b/pmd/src/net/sourceforge/pmd/rules/BracesRule.java @@ -0,0 +1,17 @@ +/* + * User: tom + * Date: Jul 20, 2002 + * Time: 9:28:10 AM + */ +package net.sourceforge.pmd.rules; + +import net.sourceforge.pmd.AbstractRule; +import net.sourceforge.pmd.ast.SimpleNode; +import net.sourceforge.pmd.ast.ASTBlock; + +public abstract class BracesRule extends AbstractRule { + protected boolean hasBlockAsFirstChild(SimpleNode node) { + return (node.jjtGetNumChildren() != 0 && (node.jjtGetChild(0) instanceof ASTBlock)); + } + +} diff --git a/pmd/src/net/sourceforge/pmd/rules/ForLoopsMustUseBracesRule.java b/pmd/src/net/sourceforge/pmd/rules/ForLoopsMustUseBracesRule.java index a2174bb614..b7382288e6 100644 --- a/pmd/src/net/sourceforge/pmd/rules/ForLoopsMustUseBracesRule.java +++ b/pmd/src/net/sourceforge/pmd/rules/ForLoopsMustUseBracesRule.java @@ -12,7 +12,7 @@ import net.sourceforge.pmd.ast.SimpleNode; import net.sourceforge.pmd.ast.ASTBlock; import net.sourceforge.pmd.ast.ASTForStatement; -public class ForLoopsMustUseBracesRule extends AbstractRule { +public class ForLoopsMustUseBracesRule extends BracesRule { public Object visit(ASTForStatement node, Object data) { RuleContext ctx = (RuleContext)data; @@ -24,7 +24,4 @@ public class ForLoopsMustUseBracesRule extends AbstractRule { return super.visit(node,data); } - private boolean hasBlockAsFirstChild(SimpleNode node) { - return (node.jjtGetNumChildren() != 0 && (node.jjtGetChild(0) instanceof ASTBlock)); - } } diff --git a/pmd/src/net/sourceforge/pmd/rules/IfElseStmtsMustUseBracesRule.java b/pmd/src/net/sourceforge/pmd/rules/IfElseStmtsMustUseBracesRule.java index cb1abfe8e2..e51b99d5da 100644 --- a/pmd/src/net/sourceforge/pmd/rules/IfElseStmtsMustUseBracesRule.java +++ b/pmd/src/net/sourceforge/pmd/rules/IfElseStmtsMustUseBracesRule.java @@ -10,7 +10,7 @@ import net.sourceforge.pmd.ast.SimpleNode; import net.sourceforge.pmd.ast.ASTBlock; import net.sourceforge.pmd.*; -public class IfElseStmtsMustUseBracesRule extends AbstractRule { +public class IfElseStmtsMustUseBracesRule extends BracesRule { private int lineNumberOfLastViolation; @@ -29,10 +29,7 @@ public class IfElseStmtsMustUseBracesRule extends AbstractRule { ctx.getReport().addRuleViolation(createRuleViolation(ctx, node.getBeginLine())); lineNumberOfLastViolation = node.getBeginLine(); } + return super.visit(node,data); } - - private boolean hasBlockAsFirstChild(SimpleNode node) { - return (node.jjtGetNumChildren() != 0 && (node.jjtGetChild(0) instanceof ASTBlock)); - } } diff --git a/pmd/src/net/sourceforge/pmd/rules/WhileLoopsMustUseBracesRule.java b/pmd/src/net/sourceforge/pmd/rules/WhileLoopsMustUseBracesRule.java index c3bdadd248..2f812cb07d 100644 --- a/pmd/src/net/sourceforge/pmd/rules/WhileLoopsMustUseBracesRule.java +++ b/pmd/src/net/sourceforge/pmd/rules/WhileLoopsMustUseBracesRule.java @@ -12,7 +12,7 @@ import net.sourceforge.pmd.ast.SimpleNode; import net.sourceforge.pmd.ast.ASTBlock; import net.sourceforge.pmd.ast.ASTWhileStatement; -public class WhileLoopsMustUseBracesRule extends AbstractRule { +public class WhileLoopsMustUseBracesRule extends BracesRule { public Object visit(ASTWhileStatement node, Object data) { RuleContext ctx = (RuleContext)data; @@ -24,8 +24,4 @@ public class WhileLoopsMustUseBracesRule extends AbstractRule { return super.visit(node,data); } - private boolean hasBlockAsFirstChild(SimpleNode node) { - return (node.jjtGetNumChildren() != 0 && (node.jjtGetChild(0) instanceof ASTBlock)); - } - }