TouchInstinct
/
checkstyle
306
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Issue #1566: Reducing CheckstyleAntTask's method length

This commit is contained in:
Baratali Izmailov 2015-08-26 17:52:09 -04:00 committed by Roman Ivanov
parent 6f1840f011
commit f0e75896a4
1 changed files with 43 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
src/main/java/com/puppycrawl/tools/checkstyle/ant/CheckstyleAntTask.java
View File

@ -294,39 +294,7 @@ public class CheckstyleAntTask extends Task {
new SeverityLevelCounter(SeverityLevel.WARNING);
checker.addListener(warningCounter);
// Process the files
long startTime = System.currentTimeMillis();
final List<File> files = scanFileSets();
long endTime = System.currentTimeMillis();
log("To locate the files took " + (endTime - startTime) + TIME_SUFFIX,
Project.MSG_VERBOSE);
log("Running Checkstyle " + version + " on " + files.size()
+ " files", Project.MSG_INFO);
log("Using configuration " + configLocation, Project.MSG_VERBOSE);
startTime = System.currentTimeMillis();
final int numErrs = checker.process(files);
endTime = System.currentTimeMillis();
log("To process the files took " + (endTime - startTime) + TIME_SUFFIX,
Project.MSG_VERBOSE);
final int numWarnings = warningCounter.getCount();
final boolean ok = numErrs <= maxErrors
&& numWarnings <= maxWarnings;
// Handle the return status
if (!ok) {
final String failureMsg =
"Got " + numErrs + " errors and " + numWarnings
+ " warnings.";
if (failureProperty != null) {
getProject().setProperty(failureProperty, failureMsg);
}
if (failOnViolation) {
throw new BuildException(failureMsg, getLocation());
}
}
processFiles(checker, warningCounter, version);
}
finally {
if (checker != null) {
@ -335,6 +303,48 @@ public class CheckstyleAntTask extends Task {
}
}
/**
* Scans and processes files by means given checker.
* @param checker Checker to process files
* @param warningCounter Checker's counter of warnings
* @param checkstyleVersion Checkstyle compile version
*/
private void processFiles(Checker checker, final SeverityLevelCounter warningCounter,
final String checkstyleVersion) {
long startTime = System.currentTimeMillis();
final List<File> files = scanFileSets();
long endTime = System.currentTimeMillis();
log("To locate the files took " + (endTime - startTime) + TIME_SUFFIX,
Project.MSG_VERBOSE);
log("Running Checkstyle " + checkstyleVersion + " on " + files.size()
+ " files", Project.MSG_INFO);
log("Using configuration " + configLocation, Project.MSG_VERBOSE);
startTime = System.currentTimeMillis();
final int numErrs = checker.process(files);
endTime = System.currentTimeMillis();
log("To process the files took " + (endTime - startTime) + TIME_SUFFIX,
Project.MSG_VERBOSE);
final int numWarnings = warningCounter.getCount();
final boolean ok = numErrs <= maxErrors
&& numWarnings <= maxWarnings;
// Handle the return status
if (!ok) {
final String failureMsg =
"Got " + numErrs + " errors and " + numWarnings
+ " warnings.";
if (failureProperty != null) {
getProject().setProperty(failureProperty, failureMsg);
}
if (failOnViolation) {
throw new BuildException(failureMsg, getLocation());
}
}
}
/**
* Creates new instance of {@code Checker}.
* @return new instance of {@code Checker}