diff --git a/java/java-impl/src/com/intellij/codeInsight/editorActions/JavaLineIndentProvider.java b/java/java-impl/src/com/intellij/codeInsight/editorActions/JavaLineIndentProvider.java
index cda6500c11b6..008078f605b8 100644
--- a/java/java-impl/src/com/intellij/codeInsight/editorActions/JavaLineIndentProvider.java
+++ b/java/java-impl/src/com/intellij/codeInsight/editorActions/JavaLineIndentProvider.java
@@ -46,9 +46,9 @@ public class JavaLineIndentProvider extends JavaLikeLangLineIndentProvider {
   protected SemanticEditorPosition.SyntaxElement mapType(@NotNull IElementType tokenType) {
     return SYNTAX_MAP.get(tokenType);
   }
-
+  
   @Override
-  public boolean isSuitableFor(@Nullable Language language) {
-    return language != null && language.isKindOf(JavaLanguage.INSTANCE);
+  public boolean isSuitableForLanguage(@NotNull Language language) {
+    return language.isKindOf(JavaLanguage.INSTANCE);
   }
 }
diff --git a/platform/lang-impl/src/com/intellij/psi/impl/source/codeStyle/JavaLikeLangLineIndentProvider.java b/platform/lang-impl/src/com/intellij/psi/impl/source/codeStyle/JavaLikeLangLineIndentProvider.java
index 7db1ab02de4e..6cae272e09b2 100644
--- a/platform/lang-impl/src/com/intellij/psi/impl/source/codeStyle/JavaLikeLangLineIndentProvider.java
+++ b/platform/lang-impl/src/com/intellij/psi/impl/source/codeStyle/JavaLikeLangLineIndentProvider.java
@@ -214,4 +214,11 @@ public abstract class JavaLikeLangLineIndentProvider extends FormatterBasedLineI
   private static Pair<Type,SyntaxElement> createIndentData(@Nullable Type type, @NotNull SyntaxElement element) {
     return type != null ? Pair.create(type, element) : null;
   }
+
+  @Override
+  public final boolean isSuitableFor(@Nullable Language language) {
+    return language != null && isSuitableForLanguage(language);
+  }
+  
+  public abstract boolean isSuitableForLanguage(@NotNull Language language);
 }