move Url to platform - avoid raw string

platform/lang-impl/src/com/intellij/openapi/fileEditor/impl/http/JumpFromRemoteFileToLocalAction.java

@@ -31,6 +31,8 @@ import com.intellij.psi.search.FilenameIndex;
 import com.intellij.psi.search.GlobalSearchScope;
 import com.intellij.ui.ColoredListCellRenderer;
 import com.intellij.ui.components.JBList;
+import com.intellij.util.Url;
+import com.intellij.util.Urls;
 import com.intellij.util.containers.ContainerUtil;
 import org.jetbrains.annotations.NotNull;
 
@@ -56,10 +58,9 @@ public class JumpFromRemoteFileToLocalAction extends AnAction {
 
   @Override
   public void actionPerformed(AnActionEvent e) {
-    final String url = myFile.getUrl();
-    Collection<VirtualFile> files = findLocalFiles(myProject, url, myFile.getName());
+    Collection<VirtualFile> files = findLocalFiles(myProject, Urls.newFromVirtualFile(myFile), myFile.getName());
     if (files.isEmpty()) {
-      Messages.showErrorDialog(myProject, "Cannot find local file for '" + url + "'", CommonBundle.getErrorTitle());
+      Messages.showErrorDialog(myProject, "Cannot find local file for '" + myFile.getUrl() + "'", CommonBundle.getErrorTitle());
       return;
     }
 
@@ -90,7 +91,7 @@ public class JumpFromRemoteFileToLocalAction extends AnAction {
     }
   }
 
-  private static Collection<VirtualFile> findLocalFiles(Project project, String url, String fileName) {
+  private static Collection<VirtualFile> findLocalFiles(Project project, Url url, String fileName) {
     for (LocalFileFinder finder : LocalFileFinder.EP_NAME.getExtensions()) {
       final VirtualFile file = finder.findLocalFile(url, project);
       if (file != null) {

platform/platform-api/src/com/intellij/util/Url.java

@@ -1,4 +1,4 @@
-package com.intellij.ide.browsers;
+package com.intellij.util;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;

platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/http/LocalFileFinder.java

@@ -18,6 +18,7 @@ package com.intellij.openapi.fileEditor.impl.http;
 import com.intellij.openapi.extensions.ExtensionPointName;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.vfs.VirtualFile;
+import com.intellij.util.Url;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -25,5 +26,5 @@ public abstract class LocalFileFinder {
   public static final ExtensionPointName<LocalFileFinder> EP_NAME = ExtensionPointName.create("com.intellij.http.localFileFinder");
 
   @Nullable 
-  public abstract VirtualFile findLocalFile(@NotNull String url, @NotNull Project project);
+  public abstract VirtualFile findLocalFile(@NotNull Url url, @NotNull Project project);
 }

platform/platform-impl/src/com/intellij/util/LocalFileUrl.java

@@ -1,4 +1,4 @@
-package com.intellij.ide.browsers;
+package com.intellij.util;
 
 import com.intellij.openapi.util.SystemInfo;
 import org.jetbrains.annotations.NotNull;

platform/platform-impl/src/com/intellij/util/UrlImpl.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.intellij.ide.browsers;
+package com.intellij.util;
 
 import com.intellij.openapi.util.SystemInfo;
 import com.intellij.openapi.util.text.StringUtil;

platform/platform-impl/src/com/intellij/util/Urls.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.intellij.ide.browsers;
+package com.intellij.util;
 
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.util.io.FileUtil;
@@ -51,7 +51,7 @@ public final class Urls {
 
   // java.net.URI.create cannot parse "file:///Test Stuff" - but you don't need to worry about it - this method is aware
   @Nullable
-  public static Url newFromIdea(@NotNull String url) {
+  public static Url parseFromIdea(@NotNull String url) {
     return URLUtil.containsScheme(url) ? parseUrl(url) : new LocalFileUrl(url);
   }
 

xml/impl/src/com/intellij/ide/browsers/BrowserStarter.java

@@ -6,6 +6,7 @@ import com.intellij.execution.configurations.RunConfiguration;
 import com.intellij.execution.process.ProcessHandler;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.util.text.StringUtil;
+import com.intellij.util.Urls;
 import com.intellij.util.net.NetUtils;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;

xml/impl/src/com/intellij/ide/browsers/OpenFileInDefaultBrowserAction.java

@@ -32,6 +32,7 @@ import com.intellij.testFramework.LightVirtualFile;
 import com.intellij.ui.ColoredListCellRenderer;
 import com.intellij.ui.components.JBList;
 import com.intellij.util.Consumer;
+import com.intellij.util.Url;
 import com.intellij.util.containers.ContainerUtil;
 import com.intellij.xml.XmlBundle;
 import com.intellij.xml.util.HtmlUtil;

xml/impl/src/com/intellij/ide/browsers/SelectInDefaultBrowserTarget.java

@@ -24,6 +24,7 @@ import com.intellij.openapi.util.Pair;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiFile;
 import com.intellij.testFramework.LightVirtualFile;
+import com.intellij.util.Url;
 import com.intellij.xml.XmlBundle;
 import com.intellij.xml.util.HtmlUtil;
 

xml/impl/src/com/intellij/ide/browsers/StartBrowserPanel.java

@@ -18,6 +18,7 @@ import com.intellij.psi.PsiBinaryFile;
 import com.intellij.psi.PsiFile;
 import com.intellij.psi.PsiManager;
 import com.intellij.ui.AncestorListenerAdapter;
+import com.intellij.util.Url;
 import com.intellij.util.io.URLUtil;
 import com.intellij.util.ui.UIUtil;
 import com.intellij.xml.XmlBundle;

xml/impl/src/com/intellij/ide/browsers/impl/WebBrowserServiceImpl.java

@@ -15,8 +15,6 @@
  */
 package com.intellij.ide.browsers.impl;
 
-import com.intellij.ide.browsers.Url;
-import com.intellij.ide.browsers.Urls;
 import com.intellij.ide.browsers.WebBrowserService;
 import com.intellij.ide.browsers.WebBrowserUrlProvider;
 import com.intellij.openapi.project.DumbService;
@@ -27,6 +25,8 @@ import com.intellij.openapi.vfs.impl.http.HttpVirtualFile;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiFile;
 import com.intellij.testFramework.LightVirtualFile;
+import com.intellij.util.Url;
+import com.intellij.util.Urls;
 import com.intellij.util.containers.ContainerUtil;
 import com.intellij.xml.util.HtmlUtil;
 import org.jetbrains.annotations.NotNull;

xml/openapi/src/com/intellij/ide/browsers/WebBrowserService.java

@@ -17,6 +17,7 @@ package com.intellij.ide.browsers;
 
 import com.intellij.openapi.components.ServiceManager;
 import com.intellij.psi.PsiElement;
+import com.intellij.util.Url;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.Set;

xml/openapi/src/com/intellij/ide/browsers/WebBrowserUrlProvider.java

@@ -20,6 +20,7 @@ import com.intellij.openapi.util.Ref;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiFile;
+import com.intellij.util.Url;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;