MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-18 09:34:34 +07:00
Code Issues Packages Projects Releases Wiki Activity

openapi doesn't depend on jsp-openapi

Browse Source
This commit is contained in:
Dmitry Jemerov
2009-08-31 18:48:32 +04:00
parent cb745ad59d
commit 0f82f2f878
4 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/openapi/openapi.iml
-1
View File
@@ -29,7 +29,6 @@
<orderEntry type="module" module-name="resources_eng" exported="" />
<orderEntry type="library" exported="" name="NanoXML" level="project" />
<orderEntry type="library" exported="" name="microba" level="project" />
<orderEntry type="module" module-name="jsp-openapi" exported="" />
<orderEntry type="library" name="jgoodies-forms" level="project" />
<orderEntry type="module" module-name="xml-openapi" exported="" />
<orderEntry type="module" module-name="platform-api" exported="" />
java/openapi/src/com/intellij/psi/PsiClassLevelDeclarationStatement.java
+7
View File
@@ -0,0 +1,7 @@
package com.intellij.psi;
/**
* @author yole
*/
public interface PsiClassLevelDeclarationStatement extends PsiStatement {
}
java/openapi/src/com/intellij/psi/util/PsiUtil.java
+3 -4
View File
@@ -22,7 +22,6 @@ import com.intellij.openapi.util.Key;
import com.intellij.openapi.util.TextRange;
import com.intellij.pom.java.LanguageLevel;
import com.intellij.psi.*;
import com.intellij.psi.impl.source.jsp.jspJava.JspClassLevelDeclarationStatement;
import com.intellij.psi.infos.MethodCandidateInfo.ApplicabilityLevel;
import com.intellij.psi.javadoc.PsiDocComment;
import com.intellij.psi.meta.PsiMetaData;
@@ -197,13 +196,13 @@ public final class PsiUtil extends PsiUtilBase {
if (parent instanceof PsiField && ((PsiField) parent).getInitializer() == element) {
blockSoFar = element;
}
if (parent instanceof JspClassLevelDeclarationStatement) {
if (parent instanceof PsiClassLevelDeclarationStatement) {
parent = parent.getParent();
}
if (element instanceof PsiClass && !isLocalOrAnonymousClass((PsiClass)element)) {
break;
}
if (JspPsiUtil.isInJspFile(element) && element instanceof PsiFile) {
if (PsiUtilBase.getTemplateLanguageFile(element) != null && element instanceof PsiFile) {
return element;
}
if (element == scope) break;
@@ -246,7 +245,7 @@ public final class PsiUtil extends PsiUtilBase {
final PsiClass aClass = ((PsiField) variable).getContainingClass();
while (context != null && context.getParent() != aClass) {
context = context.getParent();
if (context instanceof JspClassLevelDeclarationStatement) return null;
if (context instanceof PsiClassLevelDeclarationStatement) return null;
}
return context instanceof PsiMethod ?
((PsiMethod) context).getBody() :