Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlena Laskavaia2009-01-29 21:33:00 +0000
committerAlena Laskavaia2009-01-29 21:33:00 +0000
commit289b92e3122d1728e191358dacd1946c1b56ab28 (patch)
treeb4a071a755ba985e7acf9261e0a0c225ef05100d
parent251e272d128a721d6eed5e922b02ba035202f482 (diff)
downloadorg.eclipse.cdt-289b92e3122d1728e191358dacd1946c1b56ab28.tar.gz
org.eclipse.cdt-289b92e3122d1728e191358dacd1946c1b56ab28.tar.xz
org.eclipse.cdt-289b92e3122d1728e191358dacd1946c1b56ab28.zip
[261280] - input type to support more than one discovery profile id
-rw-r--r--build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/InputType.java9
1 files changed, 8 insertions, 1 deletions
diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/InputType.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/InputType.java
index 5afe4d38501..d04ac61ba6e 100644
--- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/InputType.java
+++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/InputType.java
@@ -1815,9 +1815,16 @@ public class InputType extends BuildObject implements IInputType {
public String getDiscoveryProfileId(ITool tool) {
String id = getDiscoveryProfileIdAttribute();
- if(id == null){
+ if (id == null){
id = ((Tool)tool).getDiscoveryProfileId();
}
+ // if there is more than one ('|'-separated), return the first one
+ // TODO: expand interface with String[] getDiscoveryProfileIds(ITool tool)
+ if (null != id) {
+ int nPos = id.indexOf('|');
+ if (nPos > 0)
+ id = id.substring(0, nPos);
+ }
return id;
}

Back to the top