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

fix binary compatibility

Browse Source
This commit is contained in:
Konstantin Bulenkov
2014-06-09 11:49:32 +02:00
parent 40875a7c74
commit ef92f2f8fe
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-api/src/com/intellij/ide/browsers/BrowserLauncherAppless.java
+2 -2
View File
@@ -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<String> pair = URLUtil.splitJarUrl(url);
Pair<String, String> pair = URLUtil.splitJarUrl(url);
if (pair == null) return null;
File jarFile = new File(FileUtil.toSystemDependentName(pair.first));
platform/util/src/com/intellij/util/io/URLUtil.java
+4 -4
View File
@@ -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<String> paths = splitJarUrl(url.getFile());
Pair<String, String> 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<String> splitJarUrl(@NotNull String url) {
public static Pair<String, String> 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