Handle not set workspace target in TargetDefinitionActivationCodeMining

eclipse-pde · Oct 16, 2024 · e294d7d · e294d7d
1 parent f6bcbe3
commit e294d7d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 12 deletions.
diff --git a/ui/org.eclipse.pde.genericeditor.extension/META-INF/MANIFEST.MF b/ui/org.eclipse.pde.genericeditor.extension/META-INF/MANIFEST.MF
@@ -14,7 +14,6 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.ui.workbench.texteditor,
  org.eclipse.core.expressions,
  org.eclipse.core.filebuffers,
- org.eclipse.core.filesystem,
  org.eclipse.core.resources
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Bundle-Vendor: %providerName

diff --git a/...ernal/genericeditor/target/extension/codemining/TargetDefinitionActivationCodeMining.java b/...ernal/genericeditor/target/extension/codemining/TargetDefinitionActivationCodeMining.java
@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2018, 2019 vogella GmbH and others
+ * Copyright (c) 2018, 2024 vogella GmbH and others
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License 2.0 which is available at
@@ -19,7 +19,6 @@
 
 import org.eclipse.core.filebuffers.FileBuffers;
 import org.eclipse.core.filebuffers.ITextFileBufferManager;
-import org.eclipse.core.filesystem.URIUtil;
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IWorkspaceRoot;
 import org.eclipse.core.resources.ResourcesPlugin;
@@ -67,11 +66,10 @@ protected CompletableFuture<Void> doResolve(ITextViewer viewer, IProgressMonitor
 			}
 			boolean isCurrent = false;
 			try {
-				ITargetPlatformService service = acquireTargetPlatformService();
-				String memento = service.getWorkspaceTargetHandle().getMemento();
-				ITargetHandle targetHandle = getTargetHandle();
-				String targetMemento = targetHandle.getMemento();
-				isCurrent = Objects.equals(memento, targetMemento);
+				ITargetHandle workspaceTarget = acquireTargetPlatformService().getWorkspaceTargetHandle();
+				if (workspaceTarget != null) {
+					isCurrent = Objects.equals(workspaceTarget.getMemento(), getTargetHandle().getMemento());
+				}
 			} catch (CoreException e) {
 				// Caught with default message shown
 			}
@@ -104,14 +102,12 @@ private ITargetHandle getTargetHandle() {
 		if (!file.exists()) {
 			file = root.getFileForLocation(path);
 		}
-		ITargetHandle handle;
 		ITargetPlatformService service = acquireTargetPlatformService();
 		if (file != null) {
-			handle = service.getTarget(file);
+			return service.getTarget(file);
 		} else {
-			handle = service.getTarget(URIUtil.toURI(path));
+			return service.getTarget(path.toPath().toUri());
 		}
-		return handle;
 	}
 
 	private ITargetPlatformService acquireTargetPlatformService() {