mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-08-04 14:55:41 +02:00
Code Issues Wiki Activity

2005-03-23 Alain Magloire

Browse source 
NPE fix.
	* src/org/eclipse/cdt/internal/core/PathEntryVariableresolver.java
This commit is contained in:
Alain Magloire 2005-03-23 19:41:30 +00:00
parent 88e9c1712a
commit 2531e9354f
2 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
core/org.eclipse.cdt.core/ChangeLog
View file

@ -1,3 +1,7 @@
2005-03-23 Alain Magloire
NPE fix.
* src/org/eclipse/cdt/internal/core/PathEntryVariableresolver.java
2005-03-23 Alain Magloire
Optimize the pathentry markers.
* model/org/eclipse/cdt/internal/core/model/BinaryRunner.java

8
core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/PathEntryVariableResolver.java
View file

@ -15,7 +15,9 @@ package org.eclipse.cdt.internal.core;
import org.eclipse.cdt.core.CCorePlugin;
import org.eclipse.cdt.core.resources.IPathEntryVariableManager;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Path;
import org.eclipse.core.runtime.Status;
import org.eclipse.core.variables.IDynamicVariable;
import org.eclipse.core.variables.IDynamicVariableResolver;
@ -31,7 +33,11 @@ public class PathEntryVariableResolver implements IDynamicVariableResolver {
throw new CoreException(new Status(IStatus.ERROR, CCorePlugin.PLUGIN_ID, IStatus.ERROR, CCorePlugin.getResourceString("PathEntryVariableResolver.0"), null)); //$NON-NLS-1$
}
IPathEntryVariableManager manager = CCorePlugin.getDefault().getPathEntryVariableManager();
return manager.getValue(argument).toString();
IPath path = manager.getValue(argument);
if (path == null) {
path = Path.EMPTY;
}
return path.toPortableString();
}
}