--- a/langtools/src/share/classes/com/sun/tools/javac/util/AbstractLog.java	Wed Dec 18 19:22:58 2013 +0000
+++ b/langtools/src/share/classes/com/sun/tools/javac/util/AbstractLog.java	Wed Dec 18 16:05:18 2013 -0500
@@ -45,9 +45,21 @@
  *  deletion without notice.</b>
  */
 public abstract class AbstractLog {
+    /** Factory for diagnostics
+     */
+    protected JCDiagnostic.Factory diags;
+
+    /** The file that's currently being translated.
+     */
+    protected DiagnosticSource source;
+
+    /** A cache of lightweight DiagnosticSource objects.
+     */
+    protected Map<JavaFileObject, DiagnosticSource> sourceMap;
+
     AbstractLog(JCDiagnostic.Factory diags) {
         this.diags = diags;
-        sourceMap = new HashMap<JavaFileObject, DiagnosticSource>();
+        sourceMap = new HashMap<>();
     }
 
     /** Re-assign source, returning previous setting.
@@ -246,16 +258,4 @@
     private DiagnosticPosition wrap(int pos) {
         return (pos == Position.NOPOS ? null : new SimpleDiagnosticPosition(pos));
     }
-
-    /** Factory for diagnostics
-     */
-    protected JCDiagnostic.Factory diags;
-
-    /** The file that's currently being translated.
-     */
-    protected DiagnosticSource source;
-
-    /** A cache of lightweight DiagnosticSource objects.
-     */
-    protected Map<JavaFileObject, DiagnosticSource> sourceMap;
 }