Fix Workbench.setEdgeDataDirectory(Display) in case of path with spaces

URLs returned by
org.eclipse.osgi.service.datalocation.Location.getDataArea(String)
are not strictly valid URIs as well, e.g. they do not properly encode
space characters.

Do not use #toUri() but let java.io.File(String) deal with it instead.

Same approach is also used in
org.eclipse.e4.ui.css.swt.internal.theme.ThemeEngine.ThemeEngine
constructor.

Fixes #2725.

Author: sratz

bundles/org.eclipse.ui.workbench/eclipseui/org/eclipse/ui/internal/Workbench.java

@@ -29,6 +29,7 @@
 import com.ibm.icu.util.ULocale;
 import com.ibm.icu.util.ULocale.Category;
 import java.io.BufferedInputStream;
+import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
@@ -37,7 +38,6 @@
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.net.URL;
-import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
@@ -529,10 +529,10 @@ private static void setEdgeDataDirectory(Display display) {
 			return;
 		}
 		try {
-			URI swtMetadataLocationURI = workspaceLocation
-					.getDataArea(FrameworkUtil.getBundle(Browser.class).getSymbolicName()).toURI();
-			display.setData(EDGE_USER_DATA_FOLDER, Paths.get(swtMetadataLocationURI).toString());
-		} catch (URISyntaxException | IOException e) {
+			URL swtMetadataLocationURL = workspaceLocation
+					.getDataArea(FrameworkUtil.getBundle(Browser.class).getSymbolicName());
+			display.setData(EDGE_USER_DATA_FOLDER, new File(swtMetadataLocationURL.getFile()).toString());
+		} catch (IOException e) {
 			WorkbenchPlugin.log("Invalid workspace location to be set for Edge browser.", e); //$NON-NLS-1$
 		}
 	}