diff --git a/src/main/java/org/codesecure/dependencycheck/Engine.java b/src/main/java/org/codesecure/dependencycheck/Engine.java index 71807def1..1311045d2 100644 --- a/src/main/java/org/codesecure/dependencycheck/Engine.java +++ b/src/main/java/org/codesecure/dependencycheck/Engine.java @@ -186,7 +186,7 @@ public class Engine { * Runs the analyzers against all of the dependencies. */ public void analyzeDependencies() { - //phase one initilize + //phase one initialize for (AnalysisPhase phase : AnalysisPhase.values()) { List analyzerList = analyzers.get(phase); for (Analyzer a : analyzerList) { @@ -194,7 +194,7 @@ public class Engine { a.initialize(); } catch (Exception ex) { Logger.getLogger(Engine.class.getName()).log(Level.SEVERE, - "Exception occured initializing " + a.getName() + ".", ex); + "Exception occurred initializing " + a.getName() + ".", ex); try { a.close(); } catch (Exception ex1) { diff --git a/src/main/java/org/codesecure/dependencycheck/analyzer/JarAnalyzer.java b/src/main/java/org/codesecure/dependencycheck/analyzer/JarAnalyzer.java index e7f0311ef..8b5d801e9 100644 --- a/src/main/java/org/codesecure/dependencycheck/analyzer/JarAnalyzer.java +++ b/src/main/java/org/codesecure/dependencycheck/analyzer/JarAnalyzer.java @@ -190,9 +190,9 @@ public class JarAnalyzer extends AbstractAnalyzer implements Analyzer { analyzePOM(dependency); addPredefinedData(dependency); } catch (IOException ex) { - throw new AnalysisException("Exception occured reading the JAR file.", ex); + throw new AnalysisException("Exception occurred reading the JAR file.", ex); } catch (JAXBException ex) { - throw new AnalysisException("Exception occured reading the POM within the JAR file.", ex); + throw new AnalysisException("Exception occurred reading the POM within the JAR file.", ex); } } diff --git a/src/main/java/org/codesecure/dependencycheck/data/cpe/CPEAnalyzer.java b/src/main/java/org/codesecure/dependencycheck/data/cpe/CPEAnalyzer.java index 550ea77a1..8533f07d9 100644 --- a/src/main/java/org/codesecure/dependencycheck/data/cpe/CPEAnalyzer.java +++ b/src/main/java/org/codesecure/dependencycheck/data/cpe/CPEAnalyzer.java @@ -203,7 +203,7 @@ public class CPEAnalyzer implements org.codesecure.dependencycheck.analyzer.Anal for (Evidence e : ec.iterator(confidenceFilter)) { String value = e.getValue(); - //hack to get around the fact that lucene does a realy good job of recognizing domains and not + //hack to get around the fact that lucene does a really good job of recognizing domains and not // splitting them. TODO - put together a better lucene analyzer specific to the domain. if (value.startsWith("http://")) { value = value.substring(7).replaceAll("\\.", " "); diff --git a/src/main/java/org/codesecure/dependencycheck/data/cwe/CweDB.java b/src/main/java/org/codesecure/dependencycheck/data/cwe/CweDB.java index 4a60316c9..be901570c 100644 --- a/src/main/java/org/codesecure/dependencycheck/data/cwe/CweDB.java +++ b/src/main/java/org/codesecure/dependencycheck/data/cwe/CweDB.java @@ -32,7 +32,7 @@ import java.util.logging.Logger; public class CweDB { private CweDB() { - //empty contructor for utility class + //empty constructor for utility class } private static final HashMap CWE = loadData(); diff --git a/src/main/java/org/codesecure/dependencycheck/data/lucene/TokenPairConcatenatingFilter.java b/src/main/java/org/codesecure/dependencycheck/data/lucene/TokenPairConcatenatingFilter.java index 9d8682acf..b13bb4e65 100644 --- a/src/main/java/org/codesecure/dependencycheck/data/lucene/TokenPairConcatenatingFilter.java +++ b/src/main/java/org/codesecure/dependencycheck/data/lucene/TokenPairConcatenatingFilter.java @@ -58,13 +58,13 @@ public final class TokenPairConcatenatingFilter extends TokenFilter { @Override public boolean incrementToken() throws IOException { - //collect all the terms into the words collaction + //collect all the terms into the words collection while (input.incrementToken()) { String word = new String(termAtt.buffer(), 0, termAtt.length()); words.add(word); } - //if we have a previousTerm - write it out as its own token concatonated + //if we have a previousTerm - write it out as its own token concatenated // with the current word (if one is available). if (previousWord != null && words.size() > 0) { String word = words.getFirst(); diff --git a/src/main/java/org/codesecure/dependencycheck/data/nvdcve/CveDB.java b/src/main/java/org/codesecure/dependencycheck/data/nvdcve/CveDB.java index 9490b0b81..010cfb2c3 100644 --- a/src/main/java/org/codesecure/dependencycheck/data/nvdcve/CveDB.java +++ b/src/main/java/org/codesecure/dependencycheck/data/nvdcve/CveDB.java @@ -343,7 +343,7 @@ public class CveDB { */ public void updateVulnerability(Vulnerability vuln) throws DatabaseException { try { - // first delete any existing vulnerabilty info. + // first delete any existing vulnerability info. deleteReferences.setString(1, vuln.getName()); deleteReferences.execute(); deleteSoftware.setString(1, vuln.getName()); diff --git a/src/main/java/org/codesecure/dependencycheck/utils/CliParser.java b/src/main/java/org/codesecure/dependencycheck/utils/CliParser.java index 55659da31..9d21b4d0f 100644 --- a/src/main/java/org/codesecure/dependencycheck/utils/CliParser.java +++ b/src/main/java/org/codesecure/dependencycheck/utils/CliParser.java @@ -89,14 +89,14 @@ public final class CliParser { if (isRunScan()) { validatePathExists(getScanFiles()); if (!line.hasOption(ArgumentName.OUT)) { - //TODO - need a new exception type here, this isn't really a parseexception. + //TODO - need a new exception type here, this isn't really a ParseException. throw new ParseException("Scan cannot be run without specifying a directory " + "to write the reports to via the 'out' argument."); } else { String p = line.getOptionValue(ArgumentName.OUT, ""); File f = new File(p); if ("".equals(p) || !(f.exists() && f.isDirectory())) { - //TODO - need a new exception type here, this isn't really a parseexception. + //TODO - need a new exception type here, this isn't really a ParseException. throw new ParseException("A valid directory name must be specified for " + "the 'out' argument."); } diff --git a/src/main/java/org/codesecure/dependencycheck/utils/Downloader.java b/src/main/java/org/codesecure/dependencycheck/utils/Downloader.java index 98b7efa24..f9b272c15 100644 --- a/src/main/java/org/codesecure/dependencycheck/utils/Downloader.java +++ b/src/main/java/org/codesecure/dependencycheck/utils/Downloader.java @@ -139,7 +139,7 @@ public class Downloader { writer = null; } catch (Exception ex) { Logger.getLogger(Downloader.class.getName()).log(Level.FINEST, - "Error closing the writter in Downloader.", ex); + "Error closing the writer in Downloader.", ex); } } if (reader != null) { diff --git a/src/test/java/org/codesecure/dependencycheck/data/lucene/FieldAnalyzerTest.java b/src/test/java/org/codesecure/dependencycheck/data/lucene/FieldAnalyzerTest.java index b42485df6..8d035d1ee 100644 --- a/src/test/java/org/codesecure/dependencycheck/data/lucene/FieldAnalyzerTest.java +++ b/src/test/java/org/codesecure/dependencycheck/data/lucene/FieldAnalyzerTest.java @@ -109,7 +109,7 @@ public class FieldAnalyzerTest { assertEquals("Did not find 1 document?", 1, hits.length); - searchAnalyzerProduct.clear(); //ensure we don't have anything left over from the previuos search. + searchAnalyzerProduct.clear(); //ensure we don't have anything left over from the previous search. searchAnalyzerVendor.clear(); querystr = "product:(Apache Struts) vendor:(Apache)"; Query q2 = parser.parse(querystr);