mirror of
https://github.com/eclipse-cdt/cdt
synced 2025-04-29 19:45:01 +02:00
Fix for bug 209614 - make sure the delimiter returned isn't null.
This commit is contained in:
parent
b8a19bed37
commit
e46d0efe27
1 changed files with 8 additions and 13 deletions
|
@ -10,6 +10,8 @@
|
||||||
*******************************************************************************/
|
*******************************************************************************/
|
||||||
package org.eclipse.cdt.core.envvar;
|
package org.eclipse.cdt.core.envvar;
|
||||||
|
|
||||||
|
import org.eclipse.core.runtime.Platform;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -50,32 +52,25 @@ public class EnvirinmentVariable implements IEnvironmentVariable, Cloneable {
|
||||||
this(var.getName(),var.getValue(),var.getOperation(),var.getDelimiter());
|
this(var.getName(),var.getValue(),var.getOperation(),var.getDelimiter());
|
||||||
}
|
}
|
||||||
|
|
||||||
/* (non-Javadoc)
|
|
||||||
* @see org.eclipse.cdt.managedbuilder.envvar.IBuildEnvironmentVariable#getName()
|
|
||||||
*/
|
|
||||||
public String getName(){
|
public String getName(){
|
||||||
return fName;
|
return fName;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* (non-Javadoc)
|
|
||||||
* @see org.eclipse.cdt.managedbuilder.envvar.IBuildEnvironmentVariable#getValue()
|
|
||||||
*/
|
|
||||||
public String getValue(){
|
public String getValue(){
|
||||||
return fValue;
|
return fValue;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* (non-Javadoc)
|
|
||||||
* @see org.eclipse.cdt.managedbuilder.envvar.IBuildEnvironmentVariable#getOperation()
|
|
||||||
*/
|
|
||||||
public int getOperation(){
|
public int getOperation(){
|
||||||
return fOperation;
|
return fOperation;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* (non-Javadoc)
|
|
||||||
* @see org.eclipse.cdt.managedbuilder.envvar.IBuildEnvironmentVariable#getDelimiter()
|
|
||||||
*/
|
|
||||||
public String getDelimiter(){
|
public String getDelimiter(){
|
||||||
return fDelimiter;
|
if (fDelimiter != null)
|
||||||
|
return fDelimiter;
|
||||||
|
else if (Platform.getOS() == Platform.OS_WIN32)
|
||||||
|
return ";";
|
||||||
|
else
|
||||||
|
return ":";
|
||||||
}
|
}
|
||||||
|
|
||||||
public Object clone(){
|
public Object clone(){
|
||||||
|
|
Loading…
Add table
Reference in a new issue