From 710b70ec911c312f6d26ef2ad7503fa685bb5342 Mon Sep 17 00:00:00 2001
From: Hannes Wellmann <wellmann.hannes1@gmx.net>
Date: Sat, 19 Oct 2024 09:51:01 +0200
Subject: [PATCH] Fix lock path computation on Windows and minor
 simplifications

Fixes https://github.com/eclipse-platform/eclipse.platform.ui/issues/2423
---
 .../ide/application/IDEApplication.java       | 39 +++++++++----------
 1 file changed, 19 insertions(+), 20 deletions(-)

diff --git a/bundles/org.eclipse.ui.ide.application/src/org/eclipse/ui/internal/ide/application/IDEApplication.java b/bundles/org.eclipse.ui.ide.application/src/org/eclipse/ui/internal/ide/application/IDEApplication.java
index 5deff13b81f..c77bbbb1010 100644
--- a/bundles/org.eclipse.ui.ide.application/src/org/eclipse/ui/internal/ide/application/IDEApplication.java
+++ b/bundles/org.eclipse.ui.ide.application/src/org/eclipse/ui/internal/ide/application/IDEApplication.java
@@ -24,9 +24,11 @@
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
+import java.io.InputStream;
 import java.io.OutputStream;
 import java.net.InetAddress;
 import java.net.MalformedURLException;
+import java.net.URISyntaxException;
 import java.net.URL;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -40,6 +42,7 @@
 import org.eclipse.core.runtime.OperationCanceledException;
 import org.eclipse.core.runtime.Platform;
 import org.eclipse.core.runtime.Status;
+import org.eclipse.core.runtime.URIUtil;
 import org.eclipse.core.runtime.jobs.Job;
 import org.eclipse.core.runtime.preferences.ConfigurationScope;
 import org.eclipse.equinox.app.IApplication;
@@ -86,7 +89,7 @@ public class IDEApplication implements IApplication, IExecutableExtension {
 
 	private static final String VERSION_FILENAME = "version.ini"; //$NON-NLS-1$
 
-	private static final String LOCK_INFO_FILENAME = ".lock_info"; //$NON-NLS-1$
+	private static final Path LOCK_INFO_FILE = Path.of(METADATA_FOLDER, ".lock_info"); //$NON-NLS-1$
 
 	private static final String DISPLAY_VAR = "DISPLAY"; //$NON-NLS-1$
 
@@ -404,14 +407,14 @@ protected Control createCustomArea(Composite parent) {
 	 */
 	protected String getWorkspaceLockInfo(URL workspaceUrl) {
 		try {
-			File lockFile = getLockInfoFile(workspaceUrl);
-			if (!lockFile.exists()) {
+			Path lockFile = getLockInfoFile(workspaceUrl);
+			if (!Files.exists(lockFile)) {
 				return null;
 			}
 
 			StringBuilder sb = new StringBuilder();
 			Properties props = new Properties();
-			try (FileInputStream is = new FileInputStream(lockFile)) {
+			try (InputStream is = Files.newInputStream(lockFile)) {
 				props.load(is);
 				String prop = props.getProperty(USER);
 				if (prop != null) {
@@ -441,8 +444,6 @@ protected String getWorkspaceLockInfo(URL workspaceUrl) {
 	/**
 	 * Write lock owner details onto workspace lock file. Data includes user, host,
 	 * display and current java process id.
-	 *
-	 * @param instanceLoc
 	 */
 	protected void writeWsLockInfo(URL workspaceUrl) {
 		Properties props = new Properties();
@@ -468,7 +469,7 @@ protected void writeWsLockInfo(URL workspaceUrl) {
 			return;
 		}
 
-		try (OutputStream output = new FileOutputStream(createLockInfoFile(workspaceUrl))) {
+		try (OutputStream output = Files.newOutputStream(createLockInfoFile(workspaceUrl))) {
 			props.store(output, null);
 		} catch (Exception e) {
 			IDEWorkbenchPlugin.log("Could not write lock info file", e); //$NON-NLS-1$
@@ -523,9 +524,12 @@ private String getHostName() {
 	 * @param workspaceUrl
 	 * @return .lock_info file.
 	 */
-	private File getLockInfoFile(URL workspaceUrl) {
-		Path lockInfoPath = Path.of(workspaceUrl.getPath(), METADATA_FOLDER, LOCK_INFO_FILENAME);
-		return lockInfoPath.toFile();
+	private static Path getLockInfoFile(URL workspaceUrl) {
+		try {
+			return Path.of(URIUtil.toURI(workspaceUrl)).resolve(LOCK_INFO_FILE);
+		} catch (URISyntaxException e) {
+			throw new IllegalArgumentException(e);
+		}
 	}
 
 	/**
@@ -534,17 +538,12 @@ private File getLockInfoFile(URL workspaceUrl) {
 	 * @param workspaceUrl
 	 * @return .lock_info file.
 	 */
-	private File createLockInfoFile(URL workspaceUrl) throws Exception {
-		File lockInfoFile = getLockInfoFile(workspaceUrl);
-
-		if (lockInfoFile.exists())
-			return lockInfoFile;
-
-		Path createdPath = Files.createFile(lockInfoFile.toPath());
-		if (createdPath != null) {
-			return createdPath.toFile();
+	private static Path createLockInfoFile(URL workspaceUrl) throws Exception {
+		Path lockInfoFile = getLockInfoFile(workspaceUrl);
+		if (!Files.exists(lockInfoFile)) {
+			Files.createFile(lockInfoFile);
 		}
-		return null;
+		return lockInfoFile;
 	}
 
 	@SuppressWarnings("rawtypes")