Rename to whineAboutEncodingAndReturnCanonical()

This change renames the whineAboutEncodingAndReturnActual() method to
whineAboutEncodingAndReturnCanonical() — in order to make more clear
it’s reporting that the canonical name of the encoding is preferred over
any particular label for that encoding.

Author: sideshowbarker

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

@@ -367,7 +367,7 @@ public boolean internalEncodingDeclaration(String internalCharset)
                         + "\u201D disagrees with the actual encoding of the document (\u201C"
                         + characterEncoding.getCanonName() + "\u201D).");
             } else {
-                Encoding newEnc = whineAboutEncodingAndReturnActual(
+                Encoding newEnc = whineAboutEncodingAndReturnCanonical(
                         internalCharset, cs);
                 tokenizer.errTreeBuilder("Changing character encoding \u201C"
                         + internalCharset + "\u201D and reparsing.");
@@ -435,7 +435,7 @@ protected Encoding encodingFromExternalDeclaration(String encoding)
                     || "utf-32".equals(cs.getCanonName())) {
                 swallowBom = false;
             }
-            return whineAboutEncodingAndReturnActual(encoding, cs);
+            return whineAboutEncodingAndReturnCanonical(encoding, cs);
         } catch (UnsupportedCharsetException e) {
             tokenizer.err("Unsupported character encoding name: \u201C" + encoding
                     + "\u201D. Will sniff.");
@@ -450,7 +450,7 @@ protected Encoding encodingFromExternalDeclaration(String encoding)
      * @return
      * @throws SAXException
      */
-    protected Encoding whineAboutEncodingAndReturnActual(String encoding,
+    protected Encoding whineAboutEncodingAndReturnCanonical(String encoding,
             Encoding cs) throws SAXException {
         String canonName = cs.getCanonName();
         if (!canonName.equals(encoding)) {