diff options
| author | Tor Norbye <tnorbye@google.com> | 2014-08-21 00:31:02 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-08-16 04:55:08 +0000 |
| commit | 9cde0e3c015174898df8b8f3672185941fad4786 (patch) | |
| tree | 80a55c7b59c38377216daaada4e8bc47b69ceb9a /platform/lang-api/src/com/intellij/execution/RunnerRegistry.java | |
| parent | 3b37877a2561bf9fbe072253a18688807d523505 (diff) | |
| parent | d76e3920c56d37c942092b7dca20fcaded81c0a5 (diff) | |
| download | idea-9cde0e3c015174898df8b8f3672185941fad4786.tar.gz | |
Merge "Merge remote-tracking branch 'aosp/upstream-master' into merge"
Diffstat (limited to 'platform/lang-api/src/com/intellij/execution/RunnerRegistry.java')
| -rw-r--r-- | platform/lang-api/src/com/intellij/execution/RunnerRegistry.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/platform/lang-api/src/com/intellij/execution/RunnerRegistry.java b/platform/lang-api/src/com/intellij/execution/RunnerRegistry.java index 39eb47de921d..fec7223b1721 100644 --- a/platform/lang-api/src/com/intellij/execution/RunnerRegistry.java +++ b/platform/lang-api/src/com/intellij/execution/RunnerRegistry.java @@ -30,7 +30,7 @@ public abstract class RunnerRegistry implements ApplicationComponent { public abstract boolean hasRunner(@NotNull final String executorId, @NotNull final RunProfile settings); @Nullable - public abstract ProgramRunner getRunner(@NotNull final String executorId, final RunProfile settings); + public abstract ProgramRunner getRunner(@NotNull String executorId, @Nullable RunProfile settings); public abstract ProgramRunner[] getRegisteredRunners(); |