diff --git a/platform/platform-api/src/com/intellij/openapi/fileEditor/FileEditorManager.java b/platform/platform-api/src/com/intellij/openapi/fileEditor/FileEditorManager.java index 3cb2b18856cb..aba033d9f239 100644 --- a/platform/platform-api/src/com/intellij/openapi/fileEditor/FileEditorManager.java +++ b/platform/platform-api/src/com/intellij/openapi/fileEditor/FileEditorManager.java @@ -49,7 +49,6 @@ public abstract class FileEditorManager { * * @param file file to open * @param focusEditor true if need to focus - * @param searchForOpen * @return array of opened editors */ @NotNull diff --git a/platform/platform-impl/src/com/intellij/ide/impl/SelectInEditorManagerImpl.java b/platform/platform-impl/src/com/intellij/ide/impl/SelectInEditorManagerImpl.java index c561203d47ed..6c7efde06915 100644 --- a/platform/platform-impl/src/com/intellij/ide/impl/SelectInEditorManagerImpl.java +++ b/platform/platform-impl/src/com/intellij/ide/impl/SelectInEditorManagerImpl.java @@ -55,10 +55,12 @@ public class SelectInEditorManagerImpl extends SelectInEditorManager implements myProject = project; } + @Override public void dispose() { releaseAll(); } + @Override public void selectInEditor(VirtualFile file, final int startOffset, final int endOffset, final boolean toSelectLine, final boolean toUseNormalSelection){ releaseAll(); final TextRange textRange; @@ -74,6 +76,7 @@ public class SelectInEditorManagerImpl extends SelectInEditorManager implements final Editor editor = openEditor(file, textRange.getStartOffset()); SwingUtilities.invokeLater(new Runnable(){ // later to let focus listener chance to handle events + @Override public void run() { if (editor != null && !editor.isDisposed()) { doSelect(toUseNormalSelection, editor, toSelectLine, textRange); @@ -126,13 +129,16 @@ public class SelectInEditorManagerImpl extends SelectInEditorManager implements myEditor.getCaretModel().addCaretListener(this); } + @Override public void focusGained(FocusEvent e) { releaseAll(); } + @Override public void focusLost(FocusEvent e) { } + @Override public void caretPositionChanged(CaretEvent e) { releaseAll(); }