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-01 21:20:16 +00:00
parent 4b2a41be69
commit 656e99e7b4
2 changed files with 6 additions and 6 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/FolderInfoModification.java
View file

@ -23,6 +23,7 @@ import java.util.Set;
import java.util.SortedMap; import java.util.SortedMap;
import java.util.TreeMap; import java.util.TreeMap;
import org.eclipse.cdt.managedbuilder.core.IBuilder;
import org.eclipse.cdt.managedbuilder.core.IConfiguration; import org.eclipse.cdt.managedbuilder.core.IConfiguration;
import org.eclipse.cdt.managedbuilder.core.IFolderInfo; import org.eclipse.cdt.managedbuilder.core.IFolderInfo;
import org.eclipse.cdt.managedbuilder.core.IManagedProject; 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.ITool;
import org.eclipse.cdt.managedbuilder.core.IToolChain; import org.eclipse.cdt.managedbuilder.core.IToolChain;
import org.eclipse.cdt.managedbuilder.core.ManagedBuildManager; 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.FolderInfo;
import org.eclipse.cdt.managedbuilder.internal.core.IRealBuildObjectAssociation; import org.eclipse.cdt.managedbuilder.internal.core.IRealBuildObjectAssociation;
import org.eclipse.cdt.managedbuilder.internal.core.ResourceInfo; import org.eclipse.cdt.managedbuilder.internal.core.ResourceInfo;
@ -175,7 +175,7 @@ public class FolderInfoModification extends ToolListModification implements IFol
ConflictMatchSet parentConflicts = getParentConflictMatchSet(); ConflictMatchSet parentConflicts = getParentConflictMatchSet();
ToolChain sysTCs[] = (ToolChain[])getAllSysToolChains(); ToolChain sysTCs[] = (ToolChain[])getAllSysToolChains();
Map<Builder, List<ConflictMatch>> conflictMap = parentConflicts.fObjToConflictListMap; Map<IBuilder, List<ConflictMatch>> conflictMap = parentConflicts.fObjToConflictListMap;
for (ToolChain tc : sysTCs) { for (ToolChain tc : sysTCs) {
List<ConflictMatch> l = conflictMap.get(tc); List<ConflictMatch> l = conflictMap.get(tc);
ToolChainCompatibilityInfoElement info = new ToolChainCompatibilityInfoElement(tc, l); ToolChainCompatibilityInfoElement info = new ToolChainCompatibilityInfoElement(tc, l);

8
build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/tcmodification/ToolListModification.java
View file

@ -50,7 +50,7 @@ import org.eclipse.core.runtime.Status;
public abstract class ToolListModification implements public abstract class ToolListModification implements
IToolListModification { IToolListModification {
// private Tool []fTools; // private Tool []fTools;
private HashSet fInputExtsSet = new HashSet(); private HashSet<String> fInputExtsSet = new HashSet<String>();
private ResourceInfo fRcInfo; private ResourceInfo fRcInfo;
private LinkedHashMap fProjCompInfoMap = new LinkedHashMap(); private LinkedHashMap fProjCompInfoMap = new LinkedHashMap();
private HashMap fSysCompInfoMap = new HashMap(); private HashMap fSysCompInfoMap = new HashMap();
@ -268,7 +268,7 @@ public abstract class ToolListModification implements
} }
protected Set getInputExtsSet(){ protected Set<String> getInputExtsSet(){
return fInputExtsSet; 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){ switch(type){
case IRealBuildObjectAssociation.OBJECT_TOOL: case IRealBuildObjectAssociation.OBJECT_TOOL:
ToolListModificationInfo info = rcInfo == fRcInfo ? getModificationInfo() : 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(); info.apply();
break; break;
case IRealBuildObjectAssociation.OBJECT_TOOLCHAIN: case IRealBuildObjectAssociation.OBJECT_TOOLCHAIN: