From 3eb87ecf10cf17c1a888f7a2000e519352794a1e Mon Sep 17 00:00:00 2001
From: Dmitry Avdeev <Dmitry.Avdeev@jetbrains.com>
Date: Fri, 23 Jul 2010 19:26:17 +0400
Subject: [PATCH] BaseJspFileImpl refactored

---
 .../src/com/intellij/lang/jsp/JspFileViewProvider.java       | 5 -----
 .../src/com/intellij/psi/jsp/BaseJspFile.java                | 4 ++++
 .../templateLanguages/TemplateLanguageFileViewProvider.java  | 2 ++
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/java/jsp-base-openapi/src/com/intellij/lang/jsp/JspFileViewProvider.java b/java/jsp-base-openapi/src/com/intellij/lang/jsp/JspFileViewProvider.java
index d0bb429508c0..b92a311519b4 100644
--- a/java/jsp-base-openapi/src/com/intellij/lang/jsp/JspFileViewProvider.java
+++ b/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();
 }
diff --git a/java/jsp-base-openapi/src/com/intellij/psi/jsp/BaseJspFile.java b/java/jsp-base-openapi/src/com/intellij/psi/jsp/BaseJspFile.java
index 08e182bfc842..4b39c8b346d9 100644
--- a/java/jsp-base-openapi/src/com/intellij/psi/jsp/BaseJspFile.java
+++ b/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,
diff --git a/platform/lang-api/src/com/intellij/psi/templateLanguages/TemplateLanguageFileViewProvider.java b/platform/lang-api/src/com/intellij/psi/templateLanguages/TemplateLanguageFileViewProvider.java
index f14a9f662771..9ba8f9191692 100644
--- a/platform/lang-api/src/com/intellij/psi/templateLanguages/TemplateLanguageFileViewProvider.java
+++ b/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