diff options
| author | Stephane Gamard <stephane.gamard@sonarsource.com> | 2014-10-08 14:01:17 +0200 |
|---|---|---|
| committer | Stephane Gamard <stephane.gamard@sonarsource.com> | 2014-10-08 14:01:17 +0200 |
| commit | d5d20d0f777ba89b49575846c8f96afd316829f4 (patch) | |
| tree | 257a0341add4bf8a00a20af45e623a548b357255 /plugins | |
| parent | 0a890a7a3069e79bc1029f17ddc59c8fb4409274 (diff) | |
| parent | 7eb13c86cafb14b8d7afbb3737a27fb3c6fe9d51 (diff) | |
| download | sonarqube-d5d20d0f777ba89b49575846c8f96afd316829f4.tar.gz sonarqube-d5d20d0f777ba89b49575846c8f96afd316829f4.zip | |
Merge remote-tracking branch 'origin/branch-4.5'
Conflicts:
server/sonar-server/src/main/java/org/sonar/server/rule/index/RuleIndex.java
sonar-batch/src/main/java/org/sonar/batch/scan2/DefaultFileLinesContextFactory.java
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/timemachine/VariationDecorator.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/timemachine/VariationDecorator.java b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/timemachine/VariationDecorator.java index 19d1dd93207..8f54748066f 100644 --- a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/timemachine/VariationDecorator.java +++ b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/timemachine/VariationDecorator.java @@ -95,10 +95,10 @@ public class VariationDecorator implements Decorator { private void computeVariation(Resource resource, DecoratorContext context, PastSnapshot pastSnapshot) { List<Object[]> pastMeasures = pastMeasuresLoader.getPastMeasures(resource, pastSnapshot); - compareWithPastMeasures(resource, context, pastSnapshot.getIndex(), pastMeasures); + compareWithPastMeasures(context, pastSnapshot.getIndex(), pastMeasures); } - void compareWithPastMeasures(Resource resource, DecoratorContext context, int index, List<Object[]> pastMeasures) { + private void compareWithPastMeasures(DecoratorContext context, int index, List<Object[]> pastMeasures) { Map<MeasureKey, Object[]> pastMeasuresByKey = Maps.newHashMap(); for (Object[] pastMeasure : pastMeasures) { pastMeasuresByKey.put(new MeasureKey(pastMeasure), pastMeasure); |