andreacavalli/netty5-build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Make Windows-friendly

Browse Source 
* 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
This commit is contained in:
Trustin Lee 2012-03-02 10:19:33 -08:00
parent 735aa8ff45
commit 381814f6da
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/io/netty/build/checkstyle/SuppressionFilter.java
View File

@ -10,7 +10,7 @@ import com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocPackageCheck;
public class SuppressionFilter extends AutomaticBean implements Filter { 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 pattern;
private Pattern examplePattern = Pattern.compile("examples?"); private Pattern examplePattern = Pattern.compile("examples?");
@ -25,16 +25,17 @@ public class SuppressionFilter extends AutomaticBean implements Filter {
@Override @Override
public boolean accept(AuditEvent evt) { 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")) { if (evt.getSourceName().endsWith("MissingOverrideCheck")) {
return false; return false;
} }
} }
if (pattern.matcher(evt.getFileName()).find()) { if (pattern.matcher(filename).find()) {
return false; return false;
} }
if (examplePattern.matcher(evt.getFileName()).find()) { if (examplePattern.matcher(filename).find()) {
if (evt.getSourceName().endsWith(".JavadocPackageCheck")) { if (evt.getSourceName().endsWith(".JavadocPackageCheck")) {
return false; return false;
} }

7
src/main/resources/io/netty/checkstyle.xml
View File

@ -9,8 +9,7 @@
<module name="FileTabCharacter"/> <module name="FileTabCharacter"/>
<module name="JavadocPackage"/> <module name="JavadocPackage"/>
<module name="NewlineAtEndOfFile"> <module name="NewlineAtEndOfFile">
<!-- Ignore as this is not possible in windows --> <property name="lineSeparator" value="lf" />
<property name="severity" value="ignore" />
</module> </module>
<module name="RegexpSingleline"> <module name="RegexpSingleline">
<property name="format" value="^(\s|\*)*Copyright\s+[0-9]+\s+The Netty Project\s*$"/> <property name="format" value="^(\s|\*)*Copyright\s+[0-9]+\s+The Netty Project\s*$"/>
@ -21,6 +20,10 @@
<property name="format" value="(@(author|version)|\(non-Javadoc\))"/> <property name="format" value="(@(author|version)|\(non-Javadoc\))"/>
<property name="ignoreCase" value="true"/> <property name="ignoreCase" value="true"/>
</module> </module>
<!-- Force UNIX line separator -->
<module name="RegexpSingleline">
<property name="format" value="\r"/>
</module>
<module name="TreeWalker"> <module name="TreeWalker">
<module name="WhitespaceAfter"/> <module name="WhitespaceAfter"/>