From 306f5fd6df031eb5fed17bc9f23067f8d7ea20d3 Mon Sep 17 00:00:00 2001 From: Dennis Ushakov Date: Fri, 7 May 2010 15:48:17 +0400 Subject: [PATCH] fix File.toURL deprecated api to get correct url for resources from classloader --- .../src/com/intellij/ide/ClassloaderUtil.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/platform/bootstrap/src/com/intellij/ide/ClassloaderUtil.java b/platform/bootstrap/src/com/intellij/ide/ClassloaderUtil.java index 08fb0ab8e9ca..ca799298e995 100644 --- a/platform/bootstrap/src/com/intellij/ide/ClassloaderUtil.java +++ b/platform/bootstrap/src/com/intellij/ide/ClassloaderUtil.java @@ -181,7 +181,7 @@ public class ClassloaderUtil { final StringTokenizer tokenizer = new StringTokenizer(classpath, File.separator, false); while (tokenizer.hasMoreTokens()) { final String token = tokenizer.nextToken(); - aClasspathElements.add(new File(token).toURL()); + aClasspathElements.add(new File(token).toURI().toURL()); } } else { @@ -217,7 +217,7 @@ public class ClassloaderUtil { final Class aClass = ClassloaderUtil.class; final String selfRoot = PathManager.getResourceRoot(aClass, "/" + aClass.getName().replace('.', '/') + ".class"); - final URL selfRootUrl = new File(selfRoot).getAbsoluteFile().toURL(); + final URL selfRootUrl = new File(selfRoot).getAbsoluteFile().toURI().toURL(); classPath.add(selfRootUrl); final File libFolder = new File(aFolderPath + File.separator + "lib"); @@ -238,7 +238,7 @@ public class ClassloaderUtil { if (!isJarOrZip(file)) { continue; } - final URL url = file.toURL(); + final URL url = file.toURI().toURL(); if (selfRootUrl.equals(url)) { continue; } @@ -262,7 +262,7 @@ public class ClassloaderUtil { final StringTokenizer tokenizer = new StringTokenizer(System.getProperty("idea.additional.classpath", ""), File.pathSeparator, false); while (tokenizer.hasMoreTokens()) { String pathItem = tokenizer.nextToken(); - classPath.add(new File(pathItem).toURL()); + classPath.add(new File(pathItem).toURI().toURL()); } } catch (MalformedURLException e) { @@ -274,4 +274,4 @@ public class ClassloaderUtil { public static boolean isLoadingOfExternalPluginsDisabled() { return !"true".equalsIgnoreCase(System.getProperty("idea.plugins.load", "true")); } -} \ No newline at end of file +}