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-55708 - NPE: FileEditorManager.getInstance

Browse Source
This commit is contained in:
peter
2014-04-24 18:56:56 +02:00
parent d8e641596d
commit 6b7c6a00fc
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/vcs-api/src/com/intellij/openapi/vcs/actions/VcsContext.java
+1 -1
View File
@@ -30,7 +30,7 @@ import java.io.File;
import java.util.Collection;
public interface VcsContext extends PlaceProvider<String> {
Project getProject();
@Nullable Project getProject();
@Nullable
VirtualFile getSelectedFile();
platform/vcs-impl/src/com/intellij/openapi/vcs/actions/AnnotateToggleAction.java
+4 -1
View File
@@ -111,8 +111,11 @@ public class AnnotateToggleAction extends ToggleAction implements DumbAware, Ann
if (selectedFile == null) {
return false;
}
Project project = context.getProject();
if (project == null) return false;
for (FileEditor fileEditor : FileEditorManager.getInstance(context.getProject()).getEditors(selectedFile)) {
for (FileEditor fileEditor : FileEditorManager.getInstance(project).getEditors(selectedFile)) {
if (fileEditor instanceof TextEditor) {
if (isAnnotated(((TextEditor)fileEditor).getEditor())) {
return true;