From 381814f6da856a6359288d3e0860e66518f60452 Mon Sep 17 00:00:00 2001 From: Trustin Lee Date: Fri, 2 Mar 2012 10:19:33 -0800 Subject: [PATCH] Make Windows-friendly * SuppressionFilter now replaces \ with / before patterh matching * Added strict UNIX line separator check * Revived NewlineAtEndOfFile check with UNIX line separator * Confirmed checkstyle doesn't complain anymore in Windows --- .../io/netty/build/checkstyle/SuppressionFilter.java | 9 +++++---- src/main/resources/io/netty/checkstyle.xml | 7 +++++-- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/main/java/io/netty/build/checkstyle/SuppressionFilter.java b/src/main/java/io/netty/build/checkstyle/SuppressionFilter.java index 27f8e76..4dc743a 100644 --- a/src/main/java/io/netty/build/checkstyle/SuppressionFilter.java +++ b/src/main/java/io/netty/build/checkstyle/SuppressionFilter.java @@ -10,7 +10,7 @@ import com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocPackageCheck; public class SuppressionFilter extends AutomaticBean implements Filter { - private static final Pattern JAVA5PATTERN = Pattern.compile("[\\\\/]org[\\\\/]jboss[\\\\/]"); + private static final Pattern JAVA5PATTERN = Pattern.compile("/org/jboss/"); private Pattern pattern; private Pattern examplePattern = Pattern.compile("examples?"); @@ -25,16 +25,17 @@ public class SuppressionFilter extends AutomaticBean implements Filter { @Override public boolean accept(AuditEvent evt) { - if (JAVA5PATTERN.matcher(evt.getFileName()).find()) { + String filename = evt.getFileName().replace('\\', '/'); + if (JAVA5PATTERN.matcher(filename).find()) { if (evt.getSourceName().endsWith("MissingOverrideCheck")) { return false; } } - if (pattern.matcher(evt.getFileName()).find()) { + if (pattern.matcher(filename).find()) { return false; } - if (examplePattern.matcher(evt.getFileName()).find()) { + if (examplePattern.matcher(filename).find()) { if (evt.getSourceName().endsWith(".JavadocPackageCheck")) { return false; } diff --git a/src/main/resources/io/netty/checkstyle.xml b/src/main/resources/io/netty/checkstyle.xml index 4f6efdb..4d36255 100644 --- a/src/main/resources/io/netty/checkstyle.xml +++ b/src/main/resources/io/netty/checkstyle.xml @@ -9,8 +9,7 @@ - - + @@ -21,6 +20,10 @@ + + + +