diff options
| author | Tor Norbye <tnorbye@google.com> | 2014-09-18 20:40:22 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-09-18 20:40:22 +0000 |
| commit | 07d35c37ce79a64bdd905b394d40fc9bbb18fa60 (patch) | |
| tree | e8787c45e494dfcc558faf0f75956f8785c39b94 /platform/platform-api/src/com/intellij/openapi/fileEditor/FileEditorManager.java | |
| parent | e222a9e1e66670a56e926a6b0f3e10231eeeb1fb (diff) | |
| parent | b5fb31ef6a38f19404859755dbd2e345215b97bf (diff) | |
| download | idea-07d35c37ce79a64bdd905b394d40fc9bbb18fa60.tar.gz | |
Merge "Merge remote-tracking branch 'aosp/upstream-master' into merge"
Diffstat (limited to 'platform/platform-api/src/com/intellij/openapi/fileEditor/FileEditorManager.java')
| -rw-r--r-- | platform/platform-api/src/com/intellij/openapi/fileEditor/FileEditorManager.java | 2 |
1 files changed, 1 insertions, 1 deletions
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 86e719eef48d..dcb1327f1a10 100644 --- a/platform/platform-api/src/com/intellij/openapi/fileEditor/FileEditorManager.java +++ b/platform/platform-api/src/com/intellij/openapi/fileEditor/FileEditorManager.java @@ -197,5 +197,5 @@ public abstract class FileEditorManager { * @param fileEditorProviderId the ID of the file editor to open; matches the return value of * {@link com.intellij.openapi.fileEditor.FileEditorProvider#getEditorTypeId()} */ - public abstract void setSelectedEditor(@NotNull VirtualFile file, String fileEditorProviderId); + public abstract void setSelectedEditor(@NotNull VirtualFile file, @NotNull String fileEditorProviderId); } |