--- a/langtools/src/share/classes/com/sun/tools/javap/JavapTask.java	Wed Dec 18 19:22:58 2013 +0000
+++ b/langtools/src/share/classes/com/sun/tools/javap/JavapTask.java	Wed Dec 18 16:05:18 2013 -0500
@@ -356,7 +356,7 @@
             Iterable<String> classes) {
         this(out, fileManager, diagnosticListener);
 
-        this.classes = new ArrayList<String>();
+        this.classes = new ArrayList<>();
         for (String classname: classes) {
             classname.getClass(); // null-check
             this.classes.add(classname);
@@ -512,7 +512,7 @@
                 handleOption(arg, iter);
             else if (allowClasses) {
                 if (classes == null)
-                    classes = new ArrayList<String>();
+                    classes = new ArrayList<>();
                 classes.add(arg);
                 while (iter.hasNext())
                     classes.add(iter.next());
@@ -988,7 +988,7 @@
             // could make this a HashMap<Locale,SoftReference<ResourceBundle>>
             // and for efficiency, keep a hard reference to the bundle for the task
             // locale
-            bundles = new HashMap<Locale, ResourceBundle>();
+            bundles = new HashMap<>();
         }
 
         if (locale == null)