From 87c1f4ffb6f027ff3eb72786d97e8d5893201a63 Mon Sep 17 00:00:00 2001 From: Oliver Burn Date: Tue, 29 Oct 2002 13:56:28 +0000 Subject: [PATCH] Patch from Rick Giles --- ...rameterFormatCheck.java => ParameterNameCheck.java} | 7 +++---- .../tools/checkstyle/checks/TypeNameCheck.java | 1 - ...ormatCheckTest.java => ParameterNameCheckTest.java} | 10 +++++----- 3 files changed, 8 insertions(+), 10 deletions(-) rename src/checkstyle/com/puppycrawl/tools/checkstyle/checks/{ParameterFormatCheck.java => ParameterNameCheck.java} (89%) rename src/tests/com/puppycrawl/tools/checkstyle/{ParameterFormatCheckTest.java => ParameterNameCheckTest.java} (78%) diff --git a/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/ParameterFormatCheck.java b/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/ParameterNameCheck.java similarity index 89% rename from src/checkstyle/com/puppycrawl/tools/checkstyle/checks/ParameterFormatCheck.java rename to src/checkstyle/com/puppycrawl/tools/checkstyle/checks/ParameterNameCheck.java index a99996535..78bc2425f 100644 --- a/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/ParameterFormatCheck.java +++ b/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/ParameterNameCheck.java @@ -18,7 +18,6 @@ //////////////////////////////////////////////////////////////////////////////// package com.puppycrawl.tools.checkstyle.checks; -import com.puppycrawl.tools.checkstyle.api.DetailAST; import com.puppycrawl.tools.checkstyle.api.TokenTypes; /** @@ -31,13 +30,13 @@ import com.puppycrawl.tools.checkstyle.api.TokenTypes; * * @author Oliver Burn */ -public class ParameterFormatCheck +public class ParameterNameCheck extends AbstractNameCheck { /** - * Creates a new ParameterFormatCheck instance. + * Creates a new ParameterNameCheck instance. */ - public ParameterFormatCheck() + public ParameterNameCheck() { super("^[a-z][a-zA-Z0-9]*$"); } diff --git a/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/TypeNameCheck.java b/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/TypeNameCheck.java index 1c095c48e..e521bf309 100644 --- a/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/TypeNameCheck.java +++ b/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/TypeNameCheck.java @@ -18,7 +18,6 @@ //////////////////////////////////////////////////////////////////////////////// package com.puppycrawl.tools.checkstyle.checks; -import com.puppycrawl.tools.checkstyle.api.DetailAST; import com.puppycrawl.tools.checkstyle.api.TokenTypes; /** diff --git a/src/tests/com/puppycrawl/tools/checkstyle/ParameterFormatCheckTest.java b/src/tests/com/puppycrawl/tools/checkstyle/ParameterNameCheckTest.java similarity index 78% rename from src/tests/com/puppycrawl/tools/checkstyle/ParameterFormatCheckTest.java rename to src/tests/com/puppycrawl/tools/checkstyle/ParameterNameCheckTest.java index d574b6f8f..93c87c50a 100644 --- a/src/tests/com/puppycrawl/tools/checkstyle/ParameterFormatCheckTest.java +++ b/src/tests/com/puppycrawl/tools/checkstyle/ParameterNameCheckTest.java @@ -1,11 +1,11 @@ package com.puppycrawl.tools.checkstyle; -import com.puppycrawl.tools.checkstyle.checks.ParameterFormatCheck; +import com.puppycrawl.tools.checkstyle.checks.ParameterNameCheck; -public class ParameterFormatCheckTest +public class ParameterNameCheckTest extends BaseCheckTestCase { - public ParameterFormatCheckTest(String aName) + public ParameterNameCheckTest(String aName) { super(aName); } @@ -14,7 +14,7 @@ public class ParameterFormatCheckTest throws Exception { final CheckConfiguration checkConfig = new CheckConfiguration(); - checkConfig.setClassname(ParameterFormatCheck.class.getName()); + checkConfig.setClassname(ParameterNameCheck.class.getName()); checkConfig.addProperty("format", "^a[A-Z][a-zA-Z0-9]*$"); final Checker c = createChecker(checkConfig); final String fname = getPath("InputSimple.java"); @@ -30,7 +30,7 @@ public class ParameterFormatCheckTest throws Exception { final CheckConfiguration checkConfig = new CheckConfiguration(); - checkConfig.setClassname(ParameterFormatCheck.class.getName()); + checkConfig.setClassname(ParameterNameCheck.class.getName()); final Checker c = createChecker(checkConfig); final String fname = getPath("InputSimple.java"); final String[] expected = {