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

fix for option parent calculation

Browse source
This commit is contained in:
Mikhail Sennikovsky 2006-04-03 10:24:33 +00:00
parent 84cef01e46
commit 3df6744baa
1 changed files with 28 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/macros/OptionContextData.java
View file

@ -1,5 +1,5 @@
/******************************************************************************* /*******************************************************************************
* Copyright (c) 2005 Intel Corporation and others. * Copyright (c) 2005, 2006 Intel Corporation and others.
* All rights reserved. This program and the accompanying materials * All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0 * are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at * which accompanies this distribution, and is available at
@ -64,12 +64,13 @@ public class OptionContextData implements IOptionContextData {
IOption option = data.getOption(); IOption option = data.getOption();
if(option == null) if(option == null)
return null; return null;
IHoldsOptions tmp = option.getOptionHolder();
ho = option.getOptionHolder();
ITool tools[] = null; ITool tools[] = null;
if(tCh != null){ if(tCh != null){
for(IToolChain cur = tCh; cur != null; cur = cur.getSuperClass()){ for(IToolChain cur = tCh; cur != null; cur = cur.getSuperClass()){
if(cur == ho) if(cur == tmp)
return tCh; return tCh;
} }
tools = tCh.getTools(); tools = tCh.getTools();
@ -80,8 +81,30 @@ public class OptionContextData implements IOptionContextData {
if(tools != null){ if(tools != null){
for(int i = 0; i < tools.length; i++){ for(int i = 0; i < tools.length; i++){
for(ITool cur = tools[i]; cur != null; cur = cur.getSuperClass()){ for(ITool cur = tools[i]; cur != null; cur = cur.getSuperClass()){
if(cur == ho) if(cur == tmp){
return tools[i]; ITool tool = tools[i];
if(!tool.isExtensionElement()
&& tool.getParent() != null){
ho = tools[i];
break;
}
}
}
}
}
if(ho == null && tmp != null){
if(tmp instanceof ITool){
ITool tool = (ITool)tmp;
if(!tool.isExtensionElement()
&& tool.getParent() != null){
ho = tmp;
}
} else if (tmp instanceof IToolChain){
IToolChain tChain = (IToolChain)tmp;
if(!tChain.isExtensionElement()
&& tChain.getParent() != null){
ho = tmp;
} }
} }
} }