From d0dd8c648e4d01f86a39508176cacf7031a932bd Mon Sep 17 00:00:00 2001 From: Andrew Gvozdev Date: Wed, 16 Sep 2009 15:23:43 +0000 Subject: [PATCH] bug 289608: [Scanner Discovery] Discovery options does not offer profiles defined in supertypes in project properties cleanup only: java generics + loops to enhanced --- .../CfgScannerConfigInfoFactory2.java | 42 +++++++++---------- 1 file changed, 20 insertions(+), 22 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 27f064a305a..404404d7d43 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 @@ -11,8 +11,8 @@ package org.eclipse.cdt.build.internal.core.scannerconfig2; import java.util.HashMap; -import java.util.Iterator; import java.util.Map; +import java.util.Map.Entry; import org.eclipse.cdt.build.core.scannerconfig.CfgInfoContext; import org.eclipse.cdt.build.core.scannerconfig.ICfgScannerConfigBuilderInfo2Set; @@ -62,17 +62,17 @@ public class CfgScannerConfigInfoFactory2 { // private HashMap map; CfgInfo(Configuration cfg){ - this.cfg = (Configuration)cfg; + this.cfg = cfg; // init(); } public CfgInfoContext[] getContexts() { - Map map = createMap(); - return (CfgInfoContext[])map.keySet().toArray(new CfgInfoContext[map.size()]); + Map map = createMap(); + return map.keySet().toArray(new CfgInfoContext[map.size()]); } public IScannerConfigBuilderInfo2 getInfo(CfgInfoContext context) { - return (IScannerConfigBuilderInfo2)createMap().get(context); + return createMap().get(context); // IScannerConfigBuilderInfo2 info = null; // if(!isPerRcTypeDiscovery()){ // info = cfg.getScannerConfigInfo(); @@ -122,13 +122,13 @@ public class CfgScannerConfigInfoFactory2 { return fContainer; } - private Map createMap(){ - HashMap map = new HashMap(); + private Map createMap(){ + HashMap map = new HashMap(); try{ IScannerConfigBuilderInfo2Set container = getContainer(); boolean isPerRcType = cfg.isPerRcTypeDiscovery(); - Map baseMap = container.getInfoMap(); + Map baseMap = container.getInfoMap(); if(!isPerRcType){ CfgInfoContext c = new CfgInfoContext(cfg); InfoContext baseContext = c.toInfoContext(); @@ -159,7 +159,7 @@ public class CfgScannerConfigInfoFactory2 { } map.put(new CfgInfoContext(cfg), info); } else { - Map configMap = getConfigInfoMap(baseMap); + Map configMap = getConfigInfoMap(baseMap); IResourceInfo[] rcInfos = cfg.getResourceInfos(); for(int i = 0; i < rcInfos.length; i++){ @@ -179,12 +179,12 @@ public class CfgScannerConfigInfoFactory2 { CfgInfoContext context = new CfgInfoContext(rcInfo, tool, type); context = CfgScannerConfigUtil.adjustPerRcTypeContext(context); if(context != null && context.getResourceInfo() != null){ - IScannerConfigBuilderInfo2 info = (IScannerConfigBuilderInfo2)configMap.get(context); + IScannerConfigBuilderInfo2 info = configMap.get(context); if(info == null && !type.isExtensionElement() && type.getSuperClass() != null){ CfgInfoContext superContext = new CfgInfoContext(rcInfo, tool, type.getSuperClass()); superContext = CfgScannerConfigUtil.adjustPerRcTypeContext(superContext); if(superContext != null && superContext.getResourceInfo() != null){ - info = (IScannerConfigBuilderInfo2)configMap.get(superContext); + info = configMap.get(superContext); } String id = CfgScannerConfigUtil.getDefaultProfileId(context, true); InfoContext baseContext = context.toInfoContext(); @@ -213,7 +213,7 @@ public class CfgScannerConfigInfoFactory2 { CfgInfoContext context = new CfgInfoContext(rcInfo, tool, null); context = CfgScannerConfigUtil.adjustPerRcTypeContext(context); if(context != null && context.getResourceInfo() != null){ - IScannerConfigBuilderInfo2 info = (IScannerConfigBuilderInfo2)configMap.get(context); + IScannerConfigBuilderInfo2 info = configMap.get(context); if(info == null){ String id = CfgScannerConfigUtil.getDefaultProfileId(context, true); InfoContext baseContext = context.toInfoContext(); @@ -232,11 +232,10 @@ public class CfgScannerConfigInfoFactory2 { } if(!configMap.isEmpty()){ - for(Iterator iter = configMap.entrySet().iterator(); iter.hasNext();){ - Map.Entry entry = (Map.Entry)iter.next(); + for (Entry entry : configMap.entrySet()) { if(map.containsKey(entry.getKey())) continue; - CfgInfoContext c = (CfgInfoContext)entry.getKey(); + CfgInfoContext c = entry.getKey(); if(c.getResourceInfo() != null || c.getTool() != null || c.getInputType() != null){ InfoContext baseC = c.toInfoContext(); if(!baseC.isDefaultContext()) @@ -252,15 +251,14 @@ public class CfgScannerConfigInfoFactory2 { return map; } - private Map getConfigInfoMap(Map baseMap){ - Map map = new HashMap(); + private Map getConfigInfoMap(Map baseMap){ + Map map = new HashMap(); - for(Iterator iter = baseMap.entrySet().iterator(); iter.hasNext();){ - Map.Entry entry = (Map.Entry)iter.next(); - InfoContext baseContext = (InfoContext)entry.getKey(); + for (Entry entry : baseMap.entrySet()) { + InfoContext baseContext = entry.getKey(); CfgInfoContext c = CfgInfoContext.fromInfoContext(cfg, baseContext); if(c != null){ - IScannerConfigBuilderInfo2 info = (IScannerConfigBuilderInfo2)entry.getValue(); + IScannerConfigBuilderInfo2 info = entry.getValue(); map.put(c, info); } } @@ -268,7 +266,7 @@ public class CfgScannerConfigInfoFactory2 { return map; } - public Map getInfoMap() { + public Map getInfoMap() { return createMap(); }