diff options
| author | Tor Norbye <tnorbye@google.com> | 2014-09-04 20:44:00 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-09-04 20:44:01 +0000 |
| commit | fb5a02906f644d044eb0286bf27d413ba0e05216 (patch) | |
| tree | bca7d49005d81d10c70bc3f547df041c636b4300 /platform/core-impl/src/com/intellij/openapi/application/ex/ApplicationEx.java | |
| parent | 9cde0e3c015174898df8b8f3672185941fad4786 (diff) | |
| parent | d245f58efbfc26b13b9b9d5e52e6a83a0d76216c (diff) | |
| download | idea-fb5a02906f644d044eb0286bf27d413ba0e05216.tar.gz | |
Merge "Merge remote-tracking branch 'aosp/upstream-master' into merge"
Diffstat (limited to 'platform/core-impl/src/com/intellij/openapi/application/ex/ApplicationEx.java')
| -rw-r--r-- | platform/core-impl/src/com/intellij/openapi/application/ex/ApplicationEx.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/platform/core-impl/src/com/intellij/openapi/application/ex/ApplicationEx.java b/platform/core-impl/src/com/intellij/openapi/application/ex/ApplicationEx.java index bf84725f7910..90506c071f35 100644 --- a/platform/core-impl/src/com/intellij/openapi/application/ex/ApplicationEx.java +++ b/platform/core-impl/src/com/intellij/openapi/application/ex/ApplicationEx.java @@ -38,7 +38,8 @@ public interface ApplicationEx extends Application { * @throws IOException * @throws InvalidDataException */ - void load(String optionsPath) throws IOException, InvalidDataException; + void load(@Nullable String optionsPath) throws IOException; + boolean isLoaded(); @NotNull |