8022080: javadoc generates invalid HTML in Turkish locale

Tue, 20 Aug 2013 14:55:20 -0700

author
jjg
date
Tue, 20 Aug 2013 14:55:20 -0700
changeset 1964
79e341614c50
parent 1963
a76dc1b4c299
child 1965
720992953d43

8022080: javadoc generates invalid HTML in Turkish locale
Reviewed-by: bpatel

src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlTag.java file | annotate | diff | comparison | revisions
src/share/classes/com/sun/tools/doclint/HtmlTag.java file | annotate | diff | comparison | revisions
     1.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlTag.java	Tue Aug 20 14:46:54 2013 -0700
     1.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlTag.java	Tue Aug 20 14:55:20 2013 -0700
     1.3 @@ -25,6 +25,8 @@
     1.4  
     1.5  package com.sun.tools.doclets.formats.html.markup;
     1.6  
     1.7 +import java.util.Locale;
     1.8 +
     1.9  /**
    1.10   * Enum representing HTML tags.
    1.11   *
    1.12 @@ -115,7 +117,7 @@
    1.13      HtmlTag(BlockType blockType, EndTag endTag ) {
    1.14          this.blockType = blockType;
    1.15          this.endTag = endTag;
    1.16 -        this.value = name().toLowerCase();
    1.17 +        this.value = name().toLowerCase(Locale.US);
    1.18      }
    1.19  
    1.20      /**
     2.1 --- a/src/share/classes/com/sun/tools/doclint/HtmlTag.java	Tue Aug 20 14:46:54 2013 -0700
     2.2 +++ b/src/share/classes/com/sun/tools/doclint/HtmlTag.java	Tue Aug 20 14:55:20 2013 -0700
     2.3 @@ -30,6 +30,7 @@
     2.4  import java.util.EnumMap;
     2.5  import java.util.EnumSet;
     2.6  import java.util.HashMap;
     2.7 +import java.util.Locale;
     2.8  import java.util.Map;
     2.9  
    2.10  import javax.lang.model.element.Name;
    2.11 @@ -345,7 +346,7 @@
    2.12          WIDTH;
    2.13  
    2.14          public String getText() {
    2.15 -            return name().toLowerCase();
    2.16 +            return toLowerCase(name());
    2.17          }
    2.18  
    2.19          static final Map<String,Attr> index = new HashMap<String,Attr>();
    2.20 @@ -424,11 +425,11 @@
    2.21      }
    2.22  
    2.23      public String getText() {
    2.24 -        return name().toLowerCase();
    2.25 +        return toLowerCase(name());
    2.26      }
    2.27  
    2.28      public Attr getAttr(Name attrName) {
    2.29 -        return Attr.index.get(attrName.toString().toLowerCase());
    2.30 +        return Attr.index.get(toLowerCase(attrName.toString()));
    2.31      }
    2.32  
    2.33      public AttrKind getAttrKind(Name attrName) {
    2.34 @@ -450,6 +451,10 @@
    2.35      }
    2.36  
    2.37      static HtmlTag get(Name tagName) {
    2.38 -        return index.get(tagName.toString().toLowerCase());
    2.39 +        return index.get(toLowerCase(tagName.toString()));
    2.40 +    }
    2.41 +
    2.42 +    private static String toLowerCase(String s) {
    2.43 +        return s.toLowerCase(Locale.US);
    2.44      }
    2.45  }

mercurial