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

Libraies: npe fix on updating open class files

Browse Source
This commit is contained in:
Anton Makeev
2010-06-22 17:55:23 +04:00
parent f30c8ccd37
commit 4582ca7a38
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/codeEditor/JavaEditorFileSwapper.java
+7 -1
View File
@@ -22,17 +22,22 @@ import com.intellij.psi.*;
import com.intellij.psi.impl.compiled.ClsClassImpl;
import com.intellij.psi.impl.compiled.ClsFileImpl;
import com.intellij.psi.search.GlobalSearchScope;
import org.jetbrains.annotations.Nullable;
public class JavaEditorFileSwapper implements EditorFileSwapper {
public VirtualFile getFileToSwapTo(Project project, VirtualFile original) {
return findSourceFile(project, original);
}
@Nullable
public static VirtualFile findSourceFile(Project project, VirtualFile eachFile) {
PsiFile psiFile = PsiManager.getInstance(project).findFile(eachFile);
if (!(psiFile instanceof ClsFileImpl)) return null;
PsiClass clsClass = JavaPsiFacade.getInstance(project).findClass(getFQN(psiFile), GlobalSearchScope.allScope(project));
String fqn = getFQN(psiFile);
if (fqn == null) return null;
PsiClass clsClass = JavaPsiFacade.getInstance(project).findClass(fqn, GlobalSearchScope.allScope(project));
if (!(clsClass instanceof ClsClassImpl)) return null;
PsiClass sourceClass = ((ClsClassImpl)clsClass).getSourceMirrorClass();
@@ -43,6 +48,7 @@ public class JavaEditorFileSwapper implements EditorFileSwapper {
return result;
}
@Nullable
public static String getFQN(PsiFile psiFile) {
if (!(psiFile instanceof PsiJavaFile)) return null;
PsiClass[] classes = ((PsiJavaFile)psiFile).getClasses();