From a56ce44af66ce9275d458160902ea02a36511075 Mon Sep 17 00:00:00 2001 From: Andrew Gvozdev Date: Fri, 1 Oct 2010 20:18:23 +0000 Subject: [PATCH] bug 319512: Missing type arguments on managedbuilder.core --- .../cdt/newmake/core/MakeScannerInfo.java | 20 +++++++-------- .../cdt/newmake/core/MakeScannerProvider.java | 25 +++++++++---------- 2 files changed, 22 insertions(+), 23 deletions(-) diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/newmake/core/MakeScannerInfo.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/newmake/core/MakeScannerInfo.java index 680a1258ad0..7927715fe37 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/newmake/core/MakeScannerInfo.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/newmake/core/MakeScannerInfo.java @@ -31,8 +31,8 @@ import org.eclipse.core.runtime.CoreException; public class MakeScannerInfo implements IScannerInfo { private IProject project; - private ArrayList symbolList; - private ArrayList pathList; + private ArrayList symbolList; + private ArrayList pathList; boolean hasChanged = false; public MakeScannerInfo(IProject project) { @@ -73,7 +73,7 @@ public class MakeScannerInfo implements IScannerInfo { * @see org.eclipse.cdt.core.build.managed.IScannerInfo#getIncludePaths() */ public synchronized String[] getIncludePaths() { - return (String[]) getPathList().toArray(new String[getPathList().size()]); + return getPathList().toArray(new String[getPathList().size()]); } /* @@ -81,9 +81,9 @@ public class MakeScannerInfo implements IScannerInfo { * * @see org.eclipse.cdt.core.build.managed.IScannerInfo#getIncludePaths() */ - public synchronized Map getDefinedSymbols() { + public synchronized Map getDefinedSymbols() { // Return the defined symbols for the default configuration - HashMap symbols = new HashMap(); + HashMap symbols = new HashMap(); String[] symbolList = getPreprocessorSymbols(); for (int i = 0; i < symbolList.length; ++i) { String symbol = symbolList[i]; @@ -104,20 +104,20 @@ public class MakeScannerInfo implements IScannerInfo { return symbols; } - protected List getPathList() { + protected List getPathList() { if (pathList == null) { - pathList = new ArrayList(); + pathList = new ArrayList(); } return pathList; } public synchronized String[] getPreprocessorSymbols() { - return (String[]) getSymbolList().toArray(new String[getSymbolList().size()]); + return getSymbolList().toArray(new String[getSymbolList().size()]); } - protected List getSymbolList() { + protected List getSymbolList() { if (symbolList == null) { - symbolList = new ArrayList(); + symbolList = new ArrayList(); } return symbolList; } diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/newmake/core/MakeScannerProvider.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/newmake/core/MakeScannerProvider.java index 1d7694ae355..537a507fa94 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/newmake/core/MakeScannerProvider.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/newmake/core/MakeScannerProvider.java @@ -119,8 +119,8 @@ public class MakeScannerProvider extends ScannerProvider { private MakeScannerInfo loadScannerInfo(IProject project) throws CoreException { ICDescriptor descriptor = CCorePlugin.getDefault().getCProjectDescription(project); ICStorageElement root = descriptor.getProjectStorageElement(CDESCRIPTOR_ID); - ArrayList includes = new ArrayList(); - ArrayList symbols = new ArrayList(); + ArrayList includes = new ArrayList(); + ArrayList symbols = new ArrayList(); for (ICStorageElement child : root.getChildren()) { if (child.getName().equals(INCLUDE_PATH)) { // Add the path to the property list @@ -131,21 +131,21 @@ public class MakeScannerProvider extends ScannerProvider { } } MakeScannerInfo info = new MakeScannerInfo(project); - info.setIncludePaths((String[])includes.toArray(new String[includes.size()])); - info.setPreprocessorSymbols((String[])symbols.toArray(new String[symbols.size()])); + info.setIncludePaths(includes.toArray(new String[includes.size()])); + info.setPreprocessorSymbols(symbols.toArray(new String[symbols.size()])); return info; } static void migrateToCPathEntries(MakeScannerInfo info) throws CoreException { - Map symbols = info.getDefinedSymbols(); + Map symbols = info.getDefinedSymbols(); String[] includes = info.getIncludePaths(); ICProject cProject = CoreModel.getDefault().create(info.getProject()); IPathEntry[] entries = cProject.getRawPathEntries(); - List cPaths = new ArrayList(Arrays.asList(entries)); + List cPaths = new ArrayList(Arrays.asList(entries)); - Iterator cpIter = cPaths.iterator(); + Iterator cpIter = cPaths.iterator(); while(cpIter.hasNext()) { - int kind = ((IPathEntry)cpIter.next()).getEntryKind(); + int kind = cpIter.next().getEntryKind(); if(kind == IPathEntry.CDT_INCLUDE || kind == IPathEntry.CDT_MACRO) { cpIter.remove(); } @@ -156,16 +156,15 @@ public class MakeScannerProvider extends ScannerProvider { cPaths.add(include); } } - Iterator syms = symbols.entrySet().iterator(); + Iterator> syms = symbols.entrySet().iterator(); while (syms.hasNext()) { - Map.Entry entry = (Entry)syms.next(); - IMacroEntry sym = CoreModel.newMacroEntry(info.getProject().getFullPath(), (String)entry.getKey(), - (String)entry.getValue()); + Entry entry = syms.next(); + IMacroEntry sym = CoreModel.newMacroEntry(info.getProject().getFullPath(), entry.getKey(), entry.getValue()); if (!cPaths.contains(sym)) { cPaths.add(sym); } } - cProject.setRawPathEntries((IPathEntry[])cPaths.toArray(new IPathEntry[cPaths.size()]), null); + cProject.setRawPathEntries(cPaths.toArray(new IPathEntry[cPaths.size()]), null); } /**