aboutsummaryrefslogtreecommitdiffstats
path: root/sonar-colorizer/src
diff options
context:
space:
mode:
authorJulien HENRY <julien.henry@sonarsource.com>2014-12-01 15:36:12 +0100
committerJulien HENRY <julien.henry@sonarsource.com>2014-12-01 15:36:12 +0100
commita2d5e82501f3ed8d96239845842770515f5087e6 (patch)
tree0dd658aedd64653a51d83f398531a0cb12101984 /sonar-colorizer/src
parent344aa4461ce308745c63f6299145a3d8117d6dea (diff)
downloadsonarqube-a2d5e82501f3ed8d96239845842770515f5087e6.tar.gz
sonarqube-a2d5e82501f3ed8d96239845842770515f5087e6.zip
SONAR-5864 API cleanup
* add a proper way to create perspective on InputFile * add a proper way to convert InputFile to resource * deprecate colorizer
Diffstat (limited to 'sonar-colorizer/src')
-rw-r--r--sonar-colorizer/src/main/java/org/sonar/colorizer/CDocTokenizer.java4
-rw-r--r--sonar-colorizer/src/main/java/org/sonar/colorizer/CaseInsensitiveKeywordsTokenizer.java4
-rw-r--r--sonar-colorizer/src/main/java/org/sonar/colorizer/CodeColorizer.java4
-rw-r--r--sonar-colorizer/src/main/java/org/sonar/colorizer/CppDocTokenizer.java4
-rw-r--r--sonar-colorizer/src/main/java/org/sonar/colorizer/GroovyKeywords.java10
-rw-r--r--sonar-colorizer/src/main/java/org/sonar/colorizer/GroovyTokenizers.java10
-rw-r--r--sonar-colorizer/src/main/java/org/sonar/colorizer/HtmlCodeBuilder.java4
-rw-r--r--sonar-colorizer/src/main/java/org/sonar/colorizer/HtmlDecorator.java4
-rw-r--r--sonar-colorizer/src/main/java/org/sonar/colorizer/HtmlOptions.java4
-rw-r--r--sonar-colorizer/src/main/java/org/sonar/colorizer/HtmlRenderer.java10
-rw-r--r--sonar-colorizer/src/main/java/org/sonar/colorizer/InlineDocTokenizer.java4
-rw-r--r--sonar-colorizer/src/main/java/org/sonar/colorizer/JavaAnnotationTokenizer.java4
-rw-r--r--sonar-colorizer/src/main/java/org/sonar/colorizer/JavaConstantTokenizer.java5
-rw-r--r--sonar-colorizer/src/main/java/org/sonar/colorizer/JavaKeywords.java18
-rw-r--r--sonar-colorizer/src/main/java/org/sonar/colorizer/JavaTokenizers.java18
-rw-r--r--sonar-colorizer/src/main/java/org/sonar/colorizer/JavadocTokenizer.java4
-rw-r--r--sonar-colorizer/src/main/java/org/sonar/colorizer/KeywordsTokenizer.java5
-rw-r--r--sonar-colorizer/src/main/java/org/sonar/colorizer/LiteralTokenizer.java6
-rw-r--r--sonar-colorizer/src/main/java/org/sonar/colorizer/MultilinesDocTokenizer.java10
-rw-r--r--sonar-colorizer/src/main/java/org/sonar/colorizer/NotThreadSafeTokenizer.java3
-rw-r--r--sonar-colorizer/src/main/java/org/sonar/colorizer/RegexpTokenizer.java10
-rw-r--r--sonar-colorizer/src/main/java/org/sonar/colorizer/Renderer.java8
-rw-r--r--sonar-colorizer/src/main/java/org/sonar/colorizer/StringTokenizer.java4
-rw-r--r--sonar-colorizer/src/main/java/org/sonar/colorizer/SynhtaxHighlightingException.java4
-rw-r--r--sonar-colorizer/src/main/java/org/sonar/colorizer/Tokenizer.java2
25 files changed, 126 insertions, 37 deletions
diff --git a/sonar-colorizer/src/main/java/org/sonar/colorizer/CDocTokenizer.java b/sonar-colorizer/src/main/java/org/sonar/colorizer/CDocTokenizer.java
index 51d47a13532..3b43e59aefa 100644
--- a/sonar-colorizer/src/main/java/org/sonar/colorizer/CDocTokenizer.java
+++ b/sonar-colorizer/src/main/java/org/sonar/colorizer/CDocTokenizer.java
@@ -19,6 +19,10 @@
*/
package org.sonar.colorizer;
+/**
+ * @deprecated since 4.5.2 replace by highlighting mechanism
+ */
+@Deprecated
public class CDocTokenizer extends InlineDocTokenizer {
public CDocTokenizer(String tagBefore, String tagAfter) {
diff --git a/sonar-colorizer/src/main/java/org/sonar/colorizer/CaseInsensitiveKeywordsTokenizer.java b/sonar-colorizer/src/main/java/org/sonar/colorizer/CaseInsensitiveKeywordsTokenizer.java
index 1fe9930e2e3..02d4e69f35c 100644
--- a/sonar-colorizer/src/main/java/org/sonar/colorizer/CaseInsensitiveKeywordsTokenizer.java
+++ b/sonar-colorizer/src/main/java/org/sonar/colorizer/CaseInsensitiveKeywordsTokenizer.java
@@ -21,6 +21,10 @@ package org.sonar.colorizer;
import java.util.Set;
+/**
+ * @deprecated since 4.5.2 replace by highlighting mechanism
+ */
+@Deprecated
public class CaseInsensitiveKeywordsTokenizer extends KeywordsTokenizer {
public CaseInsensitiveKeywordsTokenizer(String tagBefore, String tagAfter, Set<String> keywords) {
diff --git a/sonar-colorizer/src/main/java/org/sonar/colorizer/CodeColorizer.java b/sonar-colorizer/src/main/java/org/sonar/colorizer/CodeColorizer.java
index bf1fe61df74..f4a0523b7f1 100644
--- a/sonar-colorizer/src/main/java/org/sonar/colorizer/CodeColorizer.java
+++ b/sonar-colorizer/src/main/java/org/sonar/colorizer/CodeColorizer.java
@@ -22,6 +22,10 @@ package org.sonar.colorizer;
import java.io.Reader;
import java.util.List;
+/**
+ * @deprecated since 4.5.2 replace by highlighting mechanism
+ */
+@Deprecated
public class CodeColorizer {
private List<Tokenizer> tokenizers = null;
diff --git a/sonar-colorizer/src/main/java/org/sonar/colorizer/CppDocTokenizer.java b/sonar-colorizer/src/main/java/org/sonar/colorizer/CppDocTokenizer.java
index 282e54cd2f6..55a57e24c9d 100644
--- a/sonar-colorizer/src/main/java/org/sonar/colorizer/CppDocTokenizer.java
+++ b/sonar-colorizer/src/main/java/org/sonar/colorizer/CppDocTokenizer.java
@@ -19,6 +19,10 @@
*/
package org.sonar.colorizer;
+/**
+ * @deprecated since 4.5.2 replace by highlighting mechanism
+ */
+@Deprecated
public class CppDocTokenizer extends MultilinesDocTokenizer {
public CppDocTokenizer(String tagBefore, String tagAfter) {
diff --git a/sonar-colorizer/src/main/java/org/sonar/colorizer/GroovyKeywords.java b/sonar-colorizer/src/main/java/org/sonar/colorizer/GroovyKeywords.java
index 2b4e0354794..8728faadd92 100644
--- a/sonar-colorizer/src/main/java/org/sonar/colorizer/GroovyKeywords.java
+++ b/sonar-colorizer/src/main/java/org/sonar/colorizer/GroovyKeywords.java
@@ -23,11 +23,15 @@ import com.google.common.collect.ImmutableSet;
import java.util.Set;
+/**
+ * @deprecated since 4.5.2 replace by highlighting mechanism
+ */
+@Deprecated
public final class GroovyKeywords {
private static final Set<String> KEYWORDS = ImmutableSet.of(
- "as", "assert", "break", "case", "catch", "class", "continue", "def",
- "default", "do", "else", "extends", "finally", "for", "if", "in", "implements", "import", "instanceof", "interface", "new", "package",
- "property", "return", "switch", "throw", "throws", "try", "while");
+ "as", "assert", "break", "case", "catch", "class", "continue", "def",
+ "default", "do", "else", "extends", "finally", "for", "if", "in", "implements", "import", "instanceof", "interface", "new", "package",
+ "property", "return", "switch", "throw", "throws", "try", "while");
private GroovyKeywords() {
}
diff --git a/sonar-colorizer/src/main/java/org/sonar/colorizer/GroovyTokenizers.java b/sonar-colorizer/src/main/java/org/sonar/colorizer/GroovyTokenizers.java
index d66c91b705c..5c18a9f7da7 100644
--- a/sonar-colorizer/src/main/java/org/sonar/colorizer/GroovyTokenizers.java
+++ b/sonar-colorizer/src/main/java/org/sonar/colorizer/GroovyTokenizers.java
@@ -23,6 +23,10 @@ import java.util.Arrays;
import java.util.Collections;
import java.util.List;
+/**
+ * @deprecated since 4.5.2 replace by highlighting mechanism
+ */
+@Deprecated
public final class GroovyTokenizers {
private static final String SPAN_END = "</span>";
@@ -32,8 +36,8 @@ public final class GroovyTokenizers {
public static List<Tokenizer> forHtml() {
return Collections.unmodifiableList(Arrays.asList(new JavaAnnotationTokenizer("<span class=\"a\">", SPAN_END), new LiteralTokenizer(
- "<span class=\"s\">", SPAN_END), new CDocTokenizer("<span class=\"cd\">", SPAN_END), new CppDocTokenizer("<span class=\"cppd\">",
- SPAN_END), new JavadocTokenizer("<span class=\"j\">", SPAN_END), new JavaConstantTokenizer("<span class=\"c\">", SPAN_END),
- new KeywordsTokenizer("<span class=\"k\">", SPAN_END, GroovyKeywords.get())));
+ "<span class=\"s\">", SPAN_END), new CDocTokenizer("<span class=\"cd\">", SPAN_END), new CppDocTokenizer("<span class=\"cppd\">",
+ SPAN_END), new JavadocTokenizer("<span class=\"j\">", SPAN_END), new JavaConstantTokenizer("<span class=\"c\">", SPAN_END),
+ new KeywordsTokenizer("<span class=\"k\">", SPAN_END, GroovyKeywords.get())));
}
}
diff --git a/sonar-colorizer/src/main/java/org/sonar/colorizer/HtmlCodeBuilder.java b/sonar-colorizer/src/main/java/org/sonar/colorizer/HtmlCodeBuilder.java
index e6755e7b7e7..8d7057103db 100644
--- a/sonar-colorizer/src/main/java/org/sonar/colorizer/HtmlCodeBuilder.java
+++ b/sonar-colorizer/src/main/java/org/sonar/colorizer/HtmlCodeBuilder.java
@@ -22,6 +22,10 @@ package org.sonar.colorizer;
import java.util.HashMap;
import java.util.Map;
+/**
+ * @deprecated since 4.5.2 replace by highlighting mechanism
+ */
+@Deprecated
public class HtmlCodeBuilder implements Appendable {
private StringBuilder colorizedCode = new StringBuilder();
diff --git a/sonar-colorizer/src/main/java/org/sonar/colorizer/HtmlDecorator.java b/sonar-colorizer/src/main/java/org/sonar/colorizer/HtmlDecorator.java
index fdbd02a8180..e55dc91718e 100644
--- a/sonar-colorizer/src/main/java/org/sonar/colorizer/HtmlDecorator.java
+++ b/sonar-colorizer/src/main/java/org/sonar/colorizer/HtmlDecorator.java
@@ -26,6 +26,10 @@ import org.sonar.channel.CodeReader;
import java.io.IOException;
import java.io.InputStream;
+/**
+ * @deprecated since 4.5.2 replace by highlighting mechanism
+ */
+@Deprecated
public class HtmlDecorator extends Tokenizer {
private static final String CSS_PATH = "/sonar-colorizer.css";
diff --git a/sonar-colorizer/src/main/java/org/sonar/colorizer/HtmlOptions.java b/sonar-colorizer/src/main/java/org/sonar/colorizer/HtmlOptions.java
index d91d89bf5e7..38c6b180f07 100644
--- a/sonar-colorizer/src/main/java/org/sonar/colorizer/HtmlOptions.java
+++ b/sonar-colorizer/src/main/java/org/sonar/colorizer/HtmlOptions.java
@@ -19,6 +19,10 @@
*/
package org.sonar.colorizer;
+/**
+ * @deprecated since 4.5.2 replace by highlighting mechanism
+ */
+@Deprecated
public class HtmlOptions {
public static final HtmlOptions DEFAULT = new HtmlOptions(true, null, true);
public static final OnlySyntaxHtmlOptions ONLY_SYNTAX = new OnlySyntaxHtmlOptions();
diff --git a/sonar-colorizer/src/main/java/org/sonar/colorizer/HtmlRenderer.java b/sonar-colorizer/src/main/java/org/sonar/colorizer/HtmlRenderer.java
index c90cdcff973..a95a4348991 100644
--- a/sonar-colorizer/src/main/java/org/sonar/colorizer/HtmlRenderer.java
+++ b/sonar-colorizer/src/main/java/org/sonar/colorizer/HtmlRenderer.java
@@ -19,13 +19,17 @@
*/
package org.sonar.colorizer;
+import org.sonar.channel.Channel;
+import org.sonar.channel.CodeReader;
+
import java.io.Reader;
import java.util.ArrayList;
import java.util.List;
-import org.sonar.channel.Channel;
-import org.sonar.channel.CodeReader;
-
+/**
+ * @deprecated since 4.5.2 replace by highlighting mechanism
+ */
+@Deprecated
public class HtmlRenderer extends Renderer {
private HtmlOptions options = null;
diff --git a/sonar-colorizer/src/main/java/org/sonar/colorizer/InlineDocTokenizer.java b/sonar-colorizer/src/main/java/org/sonar/colorizer/InlineDocTokenizer.java
index 7c5b0c851aa..9383296e4a7 100644
--- a/sonar-colorizer/src/main/java/org/sonar/colorizer/InlineDocTokenizer.java
+++ b/sonar-colorizer/src/main/java/org/sonar/colorizer/InlineDocTokenizer.java
@@ -24,6 +24,10 @@ import org.sonar.channel.EndMatcher;
import java.util.Arrays;
+/**
+ * @deprecated since 4.5.2 replace by highlighting mechanism
+ */
+@Deprecated
public abstract class InlineDocTokenizer extends Tokenizer {
private final String tagBefore;
diff --git a/sonar-colorizer/src/main/java/org/sonar/colorizer/JavaAnnotationTokenizer.java b/sonar-colorizer/src/main/java/org/sonar/colorizer/JavaAnnotationTokenizer.java
index fc7cdf6b6d2..cf98d21a386 100644
--- a/sonar-colorizer/src/main/java/org/sonar/colorizer/JavaAnnotationTokenizer.java
+++ b/sonar-colorizer/src/main/java/org/sonar/colorizer/JavaAnnotationTokenizer.java
@@ -22,6 +22,10 @@ package org.sonar.colorizer;
import org.sonar.channel.CodeReader;
import org.sonar.channel.EndMatcher;
+/**
+ * @deprecated since 4.5.2 replace by highlighting mechanism
+ */
+@Deprecated
public class JavaAnnotationTokenizer extends Tokenizer {
private final String tagBefore;
diff --git a/sonar-colorizer/src/main/java/org/sonar/colorizer/JavaConstantTokenizer.java b/sonar-colorizer/src/main/java/org/sonar/colorizer/JavaConstantTokenizer.java
index 3216b720ef6..12937ac49da 100644
--- a/sonar-colorizer/src/main/java/org/sonar/colorizer/JavaConstantTokenizer.java
+++ b/sonar-colorizer/src/main/java/org/sonar/colorizer/JavaConstantTokenizer.java
@@ -23,8 +23,9 @@ import org.sonar.channel.CodeReader;
import org.sonar.channel.EndMatcher;
/**
- * Detect Java constant
+ * @deprecated since 4.5.2 replace by highlighting mechanism
*/
+@Deprecated
public class JavaConstantTokenizer extends Tokenizer {
private final String tagBefore;
@@ -39,7 +40,7 @@ public class JavaConstantTokenizer extends Tokenizer {
private boolean hasNextToken(CodeReader code) {
int lastChar = code.lastChar();
if (isJavaConstantStart(code.peek()) && !Character.isJavaIdentifierPart(lastChar) && !Character.isJavaIdentifierStart(lastChar)
- && lastChar != DOT) {
+ && lastChar != DOT) {
String constant = code.peekTo(endTokenMatcher);
int nextCharAfterConstant = code.peek(constant.length() + 1)[constant.length()];
if (nextCharAfterConstant != 0 && Character.isJavaIdentifierPart(nextCharAfterConstant)) {
diff --git a/sonar-colorizer/src/main/java/org/sonar/colorizer/JavaKeywords.java b/sonar-colorizer/src/main/java/org/sonar/colorizer/JavaKeywords.java
index 18bed2eda7d..164945ad64c 100644
--- a/sonar-colorizer/src/main/java/org/sonar/colorizer/JavaKeywords.java
+++ b/sonar-colorizer/src/main/java/org/sonar/colorizer/JavaKeywords.java
@@ -23,16 +23,20 @@ import com.google.common.collect.ImmutableSet;
import java.util.Set;
+/**
+ * @deprecated since 4.5.2 replace by highlighting mechanism
+ */
+@Deprecated
public final class JavaKeywords {
private static final Set<String> KEYWORDS = ImmutableSet.of(
- "abstract", "assert", "boolean", "break", "byte", "case", "catch", "char",
- "class", "const", "continue", "default",
- "do", "double", "else", "enum", "extends", "false", "final", "finally", "float", "for",
- "goto", "if", "implements", "import", "instanceof",
- "int", "interface", "long", "native", "new", "null", "package", "private",
- "protected", "public", "return", "short", "static", "strictfp",
- "super", "switch", "synchronized", "this", "throw", "throws", "transient", "true", "try", "void", "volatile", "while");
+ "abstract", "assert", "boolean", "break", "byte", "case", "catch", "char",
+ "class", "const", "continue", "default",
+ "do", "double", "else", "enum", "extends", "false", "final", "finally", "float", "for",
+ "goto", "if", "implements", "import", "instanceof",
+ "int", "interface", "long", "native", "new", "null", "package", "private",
+ "protected", "public", "return", "short", "static", "strictfp",
+ "super", "switch", "synchronized", "this", "throw", "throws", "transient", "true", "try", "void", "volatile", "while");
private JavaKeywords() {
}
diff --git a/sonar-colorizer/src/main/java/org/sonar/colorizer/JavaTokenizers.java b/sonar-colorizer/src/main/java/org/sonar/colorizer/JavaTokenizers.java
index 1b30e1a7b30..f040d376594 100644
--- a/sonar-colorizer/src/main/java/org/sonar/colorizer/JavaTokenizers.java
+++ b/sonar-colorizer/src/main/java/org/sonar/colorizer/JavaTokenizers.java
@@ -23,6 +23,10 @@ import java.util.Arrays;
import java.util.Collections;
import java.util.List;
+/**
+ * @deprecated since 4.5.2 replace by highlighting mechanism
+ */
+@Deprecated
public final class JavaTokenizers {
private JavaTokenizers() {
@@ -30,12 +34,12 @@ public final class JavaTokenizers {
public static List<Tokenizer> forHtml() {
return Collections.unmodifiableList(Arrays.asList(
- new JavaAnnotationTokenizer("<span class=\"a\">", "</span>"),
- new LiteralTokenizer("<span class=\"s\">", "</span>"),
- new CDocTokenizer("<span class=\"cd\">", "</span>"),
- new JavadocTokenizer("<span class=\"j\">", "</span>"),
- new CppDocTokenizer("<span class=\"cppd\">", "</span>"),
- new JavaConstantTokenizer("<span class=\"c\">", "</span>"),
- new KeywordsTokenizer("<span class=\"k\">", "</span>", JavaKeywords.get())));
+ new JavaAnnotationTokenizer("<span class=\"a\">", "</span>"),
+ new LiteralTokenizer("<span class=\"s\">", "</span>"),
+ new CDocTokenizer("<span class=\"cd\">", "</span>"),
+ new JavadocTokenizer("<span class=\"j\">", "</span>"),
+ new CppDocTokenizer("<span class=\"cppd\">", "</span>"),
+ new JavaConstantTokenizer("<span class=\"c\">", "</span>"),
+ new KeywordsTokenizer("<span class=\"k\">", "</span>", JavaKeywords.get())));
}
}
diff --git a/sonar-colorizer/src/main/java/org/sonar/colorizer/JavadocTokenizer.java b/sonar-colorizer/src/main/java/org/sonar/colorizer/JavadocTokenizer.java
index fee02f14bca..404a94a4f12 100644
--- a/sonar-colorizer/src/main/java/org/sonar/colorizer/JavadocTokenizer.java
+++ b/sonar-colorizer/src/main/java/org/sonar/colorizer/JavadocTokenizer.java
@@ -19,6 +19,10 @@
*/
package org.sonar.colorizer;
+/**
+ * @deprecated since 4.5.2 replace by highlighting mechanism
+ */
+@Deprecated
public class JavadocTokenizer extends MultilinesDocTokenizer {
public JavadocTokenizer(String tagBefore, String tagAfter) {
diff --git a/sonar-colorizer/src/main/java/org/sonar/colorizer/KeywordsTokenizer.java b/sonar-colorizer/src/main/java/org/sonar/colorizer/KeywordsTokenizer.java
index 3a1395fc5de..06025a33d37 100644
--- a/sonar-colorizer/src/main/java/org/sonar/colorizer/KeywordsTokenizer.java
+++ b/sonar-colorizer/src/main/java/org/sonar/colorizer/KeywordsTokenizer.java
@@ -28,8 +28,9 @@ import java.util.regex.Matcher;
import java.util.regex.Pattern;
/**
- * Detect case-sensitive keywords
+ * @deprecated since 4.5.2 replace by highlighting mechanism
*/
+@Deprecated
public class KeywordsTokenizer extends NotThreadSafeTokenizer {
private final String tagBefore;
@@ -76,7 +77,7 @@ public class KeywordsTokenizer extends NotThreadSafeTokenizer {
}
private boolean isKeyword(String word) {
- if ( !caseInsensitive && keywords.contains(word)) {
+ if (!caseInsensitive && keywords.contains(word)) {
return true;
} else if (caseInsensitive && keywords.contains(word.toUpperCase())) {
return true;
diff --git a/sonar-colorizer/src/main/java/org/sonar/colorizer/LiteralTokenizer.java b/sonar-colorizer/src/main/java/org/sonar/colorizer/LiteralTokenizer.java
index 42161a86d3a..054a74efe57 100644
--- a/sonar-colorizer/src/main/java/org/sonar/colorizer/LiteralTokenizer.java
+++ b/sonar-colorizer/src/main/java/org/sonar/colorizer/LiteralTokenizer.java
@@ -22,6 +22,10 @@ package org.sonar.colorizer;
import org.sonar.channel.CodeReader;
import org.sonar.channel.EndMatcher;
+/**
+ * @deprecated since 4.5.2 replace by highlighting mechanism
+ */
+@Deprecated
public class LiteralTokenizer extends Tokenizer {
private final String tagBefore;
@@ -63,7 +67,7 @@ public class LiteralTokenizer extends Tokenizer {
public boolean match(int endFlag) {
literalValue.append((char) endFlag);
- return code.lastChar()==firstChar && evenNumberOfBackSlashBeforeDelimiter() && literalValue.length()>1;
+ return code.lastChar() == firstChar && evenNumberOfBackSlashBeforeDelimiter() && literalValue.length() > 1;
}
private boolean evenNumberOfBackSlashBeforeDelimiter() {
diff --git a/sonar-colorizer/src/main/java/org/sonar/colorizer/MultilinesDocTokenizer.java b/sonar-colorizer/src/main/java/org/sonar/colorizer/MultilinesDocTokenizer.java
index 005d52a3263..120615063e2 100644
--- a/sonar-colorizer/src/main/java/org/sonar/colorizer/MultilinesDocTokenizer.java
+++ b/sonar-colorizer/src/main/java/org/sonar/colorizer/MultilinesDocTokenizer.java
@@ -24,6 +24,10 @@ import org.sonar.channel.EndMatcher;
import java.util.Arrays;
+/**
+ * @deprecated since 4.5.2 replace by highlighting mechanism
+ */
+@Deprecated
public class MultilinesDocTokenizer extends Tokenizer {
private static final String COMMENT_STARTED_ON_PREVIOUS_LINE = "COMMENT_STARTED_ON_PREVIOUS_LINE";
@@ -50,9 +54,9 @@ public class MultilinesDocTokenizer extends Tokenizer {
public boolean hasNextToken(CodeReader code, HtmlCodeBuilder codeBuilder) {
return code.peek() != '\n'
- && code.peek() != '\r'
- && (isCommentStartedOnPreviousLine(codeBuilder) || (code.peek() == startToken[0] && Arrays.equals(code.peek(startToken.length),
- startToken)));
+ && code.peek() != '\r'
+ && (isCommentStartedOnPreviousLine(codeBuilder) || (code.peek() == startToken[0] && Arrays.equals(code.peek(startToken.length),
+ startToken)));
}
@Override
diff --git a/sonar-colorizer/src/main/java/org/sonar/colorizer/NotThreadSafeTokenizer.java b/sonar-colorizer/src/main/java/org/sonar/colorizer/NotThreadSafeTokenizer.java
index ea46b37f77f..1efa7e67168 100644
--- a/sonar-colorizer/src/main/java/org/sonar/colorizer/NotThreadSafeTokenizer.java
+++ b/sonar-colorizer/src/main/java/org/sonar/colorizer/NotThreadSafeTokenizer.java
@@ -22,8 +22,9 @@ package org.sonar.colorizer;
/**
* A thread safe Tokenizer. Before each use by the CodeColorizer, the method clone() is automatically
* called to clone the current instance.
- *
+ * @deprecated since 4.5.2 replace by highlighting mechanism
*/
+@Deprecated
public abstract class NotThreadSafeTokenizer extends Tokenizer implements Cloneable {
@Override
diff --git a/sonar-colorizer/src/main/java/org/sonar/colorizer/RegexpTokenizer.java b/sonar-colorizer/src/main/java/org/sonar/colorizer/RegexpTokenizer.java
index fe21a8cd79b..11b1c2fe71a 100644
--- a/sonar-colorizer/src/main/java/org/sonar/colorizer/RegexpTokenizer.java
+++ b/sonar-colorizer/src/main/java/org/sonar/colorizer/RegexpTokenizer.java
@@ -19,12 +19,16 @@
*/
package org.sonar.colorizer;
+import org.sonar.channel.CodeReader;
+
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import org.sonar.channel.CodeReader;
-
-public class RegexpTokenizer extends NotThreadSafeTokenizer{
+/**
+ * @deprecated since 4.5.2 replace by highlighting mechanism
+ */
+@Deprecated
+public class RegexpTokenizer extends NotThreadSafeTokenizer {
private final String tagBefore;
private final String tagAfter;
diff --git a/sonar-colorizer/src/main/java/org/sonar/colorizer/Renderer.java b/sonar-colorizer/src/main/java/org/sonar/colorizer/Renderer.java
index b6a9c80607b..d9cb84c5f91 100644
--- a/sonar-colorizer/src/main/java/org/sonar/colorizer/Renderer.java
+++ b/sonar-colorizer/src/main/java/org/sonar/colorizer/Renderer.java
@@ -19,11 +19,15 @@
*/
package org.sonar.colorizer;
+import org.sonar.channel.Channel;
+
import java.io.Reader;
import java.util.List;
-import org.sonar.channel.Channel;
-
+/**
+ * @deprecated since 4.5.2 replace by highlighting mechanism
+ */
+@Deprecated
public abstract class Renderer {
public abstract String render(Reader code, List<? extends Channel<HtmlCodeBuilder>> tokenizers);
diff --git a/sonar-colorizer/src/main/java/org/sonar/colorizer/StringTokenizer.java b/sonar-colorizer/src/main/java/org/sonar/colorizer/StringTokenizer.java
index eec4ddd0914..248f12f442f 100644
--- a/sonar-colorizer/src/main/java/org/sonar/colorizer/StringTokenizer.java
+++ b/sonar-colorizer/src/main/java/org/sonar/colorizer/StringTokenizer.java
@@ -21,6 +21,10 @@ package org.sonar.colorizer;
import org.sonar.channel.CodeReader;
+/**
+ * @deprecated since 4.5.2 replace by highlighting mechanism
+ */
+@Deprecated
public class StringTokenizer extends Tokenizer {
private final LiteralTokenizer tokenizer;
diff --git a/sonar-colorizer/src/main/java/org/sonar/colorizer/SynhtaxHighlightingException.java b/sonar-colorizer/src/main/java/org/sonar/colorizer/SynhtaxHighlightingException.java
index ed7b5bc2a6f..8c008b031da 100644
--- a/sonar-colorizer/src/main/java/org/sonar/colorizer/SynhtaxHighlightingException.java
+++ b/sonar-colorizer/src/main/java/org/sonar/colorizer/SynhtaxHighlightingException.java
@@ -19,6 +19,10 @@
*/
package org.sonar.colorizer;
+/**
+ * @deprecated since 4.5.2 replace by highlighting mechanism
+ */
+@Deprecated
public class SynhtaxHighlightingException extends RuntimeException {
public SynhtaxHighlightingException(String arg0, Throwable arg1) {
diff --git a/sonar-colorizer/src/main/java/org/sonar/colorizer/Tokenizer.java b/sonar-colorizer/src/main/java/org/sonar/colorizer/Tokenizer.java
index 4e1d0f7ecd9..3933e521532 100644
--- a/sonar-colorizer/src/main/java/org/sonar/colorizer/Tokenizer.java
+++ b/sonar-colorizer/src/main/java/org/sonar/colorizer/Tokenizer.java
@@ -26,6 +26,8 @@ import org.sonar.channel.Channel;
* and to add the highlighted token to an HtmlCodeBuilder.
*
* IMPORTANT: a Tokenizer must be THREAD-SAFE otherwise use {@link NotThreadSafeTokenizer}
+ * @deprecated since 4.5.2 replace by highlighting mechanism
*/
+@Deprecated
public abstract class Tokenizer extends Channel<HtmlCodeBuilder> {
}