BaseJspFileImpl refactored

java/jsp-base-openapi/src/com/intellij/lang/jsp/JspFileViewProvider.java

@@ -16,17 +16,12 @@
 
 package com.intellij.lang.jsp;
 
-import com.intellij.lang.Language;
-import org.jetbrains.annotations.NotNull;
-
 import java.util.Set;
 
 /**
  * @author ik
  */
 public interface JspFileViewProvider extends JspxFileViewProvider {
-  @NotNull
-  Language getTemplateDataLanguage();
 
   Set<String> getKnownTaglibPrefixes();
 }

java/jsp-base-openapi/src/com/intellij/psi/jsp/BaseJspFile.java

@@ -34,6 +34,10 @@ public interface BaseJspFile extends XmlFile {
   XmlTag[] getDirectiveTags(JspDirectiveKind directiveKind, final boolean searchInIncludes);
   XmlTag createDirective(XmlTag context, JspDirectiveKind directiveKind);
 
+  /**
+   * Method with a bad name. Returns file corresponding to getTemplateDataLanguage() method of ViewProvider
+   * @see com.intellij.psi.templateLanguages.TemplateLanguageFileViewProvider#getTemplateDataLanguage()
+   */
   PsiFile getBaseLanguageRoot();
   /**
    * @return file which the errorPage directive references,

platform/lang-api/src/com/intellij/psi/templateLanguages/TemplateLanguageFileViewProvider.java

@@ -25,12 +25,14 @@ import org.jetbrains.annotations.NotNull;
 public interface TemplateLanguageFileViewProvider extends FileViewProvider {
 
   /**
+   * e.g. JSP
    * @return instanceof {@link com.intellij.psi.templateLanguages.TemplateLanguage}
    */
   @NotNull
   Language getBaseLanguage();
 
   /**
+   * e.g. HTML for JSP files
    * @return not instanceof {@link com.intellij.lang.DependentLanguage}
    */
   @NotNull