1.1 --- a/src/share/classes/com/sun/tools/javac/util/RichDiagnosticFormatter.java Thu Feb 21 12:23:27 2013 -0800 1.2 +++ b/src/share/classes/com/sun/tools/javac/util/RichDiagnosticFormatter.java Thu Feb 21 17:49:56 2013 -0800 1.3 @@ -24,6 +24,7 @@ 1.4 */ 1.5 package com.sun.tools.javac.util; 1.6 1.7 +import java.util.EnumMap; 1.8 import java.util.EnumSet; 1.9 import java.util.HashMap; 1.10 import java.util.LinkedHashMap; 1.11 @@ -96,7 +97,7 @@ 1.12 this.diags = JCDiagnostic.Factory.instance(context); 1.13 this.types = Types.instance(context); 1.14 this.messages = JavacMessages.instance(context); 1.15 - whereClauses = new LinkedHashMap<WhereClauseKind, Map<Type, JCDiagnostic>>(); 1.16 + whereClauses = new EnumMap<WhereClauseKind, Map<Type, JCDiagnostic>>(WhereClauseKind.class); 1.17 configuration = new RichConfiguration(Options.instance(context), formatter); 1.18 for (WhereClauseKind kind : WhereClauseKind.values()) 1.19 whereClauses.put(kind, new LinkedHashMap<Type, JCDiagnostic>());