diff options
| author | Andreas Gampe <agampe@google.com> | 2015-04-20 11:33:07 -0700 |
|---|---|---|
| committer | Andreas Gampe <agampe@google.com> | 2015-04-20 14:33:51 -0700 |
| commit | fc6983a9bd2843f685d57b74a6e011bc056aed17 (patch) | |
| tree | bedf491aa6f758ce4c10d0b38d16a4e94a31d066 | |
| parent | a97828cb3f8f3a1af8470e55d3c5cd62d6a7cb4c (diff) | |
| download | tagsoup-fc6983a9bd2843f685d57b74a6e011bc056aed17.tar.gz | |
Tagsoup: Use Locale.ROOT in toLowerCase
Make the behavior consistent no matter the default locale.
This also allows to compile-time initialize the HTMLSchema.
Bug: 19498458
Bug: 19542228
Change-Id: I207a6147b2455bb2746be9abb8b8864de9185b76
| -rw-r--r-- | src/org/ccil/cowan/tagsoup/Parser.java | 3 | ||||
| -rw-r--r-- | src/org/ccil/cowan/tagsoup/Schema.java | 5 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/org/ccil/cowan/tagsoup/Parser.java b/src/org/ccil/cowan/tagsoup/Parser.java index 41b5517..66d2922 100644 --- a/src/org/ccil/cowan/tagsoup/Parser.java +++ b/src/org/ccil/cowan/tagsoup/Parser.java @@ -17,6 +17,7 @@ package org.ccil.cowan.tagsoup; import java.util.HashMap; import java.util.ArrayList; +import java.util.Locale; import java.io.*; import java.net.URL; import java.net.URLConnection; @@ -535,7 +536,7 @@ public class Parser extends DefaultHandler implements ScanHandler, XMLReader, Le if (theNewElement == null) return; // Currently we don't rely on Schema to canonicalize // attribute names. - theAttributeName = makeName(buff, offset, length).toLowerCase(); + theAttributeName = makeName(buff, offset, length).toLowerCase(Locale.ROOT); // System.err.println("%% Attribute name " + theAttributeName); } diff --git a/src/org/ccil/cowan/tagsoup/Schema.java b/src/org/ccil/cowan/tagsoup/Schema.java index 0d99a23..11bae59 100644 --- a/src/org/ccil/cowan/tagsoup/Schema.java +++ b/src/org/ccil/cowan/tagsoup/Schema.java @@ -16,6 +16,7 @@ package org.ccil.cowan.tagsoup; import java.util.HashMap; +import java.util.Locale; /** Abstract class representing a TSSL schema. @@ -53,7 +54,7 @@ public abstract class Schema { public void elementType(String name, int model, int memberOf, int flags) { ElementType e = new ElementType(name, model, memberOf, flags, this); - theElementTypes.put(name.toLowerCase(), e); + theElementTypes.put(name.toLowerCase(Locale.ROOT), e); if (memberOf == M_ROOT) theRoot = e; } @@ -119,7 +120,7 @@ public abstract class Schema { **/ public ElementType getElementType(String name) { - return (ElementType)(theElementTypes.get(name.toLowerCase())); + return (ElementType)(theElementTypes.get(name.toLowerCase(Locale.ROOT))); } /** |