github-mirrors/DependencyCheck
1
0
Fork 0
mirror of https://github.com/ysoftdevs/DependencyCheck.git synced 2026-04-10 10:53:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

checkstyle corrections

Browse Source 
Former-commit-id: b0ad94a8b1ce31891f788fd44e1a9df59775a691
This commit is contained in:
Jeremy Long
2014-11-05 21:42:32 -05:00
parent ea15205be8
commit a2361f9327
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
dependency-check-cli/src/main/java/org/owasp/dependencycheck/App.java
View File

@@ -114,7 +114,9 @@ public class App {
* @param outputFormat the output format of the report * @param outputFormat the output format of the report
* @param applicationName the application name for the report * @param applicationName the application name for the report
* @param files the files/directories to scan * @param files the files/directories to scan
* @param files the patterns for files/directories to exclude * @param excludes the patterns for files/directories to exclude
*
* @throws InvalidScanPathException thrown if the path to scan starts with "//"
*/ */
private void runScan(String reportDirectory, String outputFormat, String applicationName, String[] files, private void runScan(String reportDirectory, String outputFormat, String applicationName, String[] files,
String[] excludes) throws InvalidScanPathException { String[] excludes) throws InvalidScanPathException {
@@ -134,9 +136,9 @@ public class App {
antStylePaths = Arrays.asList(files); antStylePaths = Arrays.asList(files);
} }
Set<File> paths = new HashSet<File>(); final Set<File> paths = new HashSet<File>();
for (String file : antStylePaths) { for (String file : antStylePaths) {
DirectoryScanner scanner = new DirectoryScanner(); final DirectoryScanner scanner = new DirectoryScanner();
String include = file.replace('\\', '/'); String include = file.replace('\\', '/');
File baseDir; File baseDir;
@@ -150,7 +152,7 @@ public class App {
include = include.substring(1); include = include.substring(1);
} else if (include.contains("/")) { } else if (include.contains("/")) {
final int pos = include.indexOf('/'); final int pos = include.indexOf('/');
String tmp = include.substring(0, pos); final String tmp = include.substring(0, pos);
if (tmp.contains("*") || tmp.contains("?")) { if (tmp.contains("*") || tmp.contains("?")) {
baseDir = new File("."); baseDir = new File(".");
} else { } else {
@@ -168,7 +170,7 @@ public class App {
scanner.scan(); scanner.scan();
if (scanner.getIncludedFilesCount() > 0) { if (scanner.getIncludedFilesCount() > 0) {
for (String s : scanner.getIncludedFiles()) { for (String s : scanner.getIncludedFiles()) {
File f = new File(baseDir, s); final File f = new File(baseDir, s);
paths.add(f); paths.add(f);
} }
} }

2
dependency-check-cli/src/main/java/org/owasp/dependencycheck/CliParser.java
View File

@@ -894,7 +894,7 @@ public final class CliParser {
*/ */
public static final String ADDITIONAL_ZIP_EXTENSIONS = "zipExtensions"; public static final String ADDITIONAL_ZIP_EXTENSIONS = "zipExtensions";
/** /**
* Exclude path argument * Exclude path argument.
*/ */
public static final String EXCLUDE = "exclude"; public static final String EXCLUDE = "exclude";
} }