Minor code cleanup

Signed-off-by: Gary O'Neall <gary@sourceauditor.com>

Author: goneall

src/main/java/org/spdx/utility/compare/FilterTemplateOutputHandler.java

@@ -85,7 +85,7 @@ public void text(String text) {
 			currentString.append(text);
 		} else if (OptionalTextHandling.REGEX_USING_TOKENS.equals(optionalTextHandling)) {
 			optionalTokens.get(optionalDepth).addAll(Arrays.asList(
-					LicenseCompareHelper.tokenizeLicenseText(text, new HashMap<Integer, LineColumn>())));
+					LicenseCompareHelper.tokenizeLicenseText(text, new HashMap<>())));
 		}
 	}
 
@@ -140,12 +140,11 @@ public void beginOptional(LicenseTemplateRule rule) {
 	}
 
 	/**
-	 * @param tokens list of tokens
 	 * @return regular expression with quoted tokens
 	 */
 	private String toTokenRegex(List<String> tokens) {
 		StringBuilder sb = new StringBuilder();
-		for (String token:optionalTokens.get(optionalDepth)) {
+		for (String token:tokens) {
 			token = token.trim();
 			if (LicenseCompareHelper.NORMALIZE_TOKENS.containsKey(token.toLowerCase())) {
 				token = LicenseCompareHelper.NORMALIZE_TOKENS.get(token.toLowerCase());