diff options
author | Tor Norbye <tnorbye@google.com> | 2014-08-20 17:28:18 -0700 |
---|---|---|
committer | Tor Norbye <tnorbye@google.com> | 2014-08-20 17:28:18 -0700 |
commit | d76e3920c56d37c942092b7dca20fcaded81c0a5 (patch) | |
tree | 80a55c7b59c38377216daaada4e8bc47b69ceb9a /platform/platform-api/src/com/intellij/openapi/wm/IdeFocusManager.java | |
parent | 3b37877a2561bf9fbe072253a18688807d523505 (diff) | |
parent | 1aa2e09bdbd413eacb677e9fa4b50630530d0656 (diff) | |
download | idea-d76e3920c56d37c942092b7dca20fcaded81c0a5.tar.gz |
Merge remote-tracking branch 'aosp/upstream-master' into merge
Conflicts:
.idea/modules.xml
platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdatesXmlLoader.java
Change-Id: Id899dae9a1e1c79272f8a70e14a7dcef4f760d7f
Diffstat (limited to 'platform/platform-api/src/com/intellij/openapi/wm/IdeFocusManager.java')
-rw-r--r-- | platform/platform-api/src/com/intellij/openapi/wm/IdeFocusManager.java | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/platform/platform-api/src/com/intellij/openapi/wm/IdeFocusManager.java b/platform/platform-api/src/com/intellij/openapi/wm/IdeFocusManager.java index d8f7e86d4b9e..6b4852319899 100644 --- a/platform/platform-api/src/com/intellij/openapi/wm/IdeFocusManager.java +++ b/platform/platform-api/src/com/intellij/openapi/wm/IdeFocusManager.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2013 JetBrains s.r.o. + * Copyright 2000-2014 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -163,9 +163,8 @@ public abstract class IdeFocusManager implements FocusRequestor { public abstract void toFront(JComponent c); public static IdeFocusManager getInstance(@Nullable Project project) { - if (project == null) return getGlobalInstance(); + if (project == null || project.isDisposed() || !project.isInitialized()) return getGlobalInstance(); - if (project.isDisposed() || !project.isInitialized()) return getGlobalInstance(); return project.getComponent(IdeFocusManager.class); } |