2 files changed, 13 insertions, 1 deletions
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/i18n/I18n.java b/sonar-plugin-api/src/main/java/org/sonar/api/i18n/I18n.java
index 6e25699c0ac..f05288bd3c8 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/i18n/I18n.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/i18n/I18n.java
@@ -42,6 +42,6 @@ public interface I18n extends ServerComponent {
    * @param parameters   the parameters used to format the message from the translated pattern.
    * @return the message formatted with the translated pattern and the given parameters
    */
-  public abstract String message(final Locale locale, final String key, final String defaultValue, final Object... parameters);
+  String message(final Locale locale, final String key, final String defaultValue, final Object... parameters);
 
 }
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/resources/DefaultProjectFileSystem.java b/sonar-plugin-api/src/main/java/org/sonar/api/resources/DefaultProjectFileSystem.java
index aa5e7a68ee5..1c22f52d05c 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/resources/DefaultProjectFileSystem.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/resources/DefaultProjectFileSystem.java
@@ -168,11 +168,17 @@ public class DefaultProjectFileSystem implements ProjectFileSystem {
     return result;
   }
 
+  /**
+   * @deprecated in 2.6, use {@link #mainFiles(String...)} instead
+   */
   @Deprecated
   public List<File> getSourceFiles(Language... langs) {
     return toFiles(mainFiles(getLanguageKeys(langs)));
   }
 
+  /**
+   * @deprecated in 2.6, use {@link #mainFiles(String...)} instead
+   */
   @Deprecated
   public List<File> getJavaSourceFiles() {
     return getSourceFiles(Java.INSTANCE);
@@ -182,11 +188,17 @@ public class DefaultProjectFileSystem implements ProjectFileSystem {
     return !mainFiles(Java.KEY).isEmpty();
   }
 
+  /**
+   * @deprecated in 2.6, use {@link #testFiles(String...)} instead
+   */
   @Deprecated
   public List<File> getTestFiles(Language... langs) {
     return toFiles(testFiles(getLanguageKeys(langs)));
   }
 
+  /**
+   * @deprecated in 2.6
+   */
   @Deprecated
   public boolean hasTestFiles(Language lang) {
     return !testFiles(lang.getKey()).isEmpty();