mirror of
https://github.com/eclipse-cdt/cdt
synced 2025-04-29 19:45:01 +02:00
bug 319512: Missing type arguments on managedbuilder.core
This commit is contained in:
parent
d0e417a050
commit
6be5fbc124
1 changed files with 12 additions and 12 deletions
|
@ -4565,28 +4565,28 @@ public class ManagedBuildManager extends AbstractCExtension {
|
||||||
}
|
}
|
||||||
|
|
||||||
private static Map<IProject, IConfiguration[]> sortConfigs(IConfiguration cfgs[]){
|
private static Map<IProject, IConfiguration[]> sortConfigs(IConfiguration cfgs[]){
|
||||||
Map cfgMap = new HashMap();
|
Map<IProject, Set<IConfiguration>> cfgSetMap = new HashMap<IProject, Set<IConfiguration>>();
|
||||||
|
|
||||||
for (IConfiguration cfg : cfgs) {
|
for (IConfiguration cfg : cfgs) {
|
||||||
IProject proj = cfg.getOwner().getProject();
|
IProject proj = cfg.getOwner().getProject();
|
||||||
Set set = (Set)cfgMap.get(proj);
|
Set<IConfiguration> set = cfgSetMap.get(proj);
|
||||||
if(set == null){
|
if(set == null){
|
||||||
set = new HashSet();
|
set = new HashSet<IConfiguration>();
|
||||||
cfgMap.put(proj, set);
|
cfgSetMap.put(proj, set);
|
||||||
}
|
}
|
||||||
|
|
||||||
set.add(cfg);
|
set.add(cfg);
|
||||||
}
|
}
|
||||||
|
|
||||||
if(cfgMap.size() != 0){
|
Map<IProject, IConfiguration[]> cfgArrayMap = new HashMap<IProject, IConfiguration[]>();
|
||||||
for(Iterator iter = cfgMap.entrySet().iterator(); iter.hasNext();){
|
if(cfgSetMap.size() != 0){
|
||||||
Map.Entry entry = (Map.Entry)iter.next();
|
Set<Entry<IProject, Set<IConfiguration>>> entrySet = cfgSetMap.entrySet();
|
||||||
Set set = (Set)entry.getValue();
|
for (Entry<IProject, Set<IConfiguration>> entry : entrySet) {
|
||||||
entry.setValue(set.toArray(new Configuration[set.size()]));
|
IProject key = entry.getKey();
|
||||||
|
Set<IConfiguration> set = entry.getValue();
|
||||||
|
cfgArrayMap.put(key, set.toArray(new Configuration[set.size()]));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return cfgMap;
|
return cfgArrayMap;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
Loading…
Add table
Reference in a new issue