--- a/langtools/src/share/classes/com/sun/tools/javac/util/Options.java	Wed Dec 18 19:22:58 2013 +0000
+++ b/langtools/src/share/classes/com/sun/tools/javac/util/Options.java	Wed Dec 18 16:05:18 2013 -0500
@@ -42,8 +42,7 @@
     private static final long serialVersionUID = 0;
 
     /** The context key for the options. */
-    public static final Context.Key<Options> optionsKey =
-        new Context.Key<Options>();
+    public static final Context.Key<Options> optionsKey = new Context.Key<>();
 
     private LinkedHashMap<String,String> values;
 
@@ -57,7 +56,7 @@
 
     protected Options(Context context) {
 // DEBUGGING -- Use LinkedHashMap for reproducability
-        values = new LinkedHashMap<String,String>();
+        values = new LinkedHashMap<>();
         context.put(optionsKey, this);
     }