getting rid of java in facelets

java/java-impl/src/com/intellij/psi/impl/source/codeStyle/JavaReferenceAdjuster.java

@@ -191,7 +191,9 @@ public class JavaReferenceAdjuster implements ReferenceAdjuster {
       JspFile jspFile = JspPsiUtil.getJspFile(parent.getPsi());
       if (jspFile != null) {
         JspClass jspClass = (JspClass)jspFile.getJavaClass();
-        addReferencesInRange(array, jspClass.getNode(), startOffset, endOffset);
+        if (jspClass != null) {
+          addReferencesInRange(array, jspClass.getNode(), startOffset, endOffset);
+        }
         return;
       }
     }

java/jsp-openapi/src/com/intellij/psi/jsp/JspFile.java

@@ -18,10 +18,13 @@ package com.intellij.psi.jsp;
 import com.intellij.psi.PsiClass;
 import com.intellij.psi.ServerPageFile;
 import com.intellij.psi.xml.XmlTag;
+import org.jetbrains.annotations.Nullable;
 
 public interface JspFile extends BaseJspFile, ServerPageFile {
   JspFile[] EMPTY_ARRAY = new JspFile[0];
 
   XmlTag[] getDirectiveTagsInContext(JspDirectiveKind directiveKind);
+
+  @Nullable
   PsiClass getJavaClass();
 }