Skip to content

Commit caf2292

Browse files
jonahgrahamjonahgraham
committed
Bug 540373: Cleanup: Remove redundant type arguments
This was done by selecting all projects in Eclipse then Source -> Clean Up... -> choosing: - Remove redundant type arguments and completing the wizard Change-Id: Iaecc7010f097b4b1fabd29ccaa34ccb23a716fbf
1 parent 8844a8f commit caf2292

File tree

1,432 files changed

+4538
-4538
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,432 files changed

+4538
-4538
lines changed

‎build/org.eclipse.cdt.make.core.tests/src/org/eclipse/cdt/make/scannerdiscovery/TestScannerInfoCollector.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@
2828

2929
@SuppressWarnings({ "rawtypes", "unchecked" })
3030
final class TestScannerInfoCollector implements IScannerInfoCollector {
31-
private HashMap<ScannerInfoTypes, List> fInfoMap = new HashMap<ScannerInfoTypes, List>();
32-
private HashMap<Object, Map<ScannerInfoTypes, List>> fResourceToInfoMap = new HashMap<Object, Map<ScannerInfoTypes, List>>();
31+
private HashMap<ScannerInfoTypes, List> fInfoMap = new HashMap<>();
32+
private HashMap<Object, Map<ScannerInfoTypes, List>> fResourceToInfoMap = new HashMap<>();
3333

3434
@Override
3535
public void contributeToScannerConfig(Object resource, Map scannerInfo0) {
@@ -57,7 +57,7 @@ public void contributeToScannerConfig(Object resource, Map scannerInfo0) {
5757
private void addTo(ScannerInfoTypes type, List<String> col) {
5858
List<String> target = fInfoMap.get(type);
5959
if (target == null) {
60-
target = new ArrayList<String>();
60+
target = new ArrayList<>();
6161
fInfoMap.put(type, target);
6262
}
6363
target.addAll(col);

‎build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/core/MakeBuilder.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ protected boolean invokeMake(int kind, IMakeBuilderInfo info, IProgressMonitor m
199199
String[] errorParsers = info.getErrorParsers();
200200
ErrorParserManager epm = new ErrorParserManager(getProject(), workingDirectoryURI, this, errorParsers);
201201

202-
List<IConsoleParser> parsers = new ArrayList<IConsoleParser>();
202+
List<IConsoleParser> parsers = new ArrayList<>();
203203
if (!isOnlyClean) {
204204
ICProjectDescription prjDescription = CoreModel.getDefault().getProjectDescription(project);
205205
if (prjDescription != null) {
@@ -249,7 +249,7 @@ protected boolean invokeMake(int kind, IMakeBuilderInfo info, IProgressMonitor m
249249

250250
private HashMap<String, String> getEnvironment(ICommandLauncher launcher, IMakeBuilderInfo info)
251251
throws CoreException {
252-
HashMap<String, String> envMap = new HashMap<String, String>();
252+
HashMap<String, String> envMap = new HashMap<>();
253253
if (info.appendEnvironment()) {
254254
@SuppressWarnings({ "unchecked", "rawtypes" })
255255
Map<String, String> env = (Map) launcher.getEnvironment();

‎build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/core/MakeCorePlugin.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ public boolean isMakefileGNUStyle() {
183183
public String[] getMakefileDirs() {
184184
String stringList = getPluginPreferences().getString(MAKEFILE_DIRS);
185185
StringTokenizer st = new StringTokenizer(stringList, File.pathSeparator + "\n\r");//$NON-NLS-1$
186-
ArrayList<String> v = new ArrayList<String>();
186+
ArrayList<String> v = new ArrayList<>();
187187
while (st.hasMoreElements()) {
188188
v.add(st.nextToken());
189189
}
@@ -198,7 +198,7 @@ static public IMakefile createMakefile(File file, boolean isGnuStyle, String[] m
198198
IMakefile makefile;
199199
if (isGnuStyle) {
200200
GNUMakefile gnu = new GNUMakefile();
201-
ArrayList<String> includeList = new ArrayList<String>();
201+
ArrayList<String> includeList = new ArrayList<>();
202202
includeList.add(new Path(file.getAbsolutePath()).removeLastSegments(1).toOSString());
203203
includeList.addAll(Arrays.asList(gnu.getIncludeDirectories()));
204204
includeList.addAll(Arrays.asList(makefileDirs));
@@ -246,7 +246,7 @@ public static IMakefile createMakefile(URI fileURI, boolean isGnuStyle, String[]
246246
IMakefile makefile;
247247
if (isGnuStyle) {
248248
GNUMakefile gnu = new GNUMakefile();
249-
ArrayList<String> includeList = new ArrayList<String>();
249+
ArrayList<String> includeList = new ArrayList<>();
250250
includeList.add(new Path(fileURI.getPath()).removeLastSegments(1).toString());
251251
includeList.addAll(Arrays.asList(gnu.getIncludeDirectories()));
252252
includeList.addAll(Arrays.asList(makefileDirs));
@@ -372,7 +372,7 @@ public String[] getScannerInfoConsoleParserIds(String commandId) {
372372
SI_CONSOLE_PARSER_SIMPLE_ID);
373373
if (extension != null) {
374374
IExtension[] extensions = extension.getExtensions();
375-
List<String> parserIds = new ArrayList<String>(extensions.length);
375+
List<String> parserIds = new ArrayList<>(extensions.length);
376376
for (int i = 0; i < extensions.length; i++) {
377377
String parserId = extensions[i].getUniqueIdentifier();
378378
if (parserId != null) {

‎build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/core/MakeScannerInfo.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ public synchronized String[] getIncludePaths() {
8989
@Override
9090
public synchronized Map<String, String> getDefinedSymbols() {
9191
// Return the defined symbols for the default configuration
92-
HashMap<String, String> symbols = new HashMap<String, String>();
92+
HashMap<String, String> symbols = new HashMap<>();
9393
String[] symbolList = getPreprocessorSymbols();
9494
for (int i = 0; i < symbolList.length; ++i) {
9595
String symbol = symbolList[i];
@@ -112,7 +112,7 @@ public synchronized Map<String, String> getDefinedSymbols() {
112112

113113
protected List<String> getPathList() {
114114
if (pathList == null) {
115-
pathList = new ArrayList<String>();
115+
pathList = new ArrayList<>();
116116
}
117117
return pathList;
118118
}
@@ -123,7 +123,7 @@ public synchronized String[] getPreprocessorSymbols() {
123123

124124
protected List<String> getSymbolList() {
125125
if (symbolList == null) {
126-
symbolList = new ArrayList<String>();
126+
symbolList = new ArrayList<>();
127127
}
128128
return symbolList;
129129
}

‎build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/core/MakeScannerProvider.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -123,8 +123,8 @@ private MakeScannerInfo loadScannerInfo(IProject project) throws CoreException {
123123
ICDescriptor descriptor = CCorePlugin.getDefault().getCProjectDescription(project);
124124
ICStorageElement storage = descriptor.getProjectStorageElement(CDESCRIPTOR_ID);
125125

126-
ArrayList<String> includes = new ArrayList<String>();
127-
ArrayList<String> symbols = new ArrayList<String>();
126+
ArrayList<String> includes = new ArrayList<>();
127+
ArrayList<String> symbols = new ArrayList<>();
128128
for (ICStorageElement child : storage.getChildren()) {
129129
if (child.getName().equals(INCLUDE_PATH)) {
130130
// Add the path to the property list
@@ -145,7 +145,7 @@ static void migrateToCPathEntries(MakeScannerInfo info) throws CoreException {
145145
String[] includes = info.getIncludePaths();
146146
ICProject cProject = CoreModel.getDefault().create(info.getProject());
147147
IPathEntry[] entries = cProject.getRawPathEntries();
148-
List<IPathEntry> cPaths = new ArrayList<IPathEntry>(Arrays.asList(entries));
148+
List<IPathEntry> cPaths = new ArrayList<>(Arrays.asList(entries));
149149

150150
Iterator<IPathEntry> cpIter = cPaths.iterator();
151151
while (cpIter.hasNext()) {

‎build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/core/scannerconfig/DiscoveredScannerInfo.java

+10-10
Original file line numberDiff line numberDiff line change
@@ -87,13 +87,13 @@ public synchronized void setUserScannerInfo(org.eclipse.cdt.make.core.MakeScanne
8787

8888
public LinkedHashMap<String, Boolean> getDiscoveredIncludePaths() {
8989
if (discoveredPaths == null) {
90-
return new LinkedHashMap<String, Boolean>();
90+
return new LinkedHashMap<>();
9191
}
92-
return new LinkedHashMap<String, Boolean>(discoveredPaths);
92+
return new LinkedHashMap<>(discoveredPaths);
9393
}
9494

9595
public synchronized void setDiscoveredIncludePaths(LinkedHashMap<String, Boolean> paths) {
96-
discoveredPaths = new LinkedHashMap<String, Boolean>(paths);
96+
discoveredPaths = new LinkedHashMap<>(paths);
9797
createPathLists();
9898
}
9999

@@ -119,13 +119,13 @@ private void createPathLists() {
119119

120120
public LinkedHashMap<String, SymbolEntry> getDiscoveredSymbolDefinitions() {
121121
if (discoveredSymbols == null) {
122-
return new LinkedHashMap<String, SymbolEntry>();
122+
return new LinkedHashMap<>();
123123
}
124-
return new LinkedHashMap<String, SymbolEntry>(discoveredSymbols);
124+
return new LinkedHashMap<>(discoveredSymbols);
125125
}
126126

127127
public synchronized void setDiscoveredSymbolDefinitions(LinkedHashMap<String, SymbolEntry> symbols) {
128-
discoveredSymbols = new LinkedHashMap<String, SymbolEntry>(symbols);
128+
discoveredSymbols = new LinkedHashMap<>(symbols);
129129
createSymbolsLists();
130130
}
131131

@@ -184,28 +184,28 @@ public String[] getPreprocessorSymbols() {
184184

185185
private List<String> getActivePathList() {
186186
if (activePaths == null) {
187-
activePaths = new ArrayList<String>();
187+
activePaths = new ArrayList<>();
188188
}
189189
return activePaths;
190190
}
191191

192192
private List<String> getRemovedPathList() {
193193
if (removedPaths == null) {
194-
removedPaths = new ArrayList<String>();
194+
removedPaths = new ArrayList<>();
195195
}
196196
return removedPaths;
197197
}
198198

199199
private List<String> getActiveSymbolsList() {
200200
if (activeSymbols == null) {
201-
activeSymbols = new ArrayList<String>();
201+
activeSymbols = new ArrayList<>();
202202
}
203203
return activeSymbols;
204204
}
205205

206206
private List<String> getRemovedSymbolsList() {
207207
if (removedSymbols == null) {
208-
removedSymbols = new ArrayList<String>();
208+
removedSymbols = new ArrayList<>();
209209
}
210210
return removedSymbols;
211211
}

‎build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/core/scannerconfig/DiscoveredScannerInfoProvider.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ public DiscoveredScannerInfo getDiscoveredScannerInfo(IProject project, boolean
117117
ICProject cProject = CoreModel.getDefault().create(project);
118118
if (cProject != null) {
119119
IPathEntry[] entries = cProject.getRawPathEntries();
120-
List<IPathEntry> newEntries = new ArrayList<IPathEntry>(Arrays.asList(entries));
120+
List<IPathEntry> newEntries = new ArrayList<>(Arrays.asList(entries));
121121
if (!newEntries.contains(container)) {
122122
newEntries.add(container);
123123
cProject.setRawPathEntries(newEntries.toArray(new IPathEntry[newEntries.size()]), null);

‎build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/core/scannerconfig/PathInfo.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public PathInfo(IPath[] includePaths, IPath[] quoteIncludePaths, Map<String, Str
4646
? (IPath[]) quoteIncludePaths.clone()
4747
: EMPTY_PATH_ARRAY;
4848
fSymbols = symbols != null && symbols.size() != 0 ? getInternedHashMap(symbols)
49-
: new HashMap<String, String>(0);
49+
: new HashMap<>(0);
5050
fIncludeFiles = includeFiles != null && includeFiles.length != 0 ? (IPath[]) includeFiles.clone()
5151
: EMPTY_PATH_ARRAY;
5252
fMacroFiles = macroFiles != null && macroFiles.length != 0 ? (IPath[]) macroFiles.clone() : EMPTY_PATH_ARRAY;
@@ -63,9 +63,9 @@ protected HashMap<String, String> getInternedHashMap(Map<String, String> oldMap)
6363
return null;
6464

6565
if (oldMap.isEmpty())
66-
return new HashMap<String, String>(oldMap);
66+
return new HashMap<>(oldMap);
6767

68-
HashMap<String, String> newMap = new HashMap<String, String>(oldMap.size());
68+
HashMap<String, String> newMap = new HashMap<>(oldMap.size());
6969
for (String key : oldMap.keySet()) {
7070
newMap.put(SafeStringInterner.safeIntern(key), SafeStringInterner.safeIntern(oldMap.get(key)));
7171
}

‎build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/BuildInfoFactory.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ public void setBuildAttribute(String name, String value) throws CoreException {
114114
@Override
115115
public Map<String, String> getExpandedEnvironment() {
116116
Map<String, String> env = getEnvironment();
117-
HashMap<String, String> envMap = new HashMap<String, String>(env.entrySet().size());
117+
HashMap<String, String> envMap = new HashMap<>(env.entrySet().size());
118118
boolean win32 = Platform.getOS().equals(Constants.OS_WIN32);
119119
for (Map.Entry<String, String> entry : env.entrySet()) {
120120
String key = entry.getKey();

‎build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/MakeProject.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ private void updateIndexers(ICDescriptor cDescriptor) throws CoreException {
7373
private String[] parseStringToArray(String syms) {
7474
if (syms != null && syms.length() > 0) {
7575
StringTokenizer tok = new StringTokenizer(syms, ";"); //$NON-NLS-1$
76-
ArrayList<String> list = new ArrayList<String>(tok.countTokens());
76+
ArrayList<String> list = new ArrayList<>(tok.countTokens());
7777
while (tok.hasMoreElements()) {
7878
list.add(tok.nextToken());
7979
}

‎build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/MakeTargetManager.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,9 @@ public class MakeTargetManager implements IMakeTargetManager, IResourceChangeLis
5151
private static String TARGETS_EXT = "targets"; //$NON-NLS-1$
5252

5353
private final ListenerList listeners = new ListenerList();
54-
private final Map<IProject, ProjectTargets> projectMap = new HashMap<IProject, ProjectTargets>();
54+
private final Map<IProject, ProjectTargets> projectMap = new HashMap<>();
5555
private HashMap<String, String> builderMap;
56-
protected Vector<IProject> fProjects = new Vector<IProject>();
56+
protected Vector<IProject> fProjects = new Vector<>();
5757

5858
public MakeTargetManager() {
5959
}
@@ -181,7 +181,7 @@ public IProject[] getTargetBuilderProjects() {
181181
public String[] getTargetBuilders(IProject project) {
182182
if (fProjects.contains(project) || hasTargetBuilder(project)) {
183183
try {
184-
Vector<String> ids = new Vector<String>();
184+
Vector<String> ids = new Vector<>();
185185
IProjectDescription description = project.getDescription();
186186
ICommand commands[] = description.getBuildSpec();
187187
for (ICommand command : commands) {
@@ -334,7 +334,7 @@ protected void deleteTargets(IProject project) {
334334
}
335335

336336
protected void initializeBuilders() {
337-
builderMap = new HashMap<String, String>();
337+
builderMap = new HashMap<>();
338338
IExtensionPoint point = Platform.getExtensionRegistry().getExtensionPoint(MakeCorePlugin.PLUGIN_ID,
339339
MakeTargetManager.TARGET_BUILD_EXT);
340340
IExtension[] extensions = point.getExtensions();

‎build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/ProjectTargets.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ public class ProjectTargets {
5959
private static final String BAD_TARGET = "buidlTarget"; //$NON-NLS-1$
6060
private static final String TARGET = "buildTarget"; //$NON-NLS-1$
6161

62-
private HashMap<IContainer, List<IMakeTarget>> targetMap = new HashMap<IContainer, List<IMakeTarget>>();
62+
private HashMap<IContainer, List<IMakeTarget>> targetMap = new HashMap<>();
6363

6464
private IProject project;
6565

@@ -111,7 +111,7 @@ public IMakeTarget[] get(IContainer container) {
111111
}
112112

113113
public void set(IContainer container, IMakeTarget[] targets) throws CoreException {
114-
List<IMakeTarget> newList = new ArrayList<IMakeTarget>();
114+
List<IMakeTarget> newList = new ArrayList<>();
115115
for (IMakeTarget target : targets) {
116116
target.setContainer(container);
117117
if (newList.contains(target)) {
@@ -142,7 +142,7 @@ public void add(IMakeTarget target) throws CoreException {
142142
MakeMessages.getString("MakeTargetManager.target_exists"), null)); //$NON-NLS-1$
143143
}
144144
if (list == null) {
145-
list = new ArrayList<IMakeTarget>();
145+
list = new ArrayList<>();
146146
targetMap.put(target.getContainer(), list);
147147
}
148148
list.add(target);

0 commit comments

Comments
 (0)