From: David Gageot <david@gageot.net>
Date: Fri, 5 Oct 2012 11:56:00 +0000 (+0200)
Subject: Fix violations
X-Git-Tag: 3.3~105
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=9ecd1e8d2219a2eab8aa08ff978b2348ec8e40d5;p=sonarqube.git

Fix violations
---

diff --git a/plugins/sonar-jacoco-plugin/src/main/java/org/sonar/plugins/jacoco/JaCoCoOverallSensor.java b/plugins/sonar-jacoco-plugin/src/main/java/org/sonar/plugins/jacoco/JaCoCoOverallSensor.java
index 8ce1aa6e51e..378b1e86eec 100644
--- a/plugins/sonar-jacoco-plugin/src/main/java/org/sonar/plugins/jacoco/JaCoCoOverallSensor.java
+++ b/plugins/sonar-jacoco-plugin/src/main/java/org/sonar/plugins/jacoco/JaCoCoOverallSensor.java
@@ -118,30 +118,31 @@ public class JaCoCoOverallSensor implements Sensor {
     @Override
     protected void saveMeasures(SensorContext context, JavaFile resource, Collection<Measure> measures) {
       for (Measure measure : measures) {
-        Measure mergedMeasure = convertForAllTests(measure);
+        Measure mergedMeasure = convertForOverall(measure);
         if (mergedMeasure != null) {
           context.saveMeasure(resource, mergedMeasure);
         }
       }
     }
 
-    private Measure convertForAllTests(Measure measure) {
+    private Measure convertForOverall(Measure measure) {
+      Measure itMeasure = null;
       if (CoreMetrics.LINES_TO_COVER.equals(measure.getMetric())) {
-        return new Measure(CoreMetrics.OVERALL_LINES_TO_COVER, measure.getValue());
+        itMeasure = new Measure(CoreMetrics.OVERALL_LINES_TO_COVER, measure.getValue());
       } else if (CoreMetrics.UNCOVERED_LINES.equals(measure.getMetric())) {
-        return new Measure(CoreMetrics.OVERALL_UNCOVERED_LINES, measure.getValue());
+        itMeasure = new Measure(CoreMetrics.OVERALL_UNCOVERED_LINES, measure.getValue());
       } else if (CoreMetrics.COVERAGE_LINE_HITS_DATA.equals(measure.getMetric())) {
-        return new Measure(CoreMetrics.OVERALL_COVERAGE_LINE_HITS_DATA, measure.getData());
+        itMeasure = new Measure(CoreMetrics.OVERALL_COVERAGE_LINE_HITS_DATA, measure.getData());
       } else if (CoreMetrics.CONDITIONS_TO_COVER.equals(measure.getMetric())) {
-        return new Measure(CoreMetrics.OVERALL_CONDITIONS_TO_COVER, measure.getValue());
+        itMeasure = new Measure(CoreMetrics.OVERALL_CONDITIONS_TO_COVER, measure.getValue());
       } else if (CoreMetrics.UNCOVERED_CONDITIONS.equals(measure.getMetric())) {
-        return new Measure(CoreMetrics.OVERALL_UNCOVERED_CONDITIONS, measure.getValue());
+        itMeasure = new Measure(CoreMetrics.OVERALL_UNCOVERED_CONDITIONS, measure.getValue());
       } else if (CoreMetrics.COVERED_CONDITIONS_BY_LINE.equals(measure.getMetric())) {
-        return new Measure(CoreMetrics.OVERALL_COVERED_CONDITIONS_BY_LINE, measure.getData());
+        itMeasure = new Measure(CoreMetrics.OVERALL_COVERED_CONDITIONS_BY_LINE, measure.getData());
       } else if (CoreMetrics.CONDITIONS_BY_LINE.equals(measure.getMetric())) {
-        return new Measure(CoreMetrics.OVERALL_CONDITIONS_BY_LINE, measure.getData());
+        itMeasure = new Measure(CoreMetrics.OVERALL_CONDITIONS_BY_LINE, measure.getData());
       }
-      return null;
+      return itMeasure;
     }
   }