From a2361f932741e3be687de9585046e16d0c336184 Mon Sep 17 00:00:00 2001 From: Jeremy Long Date: Wed, 5 Nov 2014 21:42:32 -0500 Subject: [PATCH] checkstyle corrections Former-commit-id: b0ad94a8b1ce31891f788fd44e1a9df59775a691 --- .../src/main/java/org/owasp/dependencycheck/App.java | 12 +++++++----- .../java/org/owasp/dependencycheck/CliParser.java | 2 +- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/dependency-check-cli/src/main/java/org/owasp/dependencycheck/App.java b/dependency-check-cli/src/main/java/org/owasp/dependencycheck/App.java index f4e0690e7..bf258397d 100644 --- a/dependency-check-cli/src/main/java/org/owasp/dependencycheck/App.java +++ b/dependency-check-cli/src/main/java/org/owasp/dependencycheck/App.java @@ -114,7 +114,9 @@ public class App { * @param outputFormat the output format of the report * @param applicationName the application name for the report * @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, String[] excludes) throws InvalidScanPathException { @@ -134,9 +136,9 @@ public class App { antStylePaths = Arrays.asList(files); } - Set paths = new HashSet(); + final Set paths = new HashSet(); for (String file : antStylePaths) { - DirectoryScanner scanner = new DirectoryScanner(); + final DirectoryScanner scanner = new DirectoryScanner(); String include = file.replace('\\', '/'); File baseDir; @@ -150,7 +152,7 @@ public class App { include = include.substring(1); } else if (include.contains("/")) { final int pos = include.indexOf('/'); - String tmp = include.substring(0, pos); + final String tmp = include.substring(0, pos); if (tmp.contains("*") || tmp.contains("?")) { baseDir = new File("."); } else { @@ -168,7 +170,7 @@ public class App { scanner.scan(); if (scanner.getIncludedFilesCount() > 0) { for (String s : scanner.getIncludedFiles()) { - File f = new File(baseDir, s); + final File f = new File(baseDir, s); paths.add(f); } } diff --git a/dependency-check-cli/src/main/java/org/owasp/dependencycheck/CliParser.java b/dependency-check-cli/src/main/java/org/owasp/dependencycheck/CliParser.java index d26e427b2..9dc642215 100644 --- a/dependency-check-cli/src/main/java/org/owasp/dependencycheck/CliParser.java +++ b/dependency-check-cli/src/main/java/org/owasp/dependencycheck/CliParser.java @@ -894,7 +894,7 @@ public final class CliParser { */ public static final String ADDITIONAL_ZIP_EXTENSIONS = "zipExtensions"; /** - * Exclude path argument + * Exclude path argument. */ public static final String EXCLUDE = "exclude"; }