MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

tolerant findBrowser

Browse Source
This commit is contained in:
Vladimir Krivosheev
2014-01-13 17:41:30 +01:00
parent 968f634120
commit 2c0ef615f5
3 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
xml/impl/src/com/intellij/ide/browsers/BrowserSelector.java
+1 -1
View File
@@ -110,7 +110,7 @@ public class BrowserSelector {
* @deprecated to remove in IDEA 14
*/
public void setSelectedBrowser(@SuppressWarnings("deprecation") @Nullable BrowsersConfiguration.BrowserFamily selectedItem) {
setSelected(selectedItem == null ? null : WebBrowserManager.getInstance().getBrowser(selectedItem));
setSelected(selectedItem == null ? null : WebBrowserManager.getInstance().findBrowser(selectedItem));
}
public void setSelected(@Nullable WebBrowser selectedItem) {
xml/impl/src/com/intellij/ide/browsers/UrlOpener.java
+1 -1
View File
@@ -24,7 +24,7 @@ public abstract class UrlOpener {
public static final ExtensionPointName<UrlOpener> EP_NAME = ExtensionPointName.create("org.jetbrains.urlOpener");
public static void launchBrowser(final @Nullable BrowsersConfiguration.BrowserFamily family, final @NotNull String url) {
launchBrowser(url, family == null ? null : WebBrowserManager.getInstance().getBrowser(family));
launchBrowser(url, family == null ? null : WebBrowserManager.getInstance().findBrowser(family));
}
// different params order in order not to break compilation for launchBrowser(null, url)
xml/impl/src/com/intellij/ide/browsers/WebBrowserManager.java
+8 -1
View File
@@ -253,13 +253,20 @@ public class WebBrowserManager implements PersistentStateComponent<Element>, Mod
@NotNull
public WebBrowser getBrowser(@NotNull BrowserFamily family) {
WebBrowser browser = findBrowser(family);
LOG.assertTrue(browser != null, "Must be at least one browser per family");
return browser;
}
@Nullable
public WebBrowser findBrowser(@NotNull BrowserFamily family) {
for (ConfigurableWebBrowser browser : browsers) {
if (family.equals(browser.getFamily())) {
return browser;
}
}
throw new IllegalStateException("Must be at least one browser per family");
return null;
}
public boolean isActive(@NotNull WebBrowser browser) {