--- a/langtools/src/share/classes/com/sun/tools/javac/sym/Profiles.java Wed Dec 18 19:22:58 2013 +0000
+++ b/langtools/src/share/classes/com/sun/tools/javac/sym/Profiles.java Wed Dec 18 16:05:18 2013 -0500
@@ -54,9 +54,9 @@
public static void main(String[] args) throws IOException {
Profiles p = Profiles.read(new File(args[0]));
if (args.length >= 2) {
- Map<Integer,Set<String>> lists = new TreeMap<Integer,Set<String>>();
+ Map<Integer,Set<String>> lists = new TreeMap<>();
for (int i = 1; i <= 4; i++)
- lists.put(i, new TreeSet<String>());
+ lists.put(i, new TreeSet<>());
File rt_jar_lst = new File(args[1]);
for (String line: Files.readAllLines(rt_jar_lst.toPath(), Charset.defaultCharset())) {
@@ -101,11 +101,11 @@
final Package parent;
final String name;
- Map<String, Package> subpackages = new TreeMap<String, Package>();
+ Map<String, Package> subpackages = new TreeMap<>();
int profile;
- Map<String, Integer> includedTypes = new TreeMap<String,Integer>();
- Map<String, Integer> excludedTypes = new TreeMap<String,Integer>();
+ Map<String, Integer> includedTypes = new TreeMap<>();
+ Map<String, Integer> excludedTypes = new TreeMap<>();
Package(Package parent, String name) {
this.parent = parent;
@@ -142,7 +142,7 @@
}
}
- final Map<String, Package> packages = new TreeMap<String, Package>();
+ final Map<String, Package> packages = new TreeMap<>();
final int maxProfile = 4; // Three compact profiles plus full JRE
@@ -191,7 +191,7 @@
@Override
public Set<String> getPackages(int profile) {
- Set<String> results = new TreeSet<String>();
+ Set<String> results = new TreeSet<>();
for (Package p: packages.values())
p.getPackages(profile, results);
return results;
@@ -255,7 +255,7 @@
SimpleProfiles(Properties p) {
int max = 0;
- map = new HashMap<String, Integer>();
+ map = new HashMap<>();
for (Map.Entry<Object,Object> e: p.entrySet()) {
String typeName = (String) e.getKey();
int profile = Integer.valueOf((String) e.getValue());
@@ -277,7 +277,7 @@
@Override
public Set<String> getPackages(int profile) {
- Set<String> results = new TreeSet<String>();
+ Set<String> results = new TreeSet<>();
for (Map.Entry<String,Integer> e: map.entrySet()) {
String tn = e.getKey();
int prf = e.getValue();