From e18789b8d3f60e0a8fdee9dd4d4c7a3eadea9604 Mon Sep 17 00:00:00 2001
From: Jeremy Long <jeremy.long@gmail.com>
Date: Fri, 17 Jan 2014 21:05:08 -0500
Subject: [PATCH] added identifier confidence for issue #35

Former-commit-id: 9ce9761fa4cd842e6141973bf33e229bea208982
---
 .../src/main/resources/templates/HtmlReport.vsl              | 5 ++++-
 .../src/main/resources/templates/XmlReport.vsl               | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/dependency-check-core/src/main/resources/templates/HtmlReport.vsl b/dependency-check-core/src/main/resources/templates/HtmlReport.vsl
index 195ef750e..2de1561e2 100644
--- a/dependency-check-core/src/main/resources/templates/HtmlReport.vsl
+++ b/dependency-check-core/src/main/resources/templates/HtmlReport.vsl
@@ -578,11 +578,14 @@ Copyright (c) 2012 Jeremy Long. All Rights Reserved.
                                 #else
                                     <li><b>$esc.html($id.type):</b>&nbsp;$esc.html($id.value)
                                 #end
+                                #if ($id.confidence)
+                                    &nbsp;&nbsp;<i>Confidence</i>:$id.confidence
+                                #end
                                 #if ($id.type=="cpe")
                                     ##yes, we are HTML Encoding into JavaScript... the escape utils don't have a JS Encode and I haven't written one yet
                                     &nbsp;&nbsp;<button class="copybutton" onclick="copyText('$esc.html($dependency.FileName)', '$esc.html($dependency.Sha1sum)', 'cpe', '$esc.html($id.value)')">suppress</button>
                                 #end
-                                #if( $id.description )
+                                #if ($id.description)
                                     <br/>$esc.html($id.description)
                                 #end
                                 </li>
diff --git a/dependency-check-core/src/main/resources/templates/XmlReport.vsl b/dependency-check-core/src/main/resources/templates/XmlReport.vsl
index b0fb39b82..0c8f0b7cb 100644
--- a/dependency-check-core/src/main/resources/templates/XmlReport.vsl
+++ b/dependency-check-core/src/main/resources/templates/XmlReport.vsl
@@ -97,7 +97,7 @@ Copyright (c) 2012 Jeremy Long. All Rights Reserved.
 #if($dependency.getIdentifiers().size()>0)
             <identifiers>
 #foreach($id in $dependency.getIdentifiers())
-                <identifier type="$esc.xml($id.type)">
+                <identifier type="$esc.xml($id.type)" #if($id.confidence)confidence="$id.confidence"#end>
                     <name>($id.value)</name>
 #if( $id.url )
                     <url>$esc.xml($id.url)</url>