From a9111bc8059ff4d90ef6065051c9263e175e41bd Mon Sep 17 00:00:00 2001 From: Vladimir Krivosheev Date: Tue, 6 Sep 2016 14:35:05 +0200 Subject: [PATCH] cleanup --- .../com/intellij/lang/java/JavaDocumentationProvider.java | 4 ++-- ...wserUrlProvider.java => BuiltInWebBrowserUrlProvider.kt} | 0 .../ide/browsers/actions/SelectInDefaultBrowserTarget.kt | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) rename platform/built-in-server/src/org/jetbrains/builtInWebServer/{BuiltInWebBrowserUrlProvider.java => BuiltInWebBrowserUrlProvider.kt} (100%) diff --git a/java/java-impl/src/com/intellij/lang/java/JavaDocumentationProvider.java b/java/java-impl/src/com/intellij/lang/java/JavaDocumentationProvider.java index 2c4a95c30b03..6d989e4ac5b3 100644 --- a/java/java-impl/src/com/intellij/lang/java/JavaDocumentationProvider.java +++ b/java/java-impl/src/com/intellij/lang/java/JavaDocumentationProvider.java @@ -61,7 +61,7 @@ import com.intellij.util.containers.ContainerUtil; import com.intellij.util.containers.HashMap; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.builtInWebServer.BuiltInWebBrowserUrlProvider; +import org.jetbrains.builtInWebServer.BuiltInWebBrowserUrlProviderKt; import java.util.LinkedHashSet; import java.util.List; @@ -751,7 +751,7 @@ public class JavaDocumentationProvider extends DocumentationProviderEx implement for (VirtualFile root : orderEntry.getFiles(JavadocOrderRootType.getInstance())) { if (root.getFileSystem() == JarFileSystem.getInstance()) { VirtualFile file = root.findFileByRelativePath(relPath); - List urls = file == null ? null : BuiltInWebBrowserUrlProvider.getUrls(file, project, null); + List urls = file == null ? null : BuiltInWebBrowserUrlProviderKt.getBuiltInServerUrls(file, project, null); if (!ContainerUtil.isEmpty(urls)) { List result = new SmartList<>(); for (Url url : urls) { diff --git a/platform/built-in-server/src/org/jetbrains/builtInWebServer/BuiltInWebBrowserUrlProvider.java b/platform/built-in-server/src/org/jetbrains/builtInWebServer/BuiltInWebBrowserUrlProvider.kt similarity index 100% rename from platform/built-in-server/src/org/jetbrains/builtInWebServer/BuiltInWebBrowserUrlProvider.java rename to platform/built-in-server/src/org/jetbrains/builtInWebServer/BuiltInWebBrowserUrlProvider.kt diff --git a/xml/impl/src/com/intellij/ide/browsers/actions/SelectInDefaultBrowserTarget.kt b/xml/impl/src/com/intellij/ide/browsers/actions/SelectInDefaultBrowserTarget.kt index bfecbc64e28d..0c6b9bca759f 100644 --- a/xml/impl/src/com/intellij/ide/browsers/actions/SelectInDefaultBrowserTarget.kt +++ b/xml/impl/src/com/intellij/ide/browsers/actions/SelectInDefaultBrowserTarget.kt @@ -1,5 +1,5 @@ /* - * Copyright 2000-2014 JetBrains s.r.o. + * Copyright 2000-2016 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. @@ -35,8 +35,8 @@ internal class SelectInDefaultBrowserTarget : SelectInTargetBase() { val request = createOpenInBrowserRequest(selectorInFile) ?: return false val urlProvider = WebBrowserServiceImpl.getProvider(request) if (urlProvider == null) { - val virtualFile = request.virtualFile - return virtualFile is HttpVirtualFile || HtmlUtil.isHtmlFile(request.file) && virtualFile !is LightVirtualFile + val virtualFile = request.virtualFile ?: return false + return virtualFile is HttpVirtualFile || (HtmlUtil.isHtmlFile(request.file) && virtualFile !is LightVirtualFile) } return true }