Fix API tags and extra slash

eclipse-cdt · Jun 7, 2023 · bde0761 · bde0761
1 parent 71a52d0
commit bde0761
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/core/org.eclipse.cdt.ui/META-INF/MANIFEST.MF b/core/org.eclipse.cdt.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.cdt.ui; singleton:=true
-Bundle-Version: 8.0.200.qualifier
+Bundle-Version: 8.1.0.qualifier
 Bundle-Activator: org.eclipse.cdt.ui.CUIPlugin
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin

diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/AbstractCPropertyTab.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/AbstractCPropertyTab.java
@@ -503,10 +503,16 @@ public static String getWorkspaceFileDialog(Shell shell, String text) {
 		return getWorkspaceDialog(shell, text, false, true, null);
 	}
 
+	/**
+	 * @since 8.1
+	 */
 	public static String getWorkspaceDirDialog(Shell shell, String text, IProject prj) {
 		return getWorkspaceDialog(shell, text, true, true, prj);
 	}
 
+	/**
+	 * @since 8.1
+	 */
 	public static String getWorkspaceFileDialog(Shell shell, String text, IProject prj) {
 		return getWorkspaceDialog(shell, text, false, true, prj);
 	}
@@ -586,9 +592,9 @@ public IStatus validate(Object[] selection) {
 			IResource resource = (IResource) dialog.getFirstResult();
 			if (resource != null) {
 				if (resource.getProject().equals(prj)) {
-					StringBuilder buf = new StringBuilder();
-					return buf.append("${").append("workspace_loc:/${ProjName}/") //$NON-NLS-1$//$NON-NLS-2$
-							.append(resource.getProjectRelativePath()).append("}").toString(); //$NON-NLS-1$
+					String projectPath = new Path("${ProjName}").append(resource.getProjectRelativePath()) //$NON-NLS-1$
+							.makeAbsolute().toString();
+					return "${workspace_loc:" + projectPath + "}"; //$NON-NLS-1$ //$NON-NLS-2$
 				}
 				StringBuilder buf = new StringBuilder();
 				return buf.append("${").append("workspace_loc:").append(resource.getFullPath()).append("}").toString(); //$NON-NLS-3$ //$NON-NLS-2$ //$NON-NLS-1$