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

[platform] fixes PCE logging

Browse Source
This commit is contained in:
Roman Shevchenko
2016-07-12 12:12:39 +02:00
parent 10b50729d9
commit 79badf96e3
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/FileEditorManagerImpl.java
+8 -5
View File
@@ -121,7 +121,7 @@ public class FileEditorManagerImpl extends FileEditorManagerEx implements Persis
private final List<Pair<VirtualFile, EditorWindow>> mySelectionHistory = new ArrayList<Pair<VirtualFile, EditorWindow>>();
private Reference<EditorComposite> myLastSelectedComposite = new WeakReference<EditorComposite>(null);
private final MergingUpdateQueue myQueue = new MergingUpdateQueue("FileEditorManagerUpdateQueue", 50, true,
private final MergingUpdateQueue myQueue = new MergingUpdateQueue("FileEditorManagerUpdateQueue", 50, true,
MergingUpdateQueue.ANY_COMPONENT);
private final BusyObject.Impl.Simple myBusyObject = new BusyObject.Impl.Simple();
@@ -877,6 +877,9 @@ public class FileEditorManagerImpl extends FileEditorManagerEx implements Persis
editor.addPropertyChangeListener(myEditorPropertyChangeListener);
editor.putUserData(DUMB_AWARE, DumbService.isDumbAware(provider));
}
catch (ProcessCanceledException e) {
throw e;
}
catch (Exception e) {
LOG.error(e);
}
@@ -998,9 +1001,9 @@ public class FileEditorManagerImpl extends FileEditorManagerEx implements Persis
while (!semaphore.waitFor(10) && !myProject.isDisposed());
}
}
@Nullable
private EditorWithProviderComposite createComposite(@NotNull VirtualFile file,
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);
@@ -1407,7 +1410,7 @@ public class FileEditorManagerImpl extends FileEditorManagerEx implements Persis
public void removeEditorAnnotation(@NotNull FileEditor editor, @NotNull JComponent annotationComponent) {
removeTopComponent(editor, annotationComponent);
}
@NotNull
public List<JComponent> getTopComponents(@NotNull FileEditor editor) {
final EditorComposite composite = getEditorComposite(editor);
@@ -1845,7 +1848,7 @@ public class FileEditorManagerImpl extends FileEditorManagerEx implements Persis
private class MyRootsListener extends ModuleRootAdapter {
private boolean myScheduled;
@Override
public void rootsChanged(ModuleRootEvent event) {
if (myScheduled) return;