From b368f9b91fab168dbbca73230ee04d1efa62cf24 Mon Sep 17 00:00:00 2001 From: Oliver Burn Date: Tue, 29 Oct 2002 13:50:06 +0000 Subject: [PATCH] Patch from Rick Giles --- .../checks/ParameterFormatCheck.java | 18 +----------------- .../tools/checkstyle/checks/TypeNameCheck.java | 16 +--------------- 2 files changed, 2 insertions(+), 32 deletions(-) diff --git a/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/ParameterFormatCheck.java b/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/ParameterFormatCheck.java index 0dbbfecb6..a99996535 100644 --- a/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/ParameterFormatCheck.java +++ b/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/ParameterFormatCheck.java @@ -32,7 +32,7 @@ import com.puppycrawl.tools.checkstyle.api.TokenTypes; * @author Oliver Burn */ public class ParameterFormatCheck - extends AbstractFormatCheck + extends AbstractNameCheck { /** * Creates a new ParameterFormatCheck instance. @@ -47,20 +47,4 @@ public class ParameterFormatCheck { return new int[] {TokenTypes.PARAMETER_DEF}; } - - /** @see com.puppycrawl.tools.checkstyle.api.Check */ - public void visitToken(DetailAST aAST) - { - final DetailAST nameAST = - (DetailAST) aAST.getFirstChild().getNextSibling().getNextSibling(); - if (!getRegexp().match(nameAST.getText())) { - log(nameAST.getLineNo(), - nameAST.getColumnNo(), - "name.invalidPattern", - nameAST.getText(), - getFormat()); - } - - } - } diff --git a/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/TypeNameCheck.java b/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/TypeNameCheck.java index c476bbab8..1c095c48e 100644 --- a/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/TypeNameCheck.java +++ b/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/TypeNameCheck.java @@ -32,7 +32,7 @@ import com.puppycrawl.tools.checkstyle.api.TokenTypes; * @author Oliver Burn */ public class TypeNameCheck - extends AbstractFormatCheck + extends AbstractNameCheck { /** @@ -49,18 +49,4 @@ public class TypeNameCheck return new int[] {TokenTypes.CLASS_DEF, TokenTypes.INTERFACE_DEF}; } - - /** @see com.puppycrawl.tools.checkstyle.api.Check */ - public void visitToken(DetailAST aAST) - { - final DetailAST nameAST = - (DetailAST) aAST.getFirstChild().getNextSibling(); - if (!getRegexp().match(nameAST.getText())) { - log(nameAST.getLineNo(), - nameAST.getColumnNo(), - "name.invalidPattern", - nameAST.getText(), - getFormat()); - } - } }