SONAR-4346 Fix regressions on documentation & comments widget

2 files changed, 24 insertions, 11 deletions

diff --git a/plugins/sonar-core-plugin/src/main/resources/org/sonar/l10n/core.properties b/plugins/sonar-core-plugin/src/main/resources/org/sonar/l10n/core.properties
index c5a4b3ef0ab..0fdefad9584 100644
--- a/plugins/sonar-core-plugin/src/main/resources/org/sonar/l10n/core.properties
+++ b/plugins/sonar-core-plugin/src/main/resources/org/sonar/l10n/core.properties
@@ -899,6 +899,7 @@ widget.documentation_comments.lines.suffix=\ lines
 widget.documentation_comments.docu_api.suffix=\ docu. API
 widget.documentation_comments.undocu_api.suffix=\ undocu. API
 widget.documentation_comments.public_api.suffix=\ Public API
+widget.documentation_comments.blank.suffix=\ blank
 
 widget.duplications.name=Duplications
 widget.duplications.description= Reports on copy/paste and code duplications
diff --git a/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/documentation_comments_widget.html.erb b/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/documentation_comments_widget.html.erb
index 6cdc14165ac..8890a5116b7 100644
--- a/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/documentation_comments_widget.html.erb
+++ b/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/documentation_comments_widget.html.erb
@@ -1,6 +1,11 @@
 <%
-  comments=measure('comment_lines_density')
-  if comments
+  if measure(Metric::LINES) || measure(Metric::NCLOC)
+    public_api=measure('public_api')
+    public_documented_api_density=measure('public_documented_api_density')
+    public_undocumented_api=measure('public_undocumented_api')
+    comment_lines=measure('comment_lines')
+    comment_lines_density=measure('comment_lines_density')
+    comment_blank_lines=measure('comment_blank_lines')
 %>
 <table width="100%">
   <tbody>
@@ -10,17 +15,17 @@
           <p class="title"><%= message('widget.documentation_comments.documentation') -%></p>
           <p>
             <span class="big">
-              <%= format_measure(measure('public_documented_api_density'),:url => url_for_drilldown('public_documented_api_density'), :suffix =>  ' ' + message('widget.documentation_comments.docu_api.suffix'))%>
+              <%= format_measure(public_documented_api_density, :url => url_for_drilldown(Metric::PUBLIC_UNDOCUMENTED_API, :highlight => Metric::PUBLIC_DOCUMENTED_API_DENSITY), :suffix =>  message('widget.documentation_comments.docu_api.suffix'))%>
             </span>
             <%= dashboard_configuration.selected_period? ? format_variation('public_documented_api_density') : trend_icon('public_documented_api_density') -%>
           </p>
           <p>
-            <%= format_measure(measure('public_api'),:url => url_for_drilldown('public_api'), :suffix =>  ' ' + message('widget.documentation_comments.public_api.suffix'))%>
-            <%= dashboard_configuration.selected_period? ? format_variation('public_api') : trend_icon('public_api') -%>
+            <%= format_measure(public_api,:url => url_for_drilldown(public_api), :suffix =>  message('widget.documentation_comments.public_api.suffix'))%>
+            <%= dashboard_configuration.selected_period? ? format_variation(public_api) : trend_icon(public_api) -%>
           </p>
           <p>
-            <%= format_measure(measure('public_undocumented_api'),:url => url_for_drilldown('public_undocumented_api'), :suffix => ' ' + message('widget.documentation_comments.undocu_api.suffix'))%>
-            <%= dashboard_configuration.selected_period? ? format_variation('public_undocumented_api') : trend_icon('public_undocumented_api') -%>
+            <%= format_measure(public_undocumented_api,:url => url_for_drilldown(public_undocumented_api), :suffix => message('widget.documentation_comments.undocu_api.suffix'))%>
+            <%= dashboard_configuration.selected_period? ? format_variation(public_undocumented_api) : trend_icon(public_undocumented_api) -%>
           </p>
         </div>
       </td>
@@ -29,14 +34,21 @@
           <p class="title"><%= message('widget.documentation_comments.comments') -%></p>
           <p>
             <span class="big">
-              <%= format_measure('comment_lines_density',:url => url_for_drilldown('comment_lines_density'))%>
+              <%= format_measure(comment_lines_density,:url => url_for_drilldown(comment_lines_density))%>
             </span>
-            <%= dashboard_configuration.selected_period? ? format_variation('comment_lines_density') : trend_icon('comment_lines_density') -%>
+            <%= dashboard_configuration.selected_period? ? format_variation(comment_lines_density) : trend_icon(comment_lines_density) -%>
           </p>
           <p>
-            <%= format_measure(measure('comment_lines'),:url => url_for_drilldown('comment_lines'), :suffix =>  ' ' + message('widget.documentation_comments.lines.suffix'))%>
-            <%= dashboard_configuration.selected_period? ? format_variation('comment_lines') : trend_icon('comment_lines') -%>
+            <%= format_measure(measure(comment_lines),:url => url_for_drilldown(comment_lines), :suffix =>  message('widget.documentation_comments.lines.suffix'))%>
+            <%= dashboard_configuration.selected_period? ? format_variation(comment_lines) : trend_icon(comment_lines) -%>
           </p>
+            <%
+            if comment_blank_lines && comment_blank_lines.value>0
+            %>
+            <p>+<%= format_measure(comment_blank_lines, :suffix => message('widget.documentation_comments.blank.suffix'), :url => url_for_drilldown(comment_blank_lines)) %>
+            <%= dashboard_configuration.selected_period? ? format_variation(comment_blank_lines) : trend_icon(comment_blank_lines) -%>
+            </p>
+            <% end %>
         </div>
       </td>
     </tr>