Private encodingByCookedName → encodingByLabel

This change renames the private encodingByCookedName map in the Encoding
class to encodingByLabel (for consistency with Encoding spec terminology).

Author: sideshowbarker

src/nu/validator/htmlparser/io/Encoding.java

@@ -63,6 +63,8 @@ public class Encoding {
             "xjisautodetect", "xutf16bebom", "xutf16lebom", "xutf32bebom",
             "xutf32lebom", "xutf16oppositeendian", "xutf16platformendian",
             "xutf32oppositeendian", "xutf32platformendian" };
+    private static Map<String, Encoding> encodingByLabel =
+        new HashMap<String, Encoding>();
 
     private static String[] NOT_OBSCURE = { "big5", "big5hkscs", "eucjp",
             "euckr", "gb18030", "gbk", "iso2022jp", "iso2022kr", "iso88591",
@@ -73,8 +75,6 @@ public class Encoding {
             "windows1253", "windows1254", "windows1255", "windows1256",
             "windows1257", "windows1258" };
 
-    private static Map<String, Encoding> encodingByCookedName = new HashMap<String, Encoding>();
-
     private final String canonName;
 
     private final Charset charset;
@@ -115,14 +115,14 @@ asciiSuperset, isObscure(name), isShouldNot(name),
                 encodings.add(enc);
                 Set<String> aliases = cs.aliases();
                 for (String alias : aliases) {
-                    encodingByCookedName.put(toNameKey(alias).intern(), enc);
+                    encodingByLabel.put(toNameKey(alias).intern(), enc);
                 }
             }
         }
         // Overwrite possible overlapping aliases with the real things--just in
         // case
         for (Encoding encoding : encodings) {
-            encodingByCookedName.put(toNameKey(encoding.getCanonName()),
+            encodingByLabel.put(toNameKey(encoding.getCanonName()),
                     encoding);
         }
         UTF8 = forName("utf-8");
@@ -159,15 +159,15 @@ asciiSuperset, isObscure(name), isShouldNot(name),
         } catch (UnsupportedCharsetException e) {
         }
         try {
-            encodingByCookedName.put("x-x-big5", forName("big5"));
+            encodingByLabel.put("x-x-big5", forName("big5"));
         } catch (UnsupportedCharsetException e) {
         }
         try {
-            encodingByCookedName.put("euc-kr", forName("windows-949"));
+            encodingByLabel.put("euc-kr", forName("windows-949"));
         } catch (UnsupportedCharsetException e) {
         }
         try {
-            encodingByCookedName.put("ks_c_5601-1987", forName("windows-949"));
+            encodingByLabel.put("ks_c_5601-1987", forName("windows-949"));
         } catch (UnsupportedCharsetException e) {
         }
     }
@@ -235,7 +235,7 @@ private static boolean isLikelyEbcdic(String canonName,
     }
 
     public static Encoding forName(String name) {
-        Encoding rv = encodingByCookedName.get(toNameKey(name));
+        Encoding rv = encodingByLabel.get(toNameKey(name));
         if (rv == null) {
             throw new UnsupportedCharsetException(name);
         } else {
@@ -381,7 +381,7 @@ public Encoding getActualHtmlEncoding() {
     }
 
     public static void main(String[] args) {
-        for (Map.Entry<String, Encoding> entry : encodingByCookedName.entrySet()) {
+        for (Map.Entry<String, Encoding> entry : encodingByLabel.entrySet()) {
             String name = entry.getKey();
             Encoding enc = entry.getValue();
             System.out.printf(