diff options
| author | Simon Brandhof <simon.brandhof@gmail.com> | 2012-12-07 15:45:24 +0100 |
|---|---|---|
| committer | Simon Brandhof <simon.brandhof@gmail.com> | 2012-12-07 16:02:17 +0100 |
| commit | 42f17286694370e73b48db38cbc3b328ff10764c (patch) | |
| tree | 7454a9547a82e16eaef4bb10e09aa7b0b7239297 /sonar-plugin-api | |
| parent | 70eac6ea0e564da3735a3d80065326cee10c7c48 (diff) | |
| download | sonarqube-42f17286694370e73b48db38cbc3b328ff10764c.tar.gz sonarqube-42f17286694370e73b48db38cbc3b328ff10764c.zip | |
Fix quality flaws
Diffstat (limited to 'sonar-plugin-api')
| -rw-r--r-- | sonar-plugin-api/src/main/java/org/sonar/api/measures/CoverageMeasuresBuilder.java | 32 |
1 files changed, 17 insertions, 15 deletions
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/measures/CoverageMeasuresBuilder.java b/sonar-plugin-api/src/main/java/org/sonar/api/measures/CoverageMeasuresBuilder.java index e9ebaf22a6e..a1f886cd561 100644 --- a/sonar-plugin-api/src/main/java/org/sonar/api/measures/CoverageMeasuresBuilder.java +++ b/sonar-plugin-api/src/main/java/org/sonar/api/measures/CoverageMeasuresBuilder.java @@ -23,7 +23,11 @@ import com.google.common.collect.Lists; import com.google.common.collect.Maps; import org.sonar.api.utils.KeyValueFormat; -import java.util.*; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.List; +import java.util.SortedMap; /** * @since 2.7 @@ -34,9 +38,9 @@ public final class CoverageMeasuresBuilder { * Metrics of generated measures */ public static final List<Metric> METRICS = Arrays.asList( - CoreMetrics.LINES_TO_COVER, CoreMetrics.UNCOVERED_LINES, CoreMetrics.COVERAGE_LINE_HITS_DATA, - CoreMetrics.CONDITIONS_TO_COVER, CoreMetrics.UNCOVERED_CONDITIONS, CoreMetrics.CONDITIONS_BY_LINE, - CoreMetrics.COVERED_CONDITIONS_BY_LINE); + CoreMetrics.LINES_TO_COVER, CoreMetrics.UNCOVERED_LINES, CoreMetrics.COVERAGE_LINE_HITS_DATA, + CoreMetrics.CONDITIONS_TO_COVER, CoreMetrics.UNCOVERED_CONDITIONS, CoreMetrics.CONDITIONS_BY_LINE, + CoreMetrics.COVERED_CONDITIONS_BY_LINE); private int totalCoveredLines = 0, totalConditions = 0, totalCoveredConditions = 0; @@ -69,13 +73,11 @@ public final class CoverageMeasuresBuilder { } public CoverageMeasuresBuilder setConditions(int lineId, int conditions, int coveredConditions) { - if (!conditionsByLine.containsKey(lineId)) { - if (conditions > 0) { - totalConditions += conditions; - totalCoveredConditions += coveredConditions; - conditionsByLine.put(lineId, conditions); - coveredConditionsByLine.put(lineId, coveredConditions); - } + if (conditions > 0 && !conditionsByLine.containsKey(lineId)) { + totalConditions += conditions; + totalCoveredConditions += coveredConditions; + conditionsByLine.put(lineId, conditions); + coveredConditionsByLine.put(lineId, coveredConditions); } return this; } @@ -126,14 +128,14 @@ public final class CoverageMeasuresBuilder { private Measure createCoveredConditionsByLine() { return new Measure(CoreMetrics.COVERED_CONDITIONS_BY_LINE) - .setData(KeyValueFormat.format(coveredConditionsByLine)) - .setPersistenceMode(PersistenceMode.DATABASE); + .setData(KeyValueFormat.format(coveredConditionsByLine)) + .setPersistenceMode(PersistenceMode.DATABASE); } private Measure createConditionsByLine() { return new Measure(CoreMetrics.CONDITIONS_BY_LINE) - .setData(KeyValueFormat.format(conditionsByLine)) - .setPersistenceMode(PersistenceMode.DATABASE); + .setData(KeyValueFormat.format(conditionsByLine)) + .setPersistenceMode(PersistenceMode.DATABASE); } public static CoverageMeasuresBuilder create() { |