This commit replaces deprecated toURL() calls with toURI().toURL() as a

replacement.

Author: elsazac

bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/util/impl/resources/HttpResourcesLocatorImpl.java

@@ -13,7 +13,6 @@
  *******************************************************************************/
 package org.eclipse.e4.ui.css.core.util.impl.resources;
 
-import java.io.File;
 import java.io.InputStream;
 import java.net.URL;
 import org.eclipse.e4.ui.css.core.util.resources.IResourceLocator;
@@ -33,7 +32,7 @@ public String resolve(String uri) {
 
 	@Override
 	public InputStream getInputStream(String uri) throws Exception {
-		URL url = new java.net.URL((new File("./")).toURL(), uri);
+		URL url = new URL(uri);
 		return url.openStream();
 	}
 

bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/ChooseWorkspaceData.java

@@ -21,8 +21,11 @@
 import java.io.IOException;
 import java.io.Reader;
 import java.net.URL;
+import java.nio.file.Files;
+import java.nio.file.Path;
 import java.util.StringTokenizer;
 
+import org.eclipse.core.filesystem.URIUtil;
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.Platform;
 import org.eclipse.core.runtime.preferences.ConfigurationScope;
@@ -540,13 +543,12 @@ private static URL getPersistenceUrl(URL baseUrl, boolean create) {
 			}
 
 			// make sure the file exists
-			url = new URL(dir.toURL(), PERS_FILENAME);
-			File persFile = new File(url.getFile());
-			if (!persFile.exists() && (!create || !persFile.createNewFile())) {
+			Path p = Path.of(URIUtil.toURI(baseUrl.getPath() + File.pathSeparator + PERS_FILENAME));
+			if (!Files.exists(p) && (!create || !p.toFile().createNewFile())) {
 				return null;
 			}
 
-			return persFile.toURL();
+			return p.toUri().toURL();
 		} catch (IOException e) {
 			// cannot log because instance area has not been set
 			return null;