From 2f7703e142abd31cea55da18dba4d9a8e3749e47 Mon Sep 17 00:00:00 2001 From: Andrew Gvozdev Date: Wed, 16 Sep 2009 15:34:49 +0000 Subject: [PATCH] bug 289608: [Scanner Discovery] Discovery options does not offer profiles defined in supertypes in project properties cleanup only: more loops to enhanced --- .../CfgScannerConfigInfoFactory2.java | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/build/internal/core/scannerconfig2/CfgScannerConfigInfoFactory2.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/build/internal/core/scannerconfig2/CfgScannerConfigInfoFactory2.java index 404404d7d43..2f32ab95d55 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/build/internal/core/scannerconfig2/CfgScannerConfigInfoFactory2.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/build/internal/core/scannerconfig2/CfgScannerConfigInfoFactory2.java @@ -162,26 +162,23 @@ public class CfgScannerConfigInfoFactory2 { Map configMap = getConfigInfoMap(baseMap); IResourceInfo[] rcInfos = cfg.getResourceInfos(); - for(int i = 0; i < rcInfos.length; i++){ + for (IResourceInfo rcInfo : rcInfos) { ITool tools[]; - IResourceInfo rcInfo = rcInfos[i]; if(rcInfo instanceof IFolderInfo) { tools = ((IFolderInfo)rcInfo).getFilteredTools(); } else { tools = ((IFileInfo)rcInfo).getToolsToInvoke(); } - for(int k = 0; k < tools.length; k++){ - Tool tool = (Tool)tools[k]; + for (ITool tool : tools) { IInputType types[] = tool.getInputTypes(); if(types.length != 0){ - for(int t = 0; t < types.length; t++){ - InputType type = (InputType)types[t]; - CfgInfoContext context = new CfgInfoContext(rcInfo, tool, type); + for (IInputType inputType : types) { + CfgInfoContext context = new CfgInfoContext(rcInfo, tool, inputType); context = CfgScannerConfigUtil.adjustPerRcTypeContext(context); if(context != null && context.getResourceInfo() != null){ IScannerConfigBuilderInfo2 info = configMap.get(context); - if(info == null && !type.isExtensionElement() && type.getSuperClass() != null){ - CfgInfoContext superContext = new CfgInfoContext(rcInfo, tool, type.getSuperClass()); + if(info == null && !inputType.isExtensionElement() && inputType.getSuperClass() != null){ + CfgInfoContext superContext = new CfgInfoContext(rcInfo, tool, inputType.getSuperClass()); superContext = CfgScannerConfigUtil.adjustPerRcTypeContext(superContext); if(superContext != null && superContext.getResourceInfo() != null){ info = configMap.get(superContext);