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

EA-42594 - NPE: StructureViewWrapperImpl.setFile

Browse Source
This commit is contained in:
Gregory.Shrago
2013-01-07 21:24:46 +04:00
parent e0ce0bff12
commit 77b6de109e
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/ide/impl/StructureViewWrapperImpl.java
+9 -9
View File
@@ -19,10 +19,7 @@ package com.intellij.ide.impl;
import com.intellij.ide.DataManager;
import com.intellij.ide.IdeBundle;
import com.intellij.ide.projectView.impl.ProjectRootsUtil;
import com.intellij.ide.structureView.StructureView;
import com.intellij.ide.structureView.StructureViewBuilder;
import com.intellij.ide.structureView.StructureViewTreeElement;
import com.intellij.ide.structureView.StructureViewWrapper;
import com.intellij.ide.structureView.*;
import com.intellij.ide.structureView.impl.StructureViewComposite;
import com.intellij.ide.structureView.newStructureView.StructureViewComponent;
import com.intellij.openapi.Disposable;
@@ -34,7 +31,6 @@ import com.intellij.openapi.fileEditor.FileEditorProvider;
import com.intellij.openapi.fileEditor.ex.FileEditorProviderManager;
import com.intellij.openapi.fileEditor.impl.EditorWindow;
import com.intellij.openapi.fileEditor.impl.FileEditorManagerImpl;
import com.intellij.openapi.fileTypes.FileType;
import com.intellij.openapi.module.Module;
import com.intellij.openapi.module.ModuleUtil;
import com.intellij.openapi.project.Project;
@@ -183,10 +179,14 @@ public class StructureViewWrapperImpl implements StructureViewWrapper, Disposabl
private void setFile(VirtualFile file) {
boolean forceRebuild = !Comparing.equal(file, myFile);
if (!forceRebuild && myStructureView != null) {
StructureViewTreeElement treeElement = myStructureView.getTreeModel().getRoot();
Object value = treeElement.getValue();
if (value == null || value instanceof PsiElement && !((PsiElement)value).isValid()) {
forceRebuild = true;
StructureViewModel model = myStructureView.getTreeModel();
// model is null for UML diagrams
if (model != null) {
StructureViewTreeElement treeElement = model.getRoot();
Object value = treeElement.getValue();
if (value == null || value instanceof PsiElement && !((PsiElement)value).isValid()) {
forceRebuild = true;
}
}
}
if (forceRebuild) {