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

avoid unnecessary exceptions (following IDEA-138664)

Browse Source
This commit is contained in:
Dmitry Batrak
2015-04-23 14:42:57 +03:00
parent 1c575a61f2
commit 7564fd472f
1 changed files with 26 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/FileEditorManagerImpl.java
+26 -2
View File
@@ -874,7 +874,8 @@ public class FileEditorManagerImpl extends FileEditorManagerEx implements Projec
// Now we have to create EditorComposite and insert it into the TabbedEditorComponent.
// After that we have to select opened editor.
EditorWithProviderComposite composite = new EditorWithProviderComposite(file, newEditors, newProviders, FileEditorManagerImpl.this);
EditorWithProviderComposite composite = createComposite(file, newEditors, newProviders);
if (composite == null) return;
if (index >= 0) {
composite.getFile().putUserData(EditorWindow.INITIAL_INDEX_KEY, index);
@@ -960,7 +961,30 @@ public class FileEditorManagerImpl extends FileEditorManagerEx implements Projec
}
}
});
return Pair.create(compositeRef.get().getEditors(), compositeRef.get().getProviders());
EditorWithProviderComposite composite = compositeRef.get();
return Pair.create(composite == null ? EMPTY_EDITOR_ARRAY : composite.getEditors(),
composite == null ? EMPTY_PROVIDER_ARRAY : composite.getProviders());
}
@Nullable
private EditorWithProviderComposite createComposite(@NotNull VirtualFile file,
@NotNull FileEditor[] editors, @NotNull FileEditorProvider[] providers) {
if (NullUtils.hasNull(editors) || NullUtils.hasNull(providers)) {
List<FileEditor> editorList = new ArrayList<FileEditor>(editors.length);
List<FileEditorProvider> providerList = new ArrayList<FileEditorProvider>(providers.length);
for (int i = 0; i < editors.length; i++) {
FileEditor editor = editors[i];
FileEditorProvider provider = providers[i];
if (editor != null && provider != null) {
editorList.add(editor);
providerList.add(provider);
}
}
if (editorList.isEmpty()) return null;
editors = editorList.toArray(new FileEditor[editorList.size()]);
providers = providerList.toArray(new FileEditorProvider[providerList.size()]);
}
return new EditorWithProviderComposite(file, editors, providers, this);
}
private static void clearWindowIfNeeded(@NotNull EditorWindow window) {