From 519a81800848d23d81a19a6fabe0ad0f48085238 Mon Sep 17 00:00:00 2001 From: Andrew Gvozdev Date: Sat, 2 Oct 2010 01:56:52 +0000 Subject: [PATCH] bug 319512: Missing type arguments on managedbuilder.core --- .../tcmodification/ToolListModification.java | 49 ++++++++++--------- 1 file changed, 26 insertions(+), 23 deletions(-) diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/tcmodification/ToolListModification.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/tcmodification/ToolListModification.java index f995592da29..803a865f90b 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/tcmodification/ToolListModification.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/tcmodification/ToolListModification.java @@ -56,12 +56,12 @@ public abstract class ToolListModification implements IToolListModification { private LinkedHashMap fProjCompInfoMap = new LinkedHashMap(); private HashMap fSysCompInfoMap = new HashMap(); private Tool[] fAllSysTools; - private HashSet fFilteredOutSysTools; + private HashSet fFilteredOutSysTools; // private LinkedHashMap fRealToToolMap = new LinkedHashMap(); // private boolean fSysInfoMapInited; private PerTypeMapStorage fCompleteObjectStorage; protected TreeMap fCompletePathMapStorage; - private HashSet fAddCapableTools; + private HashSet fAddCapableTools; private Map fFilteredOutTools; private ToolListModificationInfo fModificationInfo; @@ -122,8 +122,8 @@ public abstract class ToolListModification implements IToolListModification { public class ProjToolCompatibilityStatusInfo implements IToolModification { private ToolCompatibilityInfoElement fCurrentElement; - private Map fCompatibleTools; - private Map fInCompatibleTools; + private Map fCompatibleTools; + private Map fInCompatibleTools; private IModificationOperation[] fOperations; private Tool fSelectedTool; private Tool fRealTool; @@ -152,7 +152,7 @@ public abstract class ToolListModification implements IToolListModification { return true; } - public Map getCompatibleTools(){ + public Map getCompatibleTools(){ checkInitCompatibleTools(); return fCompatibleTools; } @@ -176,8 +176,8 @@ public abstract class ToolListModification implements IToolListModification { ConflictMatchSet conflicts = ToolChainModificationManager.getInstance().getConflictInfo(IRealBuildObjectAssociation.OBJECT_TOOL, storage); - fCompatibleTools = new HashMap(); - fInCompatibleTools = new HashMap(); + fCompatibleTools = new HashMap(); + fInCompatibleTools = new HashMap(); Tool sysTools[] = getTools(false, true); Map conflictMap = conflicts.fObjToConflictListMap; for(int i = 0; i < sysTools.length; i++){ @@ -226,9 +226,9 @@ public abstract class ToolListModification implements IToolListModification { fOperations = new ModificationOperation[0]; } } else { - List opList = new ArrayList(fCompatibleTools.size() + 1); - for(Iterator iter = fCompatibleTools.keySet().iterator(); iter.hasNext(); ){ - Tool tool = (Tool)iter.next(); + List opList = new ArrayList(fCompatibleTools.size() + 1); + Set keySet = fCompatibleTools.keySet(); + for (Tool tool : keySet) { if(tool == fRealTool) continue; @@ -240,7 +240,7 @@ public abstract class ToolListModification implements IToolListModification { opList.add(new ModificationOperation(this, null)); } - fOperations = (ModificationOperation[])opList.toArray(new ModificationOperation[opList.size()]); + fOperations = opList.toArray(new ModificationOperation[opList.size()]); } } return fOperations.clone(); @@ -321,21 +321,21 @@ public abstract class ToolListModification implements IToolListModification { public IModificationOperation[] getSupportedOperationsArray() { if(fOperations == null){ - Set addCompatibleSysToolsSet = getAddCompatibleSysTools(); + Set addCompatibleSysToolsSet = getAddCompatibleSysTools(); if(addCompatibleSysToolsSet.contains(fRealTool) && canAdd(fRealTool)){ fOperations = new ModificationOperation[]{new ModificationOperation(this, null)}; } else { - Map projMap = getMap(true); - List opList = new ArrayList(projMap.size()); - for(Iterator iter = projMap.values().iterator(); iter.hasNext(); ){ - ProjToolCompatibilityStatusInfo info = (ProjToolCompatibilityStatusInfo)iter.next(); + Map projMap = getMap(true); + List opList = new ArrayList(projMap.size()); + for (IToolModification tm : projMap.values()) { + ProjToolCompatibilityStatusInfo info = (ProjToolCompatibilityStatusInfo)tm; if(info.getCompatibleTools().containsKey(fRealTool) && !fFilteredOutTools.containsKey(info.fRealTool) && canReplace(info.fSelectedTool, this.fSelectedTool)){ opList.add(new ModificationOperation(this, info.fSelectedTool)); } } - fOperations = (ModificationOperation[])opList.toArray(new ModificationOperation[opList.size()]); + fOperations = opList.toArray(new ModificationOperation[opList.size()]); } } return fOperations; @@ -364,9 +364,9 @@ public abstract class ToolListModification implements IToolListModification { } } - private Set getAddCompatibleSysTools(){ + private Set getAddCompatibleSysTools(){ if(fAddCapableTools == null){ - fAddCapableTools = new HashSet(Arrays.asList(getAllSysTools())); + fAddCapableTools = new HashSet(Arrays.asList(getAllSysTools())); PerTypeMapStorage storage = getCompleteObjectStore(); ConflictMatchSet conflicts = ToolChainModificationManager.getInstance().getConflictInfo(IRealBuildObjectAssociation.OBJECT_TOOL, storage); fAddCapableTools.removeAll(conflicts.fObjToConflictListMap.keySet()); @@ -410,8 +410,11 @@ public abstract class ToolListModification implements IToolListModification { if(base.fAllSysTools != null) fAllSysTools = base.fAllSysTools.clone(); - if(base.fFilteredOutSysTools != null) - fFilteredOutSysTools = (HashSet)base.fFilteredOutSysTools.clone(); + if(base.fFilteredOutSysTools != null) { + @SuppressWarnings("unchecked") + HashSet clone = (HashSet)base.fFilteredOutSysTools.clone(); + fFilteredOutSysTools = clone; + } if(base.fCompleteObjectStorage != null){ fCompleteObjectStorage = TcModificationUtil.cloneRealToolToPathSet(base.fCompleteObjectStorage); @@ -490,7 +493,7 @@ public abstract class ToolListModification implements IToolListModification { if(fAllSysTools == null){ ITool[] allSys = ManagedBuildManager.getRealTools(); fAllSysTools = filterTools((Tool[])allSys); - HashSet set = new HashSet(Arrays.asList(allSys)); + HashSet set = new HashSet(Arrays.asList(allSys)); set.removeAll(Arrays.asList(fAllSysTools)); fFilteredOutSysTools = set; } @@ -648,7 +651,7 @@ public abstract class ToolListModification implements IToolListModification { List list = new ArrayList(); list.addAll(map.values()); - clearToolInfo((Tool[])map.values().toArray(new Tool[map.size()])); + clearToolInfo(map.values().toArray(new Tool[map.size()])); PerTypeMapStorage storage = getCompleteObjectStore(); Map toolMap = storage.getMap(IRealBuildObjectAssociation.OBJECT_TOOL, true);