From 9ca06c8a6509f548a6d120e4cb1d525f4c60e4be Mon Sep 17 00:00:00 2001
From: Andrew Gvozdev <angvoz.dev@gmail.com>
Date: Fri, 22 Oct 2010 22:32:02 +0000
Subject: [PATCH] bug 319512: Missing type arguments on managedbuilder.core

---
 .../internal/tcmodification/IObjectSet.java   |  4 ++--
 .../internal/tcmodification/ObjectSet.java    | 24 +++++++++----------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/tcmodification/IObjectSet.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/tcmodification/IObjectSet.java
index be9b45bc1d4..df7f497d8d4 100644
--- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/tcmodification/IObjectSet.java
+++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/tcmodification/IObjectSet.java
@@ -21,11 +21,11 @@ public interface IObjectSet {
 
 	IRealBuildObjectAssociation[] getRealBuildObjects();
 
-	Collection getRealBuildObjects(Collection list);
+	Collection<IRealBuildObjectAssociation> getRealBuildObjects(Collection<IRealBuildObjectAssociation> list);
 	
 	boolean matchesObject(IRealBuildObjectAssociation obj);
 	
-	boolean retainMatches(Collection collection);
+	boolean retainMatches(Collection<IRealBuildObjectAssociation> collection);
 	
 	public int getNumObjects();
 }
diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/tcmodification/ObjectSet.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/tcmodification/ObjectSet.java
index ede032e2615..28d3793849c 100644
--- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/tcmodification/ObjectSet.java
+++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/tcmodification/ObjectSet.java
@@ -12,7 +12,6 @@ package org.eclipse.cdt.managedbuilder.internal.tcmodification;
 
 import java.util.Collection;
 import java.util.HashSet;
-import java.util.Iterator;
 import java.util.Set;
 
 import org.eclipse.cdt.managedbuilder.internal.core.IRealBuildObjectAssociation;
@@ -20,9 +19,9 @@ import org.eclipse.cdt.managedbuilder.internal.tcmodification.extension.MatchObj
 
 public class ObjectSet implements IObjectSet {
 	private int fObjectType;
-	private Set fObjectSet;
+	private Set<IRealBuildObjectAssociation> fObjectSet;
 	
-	public ObjectSet(int objectType, Set objectSet){
+	public ObjectSet(int objectType, Set<IRealBuildObjectAssociation> objectSet){
 		fObjectType = objectType;
 		fObjectSet = objectSet;
 	}
@@ -32,12 +31,12 @@ public class ObjectSet implements IObjectSet {
 	}
 
 	public IRealBuildObjectAssociation[] getRealBuildObjects() {
-		return (IRealBuildObjectAssociation[])fObjectSet.toArray(new IRealBuildObjectAssociation[fObjectSet.size()]);
+		return fObjectSet.toArray(new IRealBuildObjectAssociation[fObjectSet.size()]);
 	}
 
-	public Collection getRealBuildObjects(Collection set) {
+	public Collection<IRealBuildObjectAssociation> getRealBuildObjects(Collection<IRealBuildObjectAssociation> set) {
 		if(set == null)
-			set = new HashSet();
+			set = new HashSet<IRealBuildObjectAssociation>();
 		
 		set.addAll(fObjectSet);
 			
@@ -48,7 +47,7 @@ public class ObjectSet implements IObjectSet {
 		return fObjectSet.contains(obj.getRealBuildObject());
 	}
 
-	public boolean retainMatches(Collection collection) {
+	public boolean retainMatches(Collection<IRealBuildObjectAssociation> collection) {
 		return collection.retainAll(fObjectSet);
 	}
 
@@ -56,20 +55,21 @@ public class ObjectSet implements IObjectSet {
 		return fObjectSet.size();
 	}
 	
+	@SuppressWarnings("nls")
 	@Override
 	public String toString(){
 		StringBuffer buf = new StringBuffer();
 		buf.append(MatchObjectElement.TypeToStringAssociation.getAssociation(fObjectType).getString());
-		buf.append("["); //$NON-NLS-1$
+		buf.append("[");
 		boolean isFirst = true;
-		for(Iterator iter = fObjectSet.iterator(); iter.hasNext(); ){
+		for (IRealBuildObjectAssociation obj : fObjectSet) {
 			if(isFirst){
-				buf.append(", "); //$NON-NLS-1$
+				buf.append(", ");
 				isFirst = false;
 			}
-			buf.append(((IRealBuildObjectAssociation)iter.next()).getId());
+			buf.append(obj.getId());
 		}
-		buf.append("]"); //$NON-NLS-1$
+		buf.append("]");
 		
 		return buf.toString();
 	}