diff --git a/platform/platform-api/src/com/intellij/ide/browsers/BrowserLauncherAppless.java b/platform/platform-api/src/com/intellij/ide/browsers/BrowserLauncherAppless.java index c1f0c8bc5c75..0c34152861d1 100644 --- a/platform/platform-api/src/com/intellij/ide/browsers/BrowserLauncherAppless.java +++ b/platform/platform-api/src/com/intellij/ide/browsers/BrowserLauncherAppless.java @@ -31,7 +31,7 @@ import com.intellij.openapi.progress.Task; import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.DialogWrapper; import com.intellij.openapi.ui.Messages; -import com.intellij.openapi.util.Couple; +import com.intellij.openapi.util.Pair; import com.intellij.openapi.util.Ref; import com.intellij.openapi.util.SystemInfo; import com.intellij.openapi.util.io.FileUtil; @@ -198,7 +198,7 @@ public class BrowserLauncherAppless extends BrowserLauncher { url = url.substring(0, sharpPos); } - Couple pair = URLUtil.splitJarUrl(url); + Pair pair = URLUtil.splitJarUrl(url); if (pair == null) return null; File jarFile = new File(FileUtil.toSystemDependentName(pair.first)); diff --git a/platform/util/src/com/intellij/util/io/URLUtil.java b/platform/util/src/com/intellij/util/io/URLUtil.java index 2c6496f9693f..1a6e633a3266 100644 --- a/platform/util/src/com/intellij/util/io/URLUtil.java +++ b/platform/util/src/com/intellij/util/io/URLUtil.java @@ -15,7 +15,7 @@ */ package com.intellij.util.io; -import com.intellij.openapi.util.Couple; +import com.intellij.openapi.util.Pair; import com.intellij.openapi.util.io.FileUtil; import com.intellij.openapi.util.text.StringUtil; import com.intellij.openapi.vfs.CharsetToolkit; @@ -88,7 +88,7 @@ public class URLUtil { @NotNull private static InputStream openJarStream(@NotNull URL url) throws IOException { - Couple paths = splitJarUrl(url.getFile()); + Pair paths = splitJarUrl(url.getFile()); if (paths == null) { throw new MalformedURLException(url.getFile()); } @@ -116,7 +116,7 @@ public class URLUtil { * E.g. "jar:file:///path/to/jar.jar!/resource.xml" is converted into ["/path/to/jar.jar", "resource.xml"]. */ @Nullable - public static Couple splitJarUrl(@NotNull String url) { + public static Pair splitJarUrl(@NotNull String url) { int pivot = url.indexOf(JAR_SEPARATOR); if (pivot < 0) return null; @@ -137,7 +137,7 @@ public class URLUtil { } } - return Couple.of(jarPath, resourcePath); + return Pair.create(jarPath, resourcePath); } @NotNull