SONAR-3893 Integrated last feedback on Highlightable API

diff --git a/sonar-batch/src/main/java/org/sonar/batch/scan/source/DefaultHighlightable.java b/sonar-batch/src/main/java/org/sonar/batch/scan/source/DefaultHighlightable.java
index 3327bdea8372e15d6d2f85b8817338d5409bcc6d..75f1026887088a2b2b1d45eac3dd880c47bc3973 100644 (file)
--- a/sonar-batch/src/main/java/org/sonar/batch/scan/source/DefaultHighlightable.java
+++ b/sonar-batch/src/main/java/org/sonar/batch/scan/source/DefaultHighlightable.java
@@ -38,8 +38,8 @@ public class DefaultHighlightable implements Highlightable {
   }
 
   @Override
-  public SyntaxHighlighter createHighlighter() {
-    return new DefaultSyntaxHighlighter();
+  public HighlightingBuilder newHighlighting() {
+    return new DefaultHighlightingBuilder();
   }
 
   @Override
@@ -56,16 +56,16 @@ public class DefaultHighlightable implements Highlightable {
     return highlightingRulesBuilder.build();
   }
 
-  private class DefaultSyntaxHighlighter implements SyntaxHighlighter {
+  private class DefaultHighlightingBuilder implements HighlightingBuilder {
 
     @Override
-    public SyntaxHighlighter highlightText(int startOffset, int endOffset, String typeOfText) {
+    public HighlightingBuilder highlight(int startOffset, int endOffset, String typeOfText) {
       highlightingRulesBuilder.registerHighlightingRule(startOffset, endOffset, typeOfText);
       return this;
     }
 
     @Override
-    public void applyHighlighting() {
+    public void done() {
       String serializedHighlightingRules = highlightingRulesBuilder.build().serializeAsString();
       syntaxHighlightingCache.registerSourceHighlighting(component().key(), serializedHighlightingRules);
     }

diff --git a/sonar-batch/src/test/java/org/sonar/batch/scan/source/DefaultHighlightableTest.java b/sonar-batch/src/test/java/org/sonar/batch/scan/source/DefaultHighlightableTest.java
index c3c18da49626903ddcb25bd20eede60939ee3ec5..476252b703db845f48abd048df20cf9eee9b711f 100644 (file)
--- a/sonar-batch/src/test/java/org/sonar/batch/scan/source/DefaultHighlightableTest.java
+++ b/sonar-batch/src/test/java/org/sonar/batch/scan/source/DefaultHighlightableTest.java
@@ -48,7 +48,7 @@ public class DefaultHighlightableTest {
   public void should_store_highlighting_rules() throws Exception {
 
     DefaultHighlightable highlightablePerspective = new DefaultHighlightable(null, null);
-    highlightablePerspective.createHighlighter().highlightText(0, 10, "k").highlightText(20, 30, "cppd");
+    highlightablePerspective.newHighlighting().highlight(0, 10, "k").highlight(20, 30, "cppd");
 
     assertThat(highlightablePerspective.getHighlightingRules().getSyntaxHighlightingRuleSet()).hasSize(2);
   }
@@ -62,10 +62,10 @@ public class DefaultHighlightableTest {
     SyntaxHighlightingCache highlightingCache = mock(SyntaxHighlightingCache.class);
 
     DefaultHighlightable highlightablePerspective = new DefaultHighlightable(component, highlightingCache);
-    highlightablePerspective.createHighlighter()
-            .highlightText(0, 10, "k")
-            .highlightText(20, 30, "cppd")
-            .applyHighlighting();
+    highlightablePerspective.newHighlighting()
+            .highlight(0, 10, "k")
+            .highlight(20, 30, "cppd")
+            .done();
 
     verify(highlightingCache).registerSourceHighlighting("myComponent", "0,10,k;20,30,cppd;");
   }

diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/scan/source/Highlightable.java b/sonar-plugin-api/src/main/java/org/sonar/api/scan/source/Highlightable.java
index bcf64e54cd0daa8ebffba1ebd23aa2a63ee01e03..ea0c60dba8efcfec6e39257e145a561faef7ced2 100644 (file)
--- a/sonar-plugin-api/src/main/java/org/sonar/api/scan/source/Highlightable.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/scan/source/Highlightable.java
@@ -26,14 +26,14 @@ import org.sonar.api.component.Perspective;
  */
 public interface Highlightable extends Perspective {
 
-  interface SyntaxHighlighter {
+  interface HighlightingBuilder {
 
-    SyntaxHighlighter highlightText(int startOffset, int endOffset, String typeOfText);
+    HighlightingBuilder highlight(int startOffset, int endOffset, String typeOfText);
 
-    void applyHighlighting();
+    void done();
   }
 
-  SyntaxHighlighter createHighlighter();
+  HighlightingBuilder newHighlighting();
 
   /*
   * @deprecated in favor of the provided builder-based api