From d39ae787685baa505c1be0590cf59007e5029e05 Mon Sep 17 00:00:00 2001
From: Dmitry Avdeev <Dmitry.Avdeev@jetbrains.com>
Date: Thu, 31 Jul 2014 10:59:47 +0400
Subject: [PATCH] detaching el functionality

---
 .../providers/MethodPropertyReference.java    |  5 ++--
 .../psi/jsp/JavaJspElementVisitor.java        |  3 --
 .../intellij/psi/jsp/JspImplicitVariable.java | 30 -------------------
 3 files changed, 2 insertions(+), 36 deletions(-)
 delete mode 100644 java/jsp-openapi/src/com/intellij/psi/jsp/JspImplicitVariable.java

diff --git a/java/java-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/MethodPropertyReference.java b/java/java-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/MethodPropertyReference.java
index f7dc89ce5b80..307d608ddbd8 100644
--- a/java/java-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/MethodPropertyReference.java
+++ b/java/java-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/MethodPropertyReference.java
@@ -16,7 +16,6 @@
 package com.intellij.psi.impl.source.resolve.reference.impl.providers;
 
 import com.intellij.psi.*;
-import com.intellij.psi.jsp.JspImplicitVariable;
 import com.intellij.psi.jsp.JspSpiUtil;
 import com.intellij.psi.util.PropertyUtil;
 import com.intellij.psi.xml.XmlAttribute;
@@ -62,8 +61,8 @@ public class MethodPropertyReference extends BasicAttributeValueReference {
           }
         } else if (psiElement instanceof PsiClass) {
           return (PsiClass)psiElement;
-        } else if (psiElement instanceof JspImplicitVariable) {
-          final PsiType type=((JspImplicitVariable)psiElement).getType();
+        } else if (psiElement instanceof PsiVariable) {
+          final PsiType type=((PsiVariable)psiElement).getType();
           if (type instanceof PsiClassType) {
             return ((PsiClassType)type).resolve();
           }
diff --git a/java/jsp-openapi/src/com/intellij/psi/jsp/JavaJspElementVisitor.java b/java/jsp-openapi/src/com/intellij/psi/jsp/JavaJspElementVisitor.java
index 6eda197118bd..6100c98323bc 100644
--- a/java/jsp-openapi/src/com/intellij/psi/jsp/JavaJspElementVisitor.java
+++ b/java/jsp-openapi/src/com/intellij/psi/jsp/JavaJspElementVisitor.java
@@ -21,9 +21,6 @@ import com.intellij.psi.JavaElementVisitor;
  * @author yole
  */
 public abstract class JavaJspElementVisitor extends JavaElementVisitor {
-  public void visitJspImplicitVariable(JspImplicitVariable variable){
-    visitImplicitVariable(variable);
-  }
 
   public void visitJspFile(JspFile jspFile) {
     visitFile(jspFile);    
diff --git a/java/jsp-openapi/src/com/intellij/psi/jsp/JspImplicitVariable.java b/java/jsp-openapi/src/com/intellij/psi/jsp/JspImplicitVariable.java
deleted file mode 100644
index 921cc8055dd1..000000000000
--- a/java/jsp-openapi/src/com/intellij/psi/jsp/JspImplicitVariable.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright 2000-2009 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.intellij.psi.jsp;
-
-import com.intellij.pom.Navigatable;
-import com.intellij.psi.ImplicitVariable;
-import com.intellij.psi.PsiElement;
-import com.intellij.navigation.NavigationItem;
-
-public interface JspImplicitVariable extends ImplicitVariable, NavigationItem {
-  JspImplicitVariable[] EMPTY_ARRAY = new JspImplicitVariable[0];
-  int INSIDE = 1;
-  int AFTER = 2;
-  int getDeclarationRange();
-
-  PsiElement getDeclaration();
-}
\ No newline at end of file