From 96483bdc428bfad0028114de470d5f442464e1a4 Mon Sep 17 00:00:00 2001 From: rnveach Date: Wed, 20 Feb 2019 12:04:05 -0500 Subject: [PATCH] Issue #5900: renamed format property to illegalAbstractClassNameFormat --- .../checkstyle/checks/coding/IllegalTypeCheck.java | 10 +++++----- .../checkstyle/checks/coding/IllegalTypeCheckTest.java | 2 +- src/xdocs/config_coding.xml | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalTypeCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalTypeCheck.java index 11317213169..0f66bdaed5b 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalTypeCheck.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalTypeCheck.java @@ -41,7 +41,7 @@ * *

Check has following properties: * - *

format - Pattern for illegal class names. + *

illegalAbstractClassNameFormat - Pattern for illegal abstract class names. * *

legalAbstractClassNames - Abstract classes that may be used as types. * @@ -130,7 +130,7 @@ public final class IllegalTypeCheck extends AbstractCheck { private List memberModifiers; /** The regexp to match against. */ - private Pattern format = Pattern.compile("^(.*[.])?Abstract.*$"); + private Pattern illegalAbstractClassNameFormat = Pattern.compile("^(.*[.])?Abstract.*$"); /** * Controls whether to validate abstract class names. @@ -147,8 +147,8 @@ public IllegalTypeCheck() { * Set the format for the specified regular expression. * @param pattern a pattern. */ - public void setFormat(Pattern pattern) { - format = pattern; + public void setIllegalAbstractClassNameFormat(Pattern pattern) { + illegalAbstractClassNameFormat = pattern; } /** @@ -460,7 +460,7 @@ private boolean isMatchingClassName(String className) { || illegalShortClassNames.contains(shortName) || validateAbstractClassNames && !legalAbstractClassNames.contains(className) - && format.matcher(className).find(); + && illegalAbstractClassNameFormat.matcher(className).find(); } /** diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalTypeCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalTypeCheckTest.java index 84ebce287c5..564032c679b 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalTypeCheckTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalTypeCheckTest.java @@ -93,7 +93,7 @@ public void testIgnoreMethodNames() throws Exception { @Test public void testFormat() throws Exception { final DefaultConfiguration checkConfig = createModuleConfig(IllegalTypeCheck.class); - checkConfig.addAttribute("format", "^$"); + checkConfig.addAttribute("illegalAbstractClassNameFormat", "^$"); final String[] expected = { "16:13: " + getCheckMessage(MSG_KEY, "java.util.TreeSet"), diff --git a/src/xdocs/config_coding.xml b/src/xdocs/config_coding.xml index 8f128d0596d..291c17e187b 100644 --- a/src/xdocs/config_coding.xml +++ b/src/xdocs/config_coding.xml @@ -2109,8 +2109,8 @@ class SomeClass 3.2 - format - Pattern for illegal class names. + illegalAbstractClassNameFormat + Pattern for illegal abstract class names. Regular Expression "^(.*[.])?Abstract.*$" 3.2