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/platform-impl/src/com/intellij/help/impl/MacHelpUtil.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/platform-impl/src/com/intellij/help/impl/MacHelpUtil.java')
-rw-r--r-- | platform/platform-impl/src/com/intellij/help/impl/MacHelpUtil.java | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/platform/platform-impl/src/com/intellij/help/impl/MacHelpUtil.java b/platform/platform-impl/src/com/intellij/help/impl/MacHelpUtil.java index a73295c90f74..27fd6f52e4a6 100644 --- a/platform/platform-impl/src/com/intellij/help/impl/MacHelpUtil.java +++ b/platform/platform-impl/src/com/intellij/help/impl/MacHelpUtil.java @@ -28,20 +28,20 @@ import org.jetbrains.annotations.Nullable; */ public class MacHelpUtil { static boolean invokeHelp(@NonNls @Nullable String id) { - id = id == null || "top".equals(id) ? "startpage" : id; + if (id == null || "top".equals(id)) id = "startpage"; - final ID mainBundle = Foundation.invoke("NSBundle", "mainBundle"); - final ID helpBundle = Foundation.invoke(mainBundle, "objectForInfoDictionaryKey:", Foundation.nsString("CFBundleHelpBookName")); + ID mainBundle = Foundation.invoke("NSBundle", "mainBundle"); + ID helpBundle = Foundation.invoke(mainBundle, "objectForInfoDictionaryKey:", Foundation.nsString("CFBundleHelpBookName")); if (helpBundle.equals(ID.NIL)) { return false; } - final ID helpManager = Foundation.invoke("NSHelpManager", "sharedHelpManager"); + + ID helpManager = Foundation.invoke("NSHelpManager", "sharedHelpManager"); Foundation.invoke(helpManager, "openHelpAnchor:inBook:", Foundation.nsString(id), helpBundle); return true; } static boolean isApplicable() { - return SystemInfo.isMac && Registry.is("ide.mac.show.native.help") && !PlatformUtils.isCidr() && !PlatformUtils - .isIdeaCommunity(); + return SystemInfo.isMac && Registry.is("ide.mac.show.native.help") && !PlatformUtils.isCidr() && !PlatformUtils.isIdeaCommunity(); } } |