From: Julien HENRY <julien.henry@sonarsource.com>
Date: Mon, 1 Dec 2014 15:57:56 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/branch-4.5'
X-Git-Tag: 5.0-RC1~121
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=ab4232b3931437951dda555553fbd2ef1daada74;p=sonarqube.git

Merge remote-tracking branch 'origin/branch-4.5'

Conflicts:
	sonar-colorizer/src/main/java/org/sonar/colorizer/HtmlOptions.java
	sonar-plugin-api/src/main/java/org/sonar/api/batch/SonarIndex.java
	sonar-plugin-api/src/main/java/org/sonar/api/component/ResourcePerspectives.java
	sonar-plugin-api/src/main/java/org/sonar/api/web/CodeColorizerFormat.java
---

ab4232b3931437951dda555553fbd2ef1daada74
diff --cc sonar-colorizer/src/main/java/org/sonar/colorizer/HtmlOptions.java
index da86bc689c0,38c6b180f07..0955f4d1ba3
--- a/sonar-colorizer/src/main/java/org/sonar/colorizer/HtmlOptions.java
+++ b/sonar-colorizer/src/main/java/org/sonar/colorizer/HtmlOptions.java
@@@ -19,9 -19,10 +19,13 @@@
   */
  package org.sonar.colorizer;
  
 +import javax.annotation.CheckForNull;
 +import javax.annotation.Nullable;
 +
+ /**
+  * @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 --cc sonar-colorizer/src/main/java/org/sonar/colorizer/LiteralTokenizer.java
index 6a1007d5e73,054a74efe57..ed5bacda9da
--- a/sonar-colorizer/src/main/java/org/sonar/colorizer/LiteralTokenizer.java
+++ b/sonar-colorizer/src/main/java/org/sonar/colorizer/LiteralTokenizer.java
@@@ -61,10 -65,9 +65,10 @@@ public class LiteralTokenizer extends T
        literalValue = new StringBuilder();
      }
  
 +    @Override
      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 --cc sonar-plugin-api/src/main/java/org/sonar/api/batch/SonarIndex.java
index b03cc779119,39124edb2ab..d230420b20e
--- a/sonar-plugin-api/src/main/java/org/sonar/api/batch/SonarIndex.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/batch/SonarIndex.java
@@@ -38,7 -37,7 +38,7 @@@ import java.util.List
  import java.util.Set;
  
  /**
-  * @deprecated since 5.0 should not be an API. Everything should be accessed using {@link SensorContext}.
 - * @deprecated since 4.5.2 should not be used by plugins.
++ * @deprecated since 4.5.2 should not be used by plugins. Everything should be accessed using {@link SensorContext}.
   */
  @Deprecated
  public abstract class SonarIndex implements DirectedGraphAccessor<Resource, Dependency> {
diff --cc sonar-plugin-api/src/main/java/org/sonar/api/web/CodeColorizerFormat.java
index bb6903569c9,4c6c32a278a..ac32a3bf48d
--- a/sonar-plugin-api/src/main/java/org/sonar/api/web/CodeColorizerFormat.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/web/CodeColorizerFormat.java
@@@ -28,13 -27,13 +27,13 @@@ import org.sonar.colorizer.Tokenizer
  import java.util.List;
  
  /**
 - * Extend the library sonar-colorizer to support new languages. By default only Java sources are colorized in Sonar.
 + * Extend the library sonar-colorizer to support new languages.
   * 
   * @since 1.12
-  * @deprecated since 5.0 use {@link Highlightable} API
 - * @deprecated since 4.5.2 use {@link Highlightable}
++ * @deprecated since 4.5.2 use {@link Highlightable} API
   */
  @Deprecated
- public abstract class CodeColorizerFormat implements ServerExtension, TaskExtension {
+ public abstract class CodeColorizerFormat implements ServerExtension {
  
    private String languageKey;