--- a/langtools/src/share/classes/com/sun/tools/javac/file/JavacFileManager.java Wed Dec 18 19:22:58 2013 +0000
+++ b/langtools/src/share/classes/com/sun/tools/javac/file/JavacFileManager.java Wed Dec 18 16:05:18 2013 -0500
@@ -102,8 +102,9 @@
public int compare(File f1, File f2) {
return -f1.getName().compareTo(f2.getName());
}
- };
- };
+ }
+ }
+
protected SortFiles sortFiles;
/**
@@ -179,7 +180,7 @@
}
public Iterable<? extends JavaFileObject> getJavaFileObjectsFromStrings(Iterable<String> names) {
- ListBuffer<File> files = new ListBuffer<File>();
+ ListBuffer<File> files = new ListBuffer<>();
for (String name : names)
files.append(new File(nullCheck(name)));
return getJavaFileObjectsFromFiles(files.toList());
@@ -445,7 +446,7 @@
/** A directory of zip files already opened.
*/
- Map<File, Archive> archives = new HashMap<File,Archive>();
+ Map<File, Archive> archives = new HashMap<>();
private static final String[] symbolFileLocation = { "lib", "ct.sym" };
private static final RelativeDirectory symbolFilePrefix
@@ -592,7 +593,7 @@
Iterable<? extends File> path = getLocation(location);
if (path == null)
return null;
- ListBuffer<URL> lb = new ListBuffer<URL>();
+ ListBuffer<URL> lb = new ListBuffer<>();
for (File f: path) {
try {
lb.append(f.toURI().toURL());
@@ -618,7 +619,7 @@
if (path == null)
return List.nil();
RelativeDirectory subdirectory = RelativeDirectory.forPackage(packageName);
- ListBuffer<JavaFileObject> results = new ListBuffer<JavaFileObject>();
+ ListBuffer<JavaFileObject> results = new ListBuffer<>();
for (File directory : path)
listContainer(directory, subdirectory, kinds, recurse, results);
@@ -778,9 +779,9 @@
{
ArrayList<RegularFileObject> result;
if (files instanceof Collection<?>)
- result = new ArrayList<RegularFileObject>(((Collection<?>)files).size());
+ result = new ArrayList<>(((Collection<?>)files).size());
else
- result = new ArrayList<RegularFileObject>();
+ result = new ArrayList<>();
for (File f: files)
result.add(new RegularFileObject(this, nullCheck(f)));
return result;