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 /xml/impl/src/com/intellij/ide/browsers/OpenUrlHyperlinkInfo.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 'xml/impl/src/com/intellij/ide/browsers/OpenUrlHyperlinkInfo.java')
-rw-r--r-- | xml/impl/src/com/intellij/ide/browsers/OpenUrlHyperlinkInfo.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/xml/impl/src/com/intellij/ide/browsers/OpenUrlHyperlinkInfo.java b/xml/impl/src/com/intellij/ide/browsers/OpenUrlHyperlinkInfo.java index e6bd32729b13..b634fd2fc8b1 100644 --- a/xml/impl/src/com/intellij/ide/browsers/OpenUrlHyperlinkInfo.java +++ b/xml/impl/src/com/intellij/ide/browsers/OpenUrlHyperlinkInfo.java @@ -40,15 +40,15 @@ public final class OpenUrlHyperlinkInfo implements HyperlinkWithPopupMenuInfo { this(url, Conditions.<WebBrowser>alwaysTrue(), null); } - public OpenUrlHyperlinkInfo(@NotNull String url, @Nullable WebBrowser browser) { - this(url, null, browser); + public OpenUrlHyperlinkInfo(@NotNull String url, @Nullable final WebBrowser browser) { + this(url, browser == null ? Conditions.<WebBrowser>alwaysTrue() : Conditions.is(browser)); } public OpenUrlHyperlinkInfo(@NotNull String url, @NotNull Condition<WebBrowser> browserCondition) { this(url, browserCondition, null); } - private OpenUrlHyperlinkInfo(@NotNull String url, @Nullable Condition<WebBrowser> browserCondition, @Nullable WebBrowser browser) { + private OpenUrlHyperlinkInfo(@NotNull String url, @NotNull Condition<WebBrowser> browserCondition, @Nullable WebBrowser browser) { this.url = url; this.browserCondition = browserCondition; this.browser = browser; @@ -58,7 +58,7 @@ public final class OpenUrlHyperlinkInfo implements HyperlinkWithPopupMenuInfo { public ActionGroup getPopupMenuGroup(@NotNull MouseEvent event) { DefaultActionGroup group = new DefaultActionGroup(); for (final WebBrowser browser : WebBrowserManager.getInstance().getActiveBrowsers()) { - if (browserCondition == null ? (this.browser == null || browser.equals(this.browser)) : browserCondition.value(browser)) { + if (browserCondition.value(browser)) { group.add(new AnAction("Open in " + browser.getName(), "Open URL in " + browser.getName(), browser.getIcon()) { @Override public void actionPerformed(AnActionEvent e) { |