From 656e99e7b4c348331ab2bbfd0ea92e85946bd215 Mon Sep 17 00:00:00 2001
From: Andrew Gvozdev <angvoz.dev@gmail.com>
Date: Fri, 1 Oct 2010 21:20:16 +0000
Subject: [PATCH] bug 319512: Missing type arguments on managedbuilder.core

---
 .../internal/tcmodification/FolderInfoModification.java   | 4 ++--
 .../internal/tcmodification/ToolListModification.java     | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/tcmodification/FolderInfoModification.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/tcmodification/FolderInfoModification.java
index d9d8240be03..b16c05ced91 100644
--- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/tcmodification/FolderInfoModification.java
+++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/tcmodification/FolderInfoModification.java
@@ -23,6 +23,7 @@ import java.util.Set;
 import java.util.SortedMap;
 import java.util.TreeMap;
 
+import org.eclipse.cdt.managedbuilder.core.IBuilder;
 import org.eclipse.cdt.managedbuilder.core.IConfiguration;
 import org.eclipse.cdt.managedbuilder.core.IFolderInfo;
 import org.eclipse.cdt.managedbuilder.core.IManagedProject;
@@ -30,7 +31,6 @@ import org.eclipse.cdt.managedbuilder.core.IResourceInfo;
 import org.eclipse.cdt.managedbuilder.core.ITool;
 import org.eclipse.cdt.managedbuilder.core.IToolChain;
 import org.eclipse.cdt.managedbuilder.core.ManagedBuildManager;
-import org.eclipse.cdt.managedbuilder.internal.core.Builder;
 import org.eclipse.cdt.managedbuilder.internal.core.FolderInfo;
 import org.eclipse.cdt.managedbuilder.internal.core.IRealBuildObjectAssociation;
 import org.eclipse.cdt.managedbuilder.internal.core.ResourceInfo;
@@ -175,7 +175,7 @@ public class FolderInfoModification extends ToolListModification implements IFol
 		ConflictMatchSet parentConflicts = getParentConflictMatchSet();
 		ToolChain sysTCs[] = (ToolChain[])getAllSysToolChains();
 		
-		Map<Builder, List<ConflictMatch>>  conflictMap = parentConflicts.fObjToConflictListMap;
+		Map<IBuilder, List<ConflictMatch>>  conflictMap = parentConflicts.fObjToConflictListMap;
 		for (ToolChain tc : sysTCs) {
 			List<ConflictMatch> l = conflictMap.get(tc);
 			ToolChainCompatibilityInfoElement info = new ToolChainCompatibilityInfoElement(tc, l);
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 46aa3a3b475..e9b4c07696b 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
@@ -50,7 +50,7 @@ import org.eclipse.core.runtime.Status;
 public abstract class ToolListModification implements
 		IToolListModification {
 //	private Tool []fTools;
-	private HashSet fInputExtsSet = new HashSet();
+	private HashSet<String> fInputExtsSet = new HashSet<String>();
 	private ResourceInfo fRcInfo;
 	private LinkedHashMap fProjCompInfoMap = new LinkedHashMap();
 	private HashMap fSysCompInfoMap = new HashMap();
@@ -268,7 +268,7 @@ public abstract class ToolListModification implements
 
 	}
 	
-	protected Set getInputExtsSet(){
+	protected Set<String> getInputExtsSet(){
 		return fInputExtsSet;
 	}
 
@@ -531,11 +531,11 @@ public abstract class ToolListModification implements
 		}
 	}
 	
-	private void apply(ResourceInfo rcInfo, int type, Set set) throws CoreException {
+	private void apply(ResourceInfo rcInfo, int type, Set<IRealBuildObjectAssociation> set) throws CoreException {
 		switch(type){
 		case IRealBuildObjectAssociation.OBJECT_TOOL:
 			ToolListModificationInfo info = rcInfo == fRcInfo ? getModificationInfo() : 
-				ToolChainModificationHelper.getModificationInfo(rcInfo, rcInfo.getTools(), (Tool[])set.toArray(new Tool[set.size()]));
+				ToolChainModificationHelper.getModificationInfo(rcInfo, rcInfo.getTools(), set.toArray(new Tool[set.size()]));
 		info.apply();
 			break;
 		case IRealBuildObjectAssociation.OBJECT_TOOLCHAIN: