mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-29 19:45:01 +02:00
Code Issues Wiki Activity

Tool-chain modification functionality fix

Browse source
This commit is contained in:
Mikhail Sennikovsky 2007-05-11 16:41:52 +00:00
parent 20a94ee53c
commit f652b4d839
1 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/FolderInfo.java
View file

@ -556,10 +556,12 @@ public class FolderInfo extends ResourceInfo implements IFolderInfo {
} }
} }
private Map typeIdsToMap(String [] ids){ private Map typeIdsToMap(String [] ids, IBuildObjectProperties props){
Map map = new HashMap(ids.length); Map map = new HashMap(ids.length);
for(int i = 0; i < ids.length; i++){ for(int i = 0; i < ids.length; i++){
map.put(ids[i], null); String id = ids[i];
IBuildProperty prop = props.getProperty(id);
map.put(id, props != null ? prop.getValue().getId() : null);
} }
return map; return map;
@ -589,7 +591,13 @@ public class FolderInfo extends ResourceInfo implements IFolderInfo {
IBuildPropertyType[] supportedTypes = props.getSupportedTypes(); IBuildPropertyType[] supportedTypes = props.getSupportedTypes();
if(supportedTypes.length != 0 || requiredIds.length != 0){ if(supportedTypes.length != 0 || requiredIds.length != 0){
Map requiredMap = typeIdsToMap(requiredIds); if(requiredIds.length == 0){
if(props.getProperty(ManagedBuildManager.BUILD_ARTEFACT_TYPE_PROPERTY_ID) != null){
requiredIds = new String[]{ManagedBuildManager.BUILD_ARTEFACT_TYPE_PROPERTY_ID};
}
}
Map requiredMap = typeIdsToMap(requiredIds, props);
getUnsupportedProperties(requiredMap, r, unspecifiedRequiredProps, undefinedSet); getUnsupportedProperties(requiredMap, r, unspecifiedRequiredProps, undefinedSet);
unspecifiedProps.putAll(unspecifiedRequiredProps); unspecifiedProps.putAll(unspecifiedRequiredProps);