diff options
| author | Doug Schaefer | 2007-11-14 16:54:19 +0000 |
|---|---|---|
| committer | Doug Schaefer | 2007-11-14 16:54:19 +0000 |
| commit | e46d0efe274bd646936aa8eae8df8cdb1254fdce (patch) | |
| tree | 13225ab6c7f08d030f2793fe3caaf10084e314fd /core/org.eclipse.cdt.core/src | |
| parent | b8a19bed37344307160dbb3ad08162a6f0b908bb (diff) | |
| download | org.eclipse.cdt-e46d0efe274bd646936aa8eae8df8cdb1254fdce.tar.gz org.eclipse.cdt-e46d0efe274bd646936aa8eae8df8cdb1254fdce.tar.xz org.eclipse.cdt-e46d0efe274bd646936aa8eae8df8cdb1254fdce.zip | |
Fix for bug 209614 - make sure the delimiter returned isn't null.
Diffstat (limited to 'core/org.eclipse.cdt.core/src')
| -rw-r--r-- | core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/envvar/EnvirinmentVariable.java | 21 |
1 files changed, 8 insertions, 13 deletions
diff --git a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/envvar/EnvirinmentVariable.java b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/envvar/EnvirinmentVariable.java index 06da5a9a75c..f7affc9d508 100644 --- a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/envvar/EnvirinmentVariable.java +++ b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/envvar/EnvirinmentVariable.java @@ -10,6 +10,8 @@ *******************************************************************************/ 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()); } - /* (non-Javadoc) - * @see org.eclipse.cdt.managedbuilder.envvar.IBuildEnvironmentVariable#getName() - */ public String getName(){ return fName; } - /* (non-Javadoc) - * @see org.eclipse.cdt.managedbuilder.envvar.IBuildEnvironmentVariable#getValue() - */ public String getValue(){ return fValue; } - /* (non-Javadoc) - * @see org.eclipse.cdt.managedbuilder.envvar.IBuildEnvironmentVariable#getOperation() - */ public int getOperation(){ return fOperation; } - /* (non-Javadoc) - * @see org.eclipse.cdt.managedbuilder.envvar.IBuildEnvironmentVariable#getDelimiter() - */ public String getDelimiter(){ - return fDelimiter; + if (fDelimiter != null) + return fDelimiter; + else if (Platform.getOS() == Platform.OS_WIN32) + return ";"; + else + return ":"; } public Object clone(){ |