From 4b2a41be6946690c41699092af289575371b1f13 Mon Sep 17 00:00:00 2001 From: Andrew Gvozdev Date: Fri, 1 Oct 2010 21:09:05 +0000 Subject: [PATCH] bug 319512: Missing type arguments on managedbuilder.core --- .../ConfigurationModification.java | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/tcmodification/ConfigurationModification.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/tcmodification/ConfigurationModification.java index 7a888bbe7af..484388f7dec 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/tcmodification/ConfigurationModification.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/tcmodification/ConfigurationModification.java @@ -35,8 +35,8 @@ public class ConfigurationModification extends FolderInfoModification implements private IBuilder fSelectedBuilder; private IBuilder fRealBuilder; private boolean fCompatibilityInfoInited; - private Map fCompatibleBuilders; - private Map fInCompatibleBuilders; + private Map fCompatibleBuilders; + private Map fInCompatibleBuilders; private ConflictMatchSet fConflicts; private IBuilder[] fAllSysBuilders; private BuilderCompatibilityInfoElement fCurrentBuilderCompatibilityInfo; @@ -126,13 +126,13 @@ public class ConfigurationModification extends FolderInfoModification implements if(fCompatibilityInfoInited) return; - fCompatibleBuilders = new HashMap(); - fInCompatibleBuilders = new HashMap(); + fCompatibleBuilders = new HashMap(); + fInCompatibleBuilders = new HashMap(); ConflictMatchSet conflicts = getParentConflictMatchSet(); - Builder sysBs[] = (Builder[])getAllSysBuilders(); - Map> conflictMap = conflicts.fObjToConflictListMap; + IBuilder sysBs[] = getAllSysBuilders(); + Map> conflictMap = conflicts.fObjToConflictListMap; for(int i = 0; i < sysBs.length; i++){ - Builder b = sysBs[i]; + Builder b = (Builder) sysBs[i]; List l = conflictMap.get(b); BuilderCompatibilityInfoElement info = new BuilderCompatibilityInfoElement(b, l); if(info.isCompatible()){ @@ -158,15 +158,15 @@ public class ConfigurationModification extends FolderInfoModification implements public IBuilder[] getCompatibleBuilders() { initCompatibilityInfo(); - List l = new ArrayList(fCompatibleBuilders.size()); + List l = new ArrayList(fCompatibleBuilders.size()); IConfiguration cfg = getResourceInfo().getParent(); - Set keySet = fCompatibleBuilders.keySet(); - for (Builder b : keySet) { + Set keySet = fCompatibleBuilders.keySet(); + for (IBuilder b : keySet) { if(b != fRealBuilder && cfg.isBuilderCompatible(b)) l.add(b); } - return l.toArray(new Builder[l.size()]); + return l.toArray(new IBuilder[l.size()]); } public boolean isBuilderCompatible() {