From 8a1463056df5da2b78fd691c8e22523b12c6cd6e Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Lievremont <jean-baptiste.lievremont@sonarsource.com>
Date: Tue, 17 Sep 2013 10:35:38 +0200
Subject: [PATCH] SONAR-3387 Rename Violation to Issue

---
 .../java/org/sonar/plugins/core/issue/IssueTracking.java    | 6 +++---
 ...ksRecognizer.java => IssueTrackingBlocksRecognizer.java} | 6 +++---
 ...izerTest.java => IssueTrackingBlocksRecognizerTest.java} | 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)
 rename plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/issue/tracking/{ViolationTrackingBlocksRecognizer.java => IssueTrackingBlocksRecognizer.java} (91%)
 rename plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/issue/tracking/{ViolationTrackingBlocksRecognizerTest.java => IssueTrackingBlocksRecognizerTest.java} (88%)

diff --git a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/issue/IssueTracking.java b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/issue/IssueTracking.java
index b433614c630..871239ef6d6 100644
--- a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/issue/IssueTracking.java
+++ b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/issue/IssueTracking.java
@@ -114,7 +114,7 @@ public class IssueTracking implements BatchExtension {
     HashedSequence<StringText> hashedSource = HashedSequence.wrap(new StringText(source), StringTextComparator.IGNORE_WHITESPACE);
     HashedSequenceComparator<StringText> hashedComparator = new HashedSequenceComparator<StringText>(StringTextComparator.IGNORE_WHITESPACE);
 
-    ViolationTrackingBlocksRecognizer rec = new ViolationTrackingBlocksRecognizer(hashedReference, hashedSource, hashedComparator);
+    IssueTrackingBlocksRecognizer rec = new IssueTrackingBlocksRecognizer(hashedReference, hashedSource, hashedComparator);
 
     Multimap<Integer, DefaultIssue> newIssuesByLines = newIssuesByLines(newIssues, rec, result);
     Multimap<Integer, IssueDto> lastIssuesByLines = lastIssuesByLines(result.unmatched(), rec);
@@ -220,7 +220,7 @@ public class IssueTracking implements BatchExtension {
     }
   }
 
-  private Multimap<Integer, DefaultIssue> newIssuesByLines(Collection<DefaultIssue> newIssues, ViolationTrackingBlocksRecognizer rec, IssueTrackingResult result) {
+  private Multimap<Integer, DefaultIssue> newIssuesByLines(Collection<DefaultIssue> newIssues, IssueTrackingBlocksRecognizer rec, IssueTrackingResult result) {
     Multimap<Integer, DefaultIssue> newIssuesByLines = LinkedHashMultimap.create();
     for (DefaultIssue newIssue : newIssues) {
       if (isNotAlreadyMapped(newIssue, result) && rec.isValidLineInSource(newIssue.line())) {
@@ -230,7 +230,7 @@ public class IssueTracking implements BatchExtension {
     return newIssuesByLines;
   }
 
-  private Multimap<Integer, IssueDto> lastIssuesByLines(Collection<IssueDto> lastIssues, ViolationTrackingBlocksRecognizer rec) {
+  private Multimap<Integer, IssueDto> lastIssuesByLines(Collection<IssueDto> lastIssues, IssueTrackingBlocksRecognizer rec) {
     Multimap<Integer, IssueDto> lastIssuesByLines = LinkedHashMultimap.create();
     for (IssueDto pastIssue : lastIssues) {
       if (rec.isValidLineInReference(pastIssue.getLine())) {
diff --git a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/issue/tracking/ViolationTrackingBlocksRecognizer.java b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/issue/tracking/IssueTrackingBlocksRecognizer.java
similarity index 91%
rename from plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/issue/tracking/ViolationTrackingBlocksRecognizer.java
rename to plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/issue/tracking/IssueTrackingBlocksRecognizer.java
index 2a191e3d62e..666bd982d25 100644
--- a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/issue/tracking/ViolationTrackingBlocksRecognizer.java
+++ b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/issue/tracking/IssueTrackingBlocksRecognizer.java
@@ -27,20 +27,20 @@ import org.sonar.plugins.core.issue.tracking.StringTextComparator;
 
 import javax.annotation.Nullable;
 
-public class ViolationTrackingBlocksRecognizer {
+public class IssueTrackingBlocksRecognizer {
 
   private final HashedSequence<StringText> a;
   private final HashedSequence<StringText> b;
   private final HashedSequenceComparator<StringText> cmp;
 
   @VisibleForTesting
-  public ViolationTrackingBlocksRecognizer(String referenceSource, String source) {
+  public IssueTrackingBlocksRecognizer(String referenceSource, String source) {
     this.a = HashedSequence.wrap(new StringText(referenceSource), StringTextComparator.IGNORE_WHITESPACE);
     this.b = HashedSequence.wrap(new StringText(source), StringTextComparator.IGNORE_WHITESPACE);
     this.cmp = new HashedSequenceComparator<StringText>(StringTextComparator.IGNORE_WHITESPACE);
   }
 
-  public ViolationTrackingBlocksRecognizer(HashedSequence<StringText> a, HashedSequence<StringText> b, HashedSequenceComparator<StringText> cmp) {
+  public IssueTrackingBlocksRecognizer(HashedSequence<StringText> a, HashedSequence<StringText> b, HashedSequenceComparator<StringText> cmp) {
     this.a = a;
     this.b = b;
     this.cmp = cmp;
diff --git a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/issue/tracking/ViolationTrackingBlocksRecognizerTest.java b/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/issue/tracking/IssueTrackingBlocksRecognizerTest.java
similarity index 88%
rename from plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/issue/tracking/ViolationTrackingBlocksRecognizerTest.java
rename to plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/issue/tracking/IssueTrackingBlocksRecognizerTest.java
index 194ee7d1349..77b42938c11 100644
--- a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/issue/tracking/ViolationTrackingBlocksRecognizerTest.java
+++ b/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/issue/tracking/IssueTrackingBlocksRecognizerTest.java
@@ -20,11 +20,11 @@
 package org.sonar.plugins.core.issue.tracking;
 
 import org.junit.Test;
-import org.sonar.plugins.core.issue.tracking.ViolationTrackingBlocksRecognizer;
+import org.sonar.plugins.core.issue.tracking.IssueTrackingBlocksRecognizer;
 
 import static org.fest.assertions.Assertions.assertThat;
 
-public class ViolationTrackingBlocksRecognizerTest {
+public class IssueTrackingBlocksRecognizerTest {
 
   @Test
   public void test() {
@@ -35,7 +35,7 @@ public class ViolationTrackingBlocksRecognizerTest {
   }
 
   private static int compute(String a, String b, int ai, int bi) {
-    ViolationTrackingBlocksRecognizer rec = new ViolationTrackingBlocksRecognizer(a, b);
+    IssueTrackingBlocksRecognizer rec = new IssueTrackingBlocksRecognizer(a, b);
     return rec.computeLengthOfMaximalBlock(ai, bi);
   }
 
-- 
2.39.5