From e24a62d62178a31d4b0a6665c8865b288b071e12 Mon Sep 17 00:00:00 2001 From: Jeremy Long Date: Thu, 18 Apr 2013 06:54:36 -0400 Subject: [PATCH] checkstyle fixes Former-commit-id: 2bd6f330836c7dab07e5968ef845b4d48ede4abe --- .../analyzer/FalsePositiveAnalyzer.java | 20 ++++++++++--------- .../dependencycheck/analyzer/JarAnalyzer.java | 1 - .../dependency/Dependency.java | 1 - .../dependencycheck/dependency/Reference.java | 6 +++++- .../dependency/Vulnerability.java | 1 - .../reporting/ReportGenerator.java | 1 - 6 files changed, 16 insertions(+), 14 deletions(-) diff --git a/src/main/java/org/owasp/dependencycheck/analyzer/FalsePositiveAnalyzer.java b/src/main/java/org/owasp/dependencycheck/analyzer/FalsePositiveAnalyzer.java index a39629ed9..c4c0a9bd7 100644 --- a/src/main/java/org/owasp/dependencycheck/analyzer/FalsePositiveAnalyzer.java +++ b/src/main/java/org/owasp/dependencycheck/analyzer/FalsePositiveAnalyzer.java @@ -26,8 +26,8 @@ import org.owasp.dependencycheck.dependency.Dependency; import org.owasp.dependencycheck.dependency.Identifier; /** - * This analyzer attempts to remove some well known false positives - specifically - * regarding the java runtime. + * This analyzer attempts to remove some well known false positives - + * specifically regarding the java runtime. * * @author Jeremy Long (jeremy.long@gmail.com) */ @@ -121,6 +121,7 @@ public class FalsePositiveAnalyzer extends AbstractAnalyzer { /** * Intended to remove spurious CPE entries. + * * @param dependency the dependency being analyzed */ private void removeVersions(Dependency dependency) { @@ -128,17 +129,18 @@ public class FalsePositiveAnalyzer extends AbstractAnalyzer { //cpe: cpe:/a:apache:axis2:1.4 //cpe: cpe:/a:apache:axis:1.4 /* the above was identified from the evidence below: - Source Name Value - Manifest Bundle-Vendor Apache Software Foundation - Manifest Bundle-Version 1.4 - file name axis2-kernel-1.4.1 - pom artifactid axis2-kernel - pom name Apache Axis2 - Kernel + Source Name Value + Manifest Bundle-Vendor Apache Software Foundation + Manifest Bundle-Version 1.4 + file name axis2-kernel-1.4.1 + pom artifactid axis2-kernel + pom name Apache Axis2 - Kernel */ } /** - * Removes any CPE entries for the JDK/JRE unless the filename ends with rt.jar + * Removes any CPE entries for the JDK/JRE unless the filename ends with + * rt.jar * * @param dependency the dependency to remove JRE CPEs from */ diff --git a/src/main/java/org/owasp/dependencycheck/analyzer/JarAnalyzer.java b/src/main/java/org/owasp/dependencycheck/analyzer/JarAnalyzer.java index 812f11a18..756a94153 100644 --- a/src/main/java/org/owasp/dependencycheck/analyzer/JarAnalyzer.java +++ b/src/main/java/org/owasp/dependencycheck/analyzer/JarAnalyzer.java @@ -715,7 +715,6 @@ public class JarAnalyzer extends AbstractAnalyzer implements Analyzer { /** * Determines if the key value pair from the manifest is for an "import" type * entry for package names. - * * @param key the key from the manifest * @param value the value from the manifest * @return true or false depending on if it is believed the entry is an "import" entry diff --git a/src/main/java/org/owasp/dependencycheck/dependency/Dependency.java b/src/main/java/org/owasp/dependencycheck/dependency/Dependency.java index 6c6374a57..866649165 100644 --- a/src/main/java/org/owasp/dependencycheck/dependency/Dependency.java +++ b/src/main/java/org/owasp/dependencycheck/dependency/Dependency.java @@ -23,7 +23,6 @@ import java.io.IOException; import java.security.NoSuchAlgorithmException; import java.util.ArrayList; import java.util.List; -import java.util.Set; import java.util.SortedSet; import java.util.TreeSet; import java.util.logging.Level; diff --git a/src/main/java/org/owasp/dependencycheck/dependency/Reference.java b/src/main/java/org/owasp/dependencycheck/dependency/Reference.java index ac58ac16a..293448b56 100644 --- a/src/main/java/org/owasp/dependencycheck/dependency/Reference.java +++ b/src/main/java/org/owasp/dependencycheck/dependency/Reference.java @@ -128,7 +128,11 @@ public class Reference implements Serializable, Comparable { hash = 67 * hash + (this.source != null ? this.source.hashCode() : 0); return hash; } - + /** + * Implementation of the comparable interface. + * @param o the Reference being compared + * @return an integer indicating the ordering of the two objects + */ public int compareTo(Reference o) { if (source.equals(o.source)) { if (name.equals(o.name)) { diff --git a/src/main/java/org/owasp/dependencycheck/dependency/Vulnerability.java b/src/main/java/org/owasp/dependencycheck/dependency/Vulnerability.java index f8cfbd436..15f756dad 100644 --- a/src/main/java/org/owasp/dependencycheck/dependency/Vulnerability.java +++ b/src/main/java/org/owasp/dependencycheck/dependency/Vulnerability.java @@ -19,7 +19,6 @@ package org.owasp.dependencycheck.dependency; import java.io.Serializable; -import java.util.HashSet; import java.util.Set; import java.util.SortedSet; import java.util.TreeSet; diff --git a/src/main/java/org/owasp/dependencycheck/reporting/ReportGenerator.java b/src/main/java/org/owasp/dependencycheck/reporting/ReportGenerator.java index 5408a0db1..a057bb1c2 100644 --- a/src/main/java/org/owasp/dependencycheck/reporting/ReportGenerator.java +++ b/src/main/java/org/owasp/dependencycheck/reporting/ReportGenerator.java @@ -27,7 +27,6 @@ import java.io.InputStream; import java.io.InputStreamReader; import java.io.OutputStream; import java.io.OutputStreamWriter; -import java.util.Date; import java.util.List; import java.util.logging.Level; import java.util.logging.Logger;