mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-06-07 17:56:01 +02:00
Code Issues Wiki Activity

bug 319512: Missing type arguments on managedbuilder.core

Browse source
This commit is contained in:
Andrew Gvozdev 2010-10-22 22:32:02 +00:00
parent 3641fa0fa2
commit 9ca06c8a65
2 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/tcmodification/IObjectSet.java
View file

@ -21,11 +21,11 @@ public interface IObjectSet {
IRealBuildObjectAssociation[] getRealBuildObjects(); IRealBuildObjectAssociation[] getRealBuildObjects();
Collection getRealBuildObjects(Collection list); Collection<IRealBuildObjectAssociation> getRealBuildObjects(Collection<IRealBuildObjectAssociation> list);
boolean matchesObject(IRealBuildObjectAssociation obj); boolean matchesObject(IRealBuildObjectAssociation obj);
boolean retainMatches(Collection collection); boolean retainMatches(Collection<IRealBuildObjectAssociation> collection);
public int getNumObjects(); public int getNumObjects();
} }

24
build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/tcmodification/ObjectSet.java
View file

@ -12,7 +12,6 @@ package org.eclipse.cdt.managedbuilder.internal.tcmodification;
import java.util.Collection; import java.util.Collection;
import java.util.HashSet; import java.util.HashSet;
import java.util.Iterator;
import java.util.Set; import java.util.Set;
import org.eclipse.cdt.managedbuilder.internal.core.IRealBuildObjectAssociation; 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 { public class ObjectSet implements IObjectSet {
private int fObjectType; 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; fObjectType = objectType;
fObjectSet = objectSet; fObjectSet = objectSet;
} }
@ -32,12 +31,12 @@ public class ObjectSet implements IObjectSet {
} }
public IRealBuildObjectAssociation[] getRealBuildObjects() { 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) if(set == null)
set = new HashSet(); set = new HashSet<IRealBuildObjectAssociation>();
set.addAll(fObjectSet); set.addAll(fObjectSet);
@ -48,7 +47,7 @@ public class ObjectSet implements IObjectSet {
return fObjectSet.contains(obj.getRealBuildObject()); return fObjectSet.contains(obj.getRealBuildObject());
} }
public boolean retainMatches(Collection collection) { public boolean retainMatches(Collection<IRealBuildObjectAssociation> collection) {
return collection.retainAll(fObjectSet); return collection.retainAll(fObjectSet);
} }
@ -56,20 +55,21 @@ public class ObjectSet implements IObjectSet {
return fObjectSet.size(); return fObjectSet.size();
} }
@SuppressWarnings("nls")
@Override @Override
public String toString(){ public String toString(){
StringBuffer buf = new StringBuffer(); StringBuffer buf = new StringBuffer();
buf.append(MatchObjectElement.TypeToStringAssociation.getAssociation(fObjectType).getString()); buf.append(MatchObjectElement.TypeToStringAssociation.getAssociation(fObjectType).getString());
buf.append("["); //$NON-NLS-1$ buf.append("[");
boolean isFirst = true; boolean isFirst = true;
for(Iterator iter = fObjectSet.iterator(); iter.hasNext(); ){ for (IRealBuildObjectAssociation obj : fObjectSet) {
if(isFirst){ if(isFirst){
buf.append(", "); //$NON-NLS-1$ buf.append(", ");
isFirst = false; isFirst = false;
} }
buf.append(((IRealBuildObjectAssociation)iter.next()).getId()); buf.append(obj.getId());
} }
buf.append("]"); //$NON-NLS-1$ buf.append("]");
return buf.toString(); return buf.toString();
} }