From 6e104a205888389b7567a3626010fa418f4a9dea Mon Sep 17 00:00:00 2001 From: Elsa Zacharia Date: Thu, 24 Apr 2025 12:25:11 +0530 Subject: [PATCH 1/2] This commit replaces deprecated toURL() calls with toURI().toURL() as a replacement. --- .../util/impl/resources/HttpResourcesLocatorImpl.java | 3 +-- .../eclipse/ui/internal/ide/ChooseWorkspaceData.java | 10 ++++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/util/impl/resources/HttpResourcesLocatorImpl.java b/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/util/impl/resources/HttpResourcesLocatorImpl.java index 80672be10c0..ae7c58c4ad8 100644 --- a/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/util/impl/resources/HttpResourcesLocatorImpl.java +++ b/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(); } diff --git a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/ChooseWorkspaceData.java b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/ChooseWorkspaceData.java index 38fdf2f753f..90847b0c601 100644 --- a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/ChooseWorkspaceData.java +++ b/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; From 20d12195ed3559297ff8e939dfcffe1ea093fc96 Mon Sep 17 00:00:00 2001 From: Eclipse Platform Bot Date: Wed, 30 Apr 2025 07:05:56 +0000 Subject: [PATCH 2/2] Version bump(s) for 4.36 stream --- bundles/org.eclipse.e4.ui.css.core/META-INF/MANIFEST.MF | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bundles/org.eclipse.e4.ui.css.core/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.ui.css.core/META-INF/MANIFEST.MF index 164a33caaa9..459c82913a4 100644 --- a/bundles/org.eclipse.e4.ui.css.core/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.e4.ui.css.core/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-SymbolicName: org.eclipse.e4.ui.css.core;singleton:=true Bundle-Name: %pluginName Bundle-Vendor: %providerName Bundle-Localization: plugin -Bundle-Version: 0.14.500.qualifier +Bundle-Version: 0.14.600.qualifier Export-Package: org.eclipse.e4.ui.css.core;x-internal:=true, org.eclipse.e4.ui.css.core.css2;x-friends:="org.eclipse.e4.ui.css.swt.theme,org.eclipse.e4.ui.css.swt,org.eclipse.e4.ui.css.jface", org.eclipse.e4.ui.css.core.dom;x-friends:="org.eclipse.e4.ui.css.swt,org.eclipse.ui.views.properties.tabbed,org.eclipse.ui.forms",