From 8db2befc6b86c23bf1a6791e5b75575bac948060 Mon Sep 17 00:00:00 2001
From: Julien Lancelot <julien.lancelot@sonarsource.com>
Date: Wed, 14 May 2014 17:05:24 +0200
Subject: [PATCH] SONAR-5304 Remove metric "branch_coverage_hits_data"

---
 .../resources/org/sonar/l10n/core.properties   |  3 ---
 .../org/sonar/api/measures/CoreMetrics.java    | 16 ----------------
 .../WEB-INF/app/helpers/source_helper.rb       | 17 +----------------
 .../app/views/shared/_source_coverage.html.erb | 18 ++++++++----------
 4 files changed, 9 insertions(+), 45 deletions(-)

diff --git a/sonar-core/src/main/resources/org/sonar/l10n/core.properties b/sonar-core/src/main/resources/org/sonar/l10n/core.properties
index ebcec7228e5..4bd46397900 100644
--- a/sonar-core/src/main/resources/org/sonar/l10n/core.properties
+++ b/sonar-core/src/main/resources/org/sonar/l10n/core.properties
@@ -2121,9 +2121,6 @@ metric.branch_coverage.description=Branch coverage
 metric.new_branch_coverage.name=Branch coverage on new code
 metric.new_branch_coverage.description=Branch coverage of new/changed code
 
-metric.branch_coverage_hits_data.name=Branch coverage hits
-metric.branch_coverage_hits_data.description=Branch coverage hits
-
 metric.conditions_by_line.name=Branches by line
 metric.conditions_by_line.description=Branches by line
 
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/measures/CoreMetrics.java b/sonar-plugin-api/src/main/java/org/sonar/api/measures/CoreMetrics.java
index 1ac74b83a42..4a5d14473ec 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/measures/CoreMetrics.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/measures/CoreMetrics.java
@@ -663,22 +663,6 @@ public final class CoreMetrics {
     .setDeleteHistoricalData(true)
     .create();
 
-  /**
-   * @deprecated in 2.7. Replaced by {@link #CONDITIONS_BY_LINE_KEY} and {@link #COVERED_CONDITIONS_BY_LINE_KEY}
-   */
-  @Deprecated
-  public static final String BRANCH_COVERAGE_HITS_DATA_KEY = "branch_coverage_hits_data";
-
-  /**
-   * @deprecated in 2.7. Replaced by metrics {@link #CONDITIONS_BY_LINE} and {@link #COVERED_CONDITIONS_BY_LINE}
-   */
-  @Deprecated
-  public static final Metric BRANCH_COVERAGE_HITS_DATA = new Metric.Builder(BRANCH_COVERAGE_HITS_DATA_KEY, "Branch coverage hits", Metric.ValueType.DATA)
-    .setDomain(DOMAIN_TESTS)
-    .setDeleteHistoricalData(true)
-    .setHidden(true)
-    .create();
-
   public static final String CONDITIONS_BY_LINE_KEY = "conditions_by_line";
 
   /**
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/helpers/source_helper.rb b/sonar-server/src/main/webapp/WEB-INF/app/helpers/source_helper.rb
index 16aaca66322..d9c5d503fe3 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/helpers/source_helper.rb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/helpers/source_helper.rb
@@ -128,7 +128,7 @@ module SourceHelper
 
   class HtmlLine
     attr_accessor :id, :index, :source, :revision, :author, :datetime, :violations, :issues, :hits, :conditions,
-                  :covered_conditions, :hidden, :displayed, :deprecated_conditions_label, :covered_lines, :has_focus
+                  :covered_conditions, :hidden, :displayed, :covered_lines, :has_focus
 
     def initialize(source, id)
       @source=source
@@ -193,20 +193,5 @@ module SourceHelper
       @has_focus=true
     end
 
-    def deprecated_conditions_label=(label)
-      if label
-        @deprecated_conditions_label=label
-        if label=='0%'
-          @conditions=2
-          @covered_conditions=0
-        elsif label=='100%'
-          @conditions=2
-          @covered_conditions=2
-        else
-          @conditions=2
-          @covered_conditions=1
-        end
-      end
-    end
   end
 end
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/shared/_source_coverage.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/shared/_source_coverage.html.erb
index 988fff23186..d0ffca59fb2 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/shared/_source_coverage.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/shared/_source_coverage.html.erb
@@ -1,18 +1,16 @@
 <% if line.displayed? && line.covered_lines %>
   <td class="ind <%= statuses[:hits] -%>" title="<%= message('coverage_viewer.line_covered_by_x_tests', {:params => line.covered_lines.to_s}) if line.covered_lines > 0 -%>">
-      <% if line.covered_lines > 0 %>
-        <a href="<%= ApplicationController.root_context -%>/test/testable/<%= h resource_key -%>?line=<%= index+1 -%>"
-           class="sources-testable-link-<%= index+1 -%>" onclick="openAccordionItem(this.href, this); return false;"><%= line.covered_lines -%></a>
-      <% end %>
+    <% if line.covered_lines > 0 %>
+      <a href="<%= ApplicationController.root_context -%>/test/testable/<%= h resource_key -%>?line=<%= index+1 -%>"
+         class="sources-testable-link-<%= index+1 -%>" onclick="openAccordionItem(this.href, this); return false;"><%= line.covered_lines -%></a>
+    <% end %>
   </td>
   <td class="ind <%= statuses[:conditions] -%>">
-      <% if line.deprecated_conditions_label -%>
-        <%= line.deprecated_conditions_label -%>
-      <% elsif line.conditions && line.conditions>0 -%>
-        <span title="<%= h message('coverage_viewer.x_covered_branches', {:params => line.covered_conditions.to_s}) -%>"><%= line.covered_conditions -%>/<%= line.conditions -%></span>
-      <% end %>
+    <% if line.conditions && line.conditions>0 -%>
+      <span title="<%= h message('coverage_viewer.x_covered_branches', {:params => line.covered_conditions.to_s}) -%>"><%= line.covered_conditions -%>/<%= line.conditions -%></span>
+    <% end %>
   </td>
 <% else %>
   <td class="ind"></td>
   <td class="ind"></td>
-<% end %>
\ No newline at end of file
+<% end %>
-- 
2.39.5