mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-29 19:45:01 +02:00
Code Issues Wiki Activity

bug 319512: Missing type arguments on managedbuilder.core

Browse source
This commit is contained in:
Andrew Gvozdev 2011-03-09 23:12:12 +00:00
parent 928076556c
commit 648eb73972
1 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/build/internal/core/scannerconfig/PerFileSettingsCalculator.java
View file

@ -110,11 +110,16 @@ public class PerFileSettingsCalculator {
private int fMaxIndex; private int fMaxIndex;
private List<PathFilePathInfo>[] fStore; private List<PathFilePathInfo>[] fStore;
@SuppressWarnings("unchecked")
private List<PathFilePathInfo>[] emptyStore(int size) {
return new List[size];
}
public ListIndexStore(int size){ public ListIndexStore(int size){
if(size < 0) if(size < 0)
size = 0; size = 0;
fStore = new List[size]; fStore = emptyStore(size);
} }
public void add(int index, PathFilePathInfo value){ public void add(int index, PathFilePathInfo value){
@ -133,7 +138,7 @@ public class PerFileSettingsCalculator {
private boolean checkResize(int index){ private boolean checkResize(int index){
if(index >= fStore.length){ if(index >= fStore.length){
int newSize = ++index; int newSize = ++index;
List<PathFilePathInfo> resized[] = new List[newSize]; List<PathFilePathInfo> resized[] = emptyStore(newSize);
if(fStore != null && fStore.length != 0){ if(fStore != null && fStore.length != 0){
System.arraycopy(fStore, 0, resized, 0, fStore.length); System.arraycopy(fStore, 0, resized, 0, fStore.length);
} }
@ -153,7 +158,7 @@ public class PerFileSettingsCalculator {
list.add(l); list.add(l);
} }
return list.toArray(new List[list.size()]); return list.toArray(emptyStore(list.size()));
} }
} }
@ -205,7 +210,7 @@ public class PerFileSettingsCalculator {
fPathFilePathInfoMap = new HashMap<PathInfo, List<PathFilePathInfo>>(3); fPathFilePathInfoMap = new HashMap<PathInfo, List<PathFilePathInfo>>(3);
PathInfo fileInfo = pInfo.fInfo; PathInfo fileInfo = pInfo.fInfo;
List list = fileInfo == fMaxMatchInfo ? fMaxMatchInfoList : (List)fPathFilePathInfoMap.get(fileInfo); List<PathFilePathInfo> list = fileInfo == fMaxMatchInfo ? fMaxMatchInfoList : fPathFilePathInfoMap.get(fileInfo);
if(list == null){ if(list == null){
List<PathFilePathInfo> emptyList = new ArrayList<PathFilePathInfo>(); List<PathFilePathInfo> emptyList = new ArrayList<PathFilePathInfo>();
fPathFilePathInfoMap.put(fileInfo, emptyList); fPathFilePathInfoMap.put(fileInfo, emptyList);