equal
deleted
inserted
replaced
81 |
81 |
82 private Map<String,Charset> cache() { |
82 private Map<String,Charset> cache() { |
83 Map<String,Charset> map = cache; |
83 Map<String,Charset> map = cache; |
84 if (map == null) { |
84 if (map == null) { |
85 map = new Cache(); |
85 map = new Cache(); |
86 map.put("utf-8", UTF_8.INSTANCE); |
86 map.put("utf-8", java.nio.charset.StandardCharsets.UTF_8); |
87 map.put("iso-8859-1", ISO_8859_1.INSTANCE); |
87 map.put("iso-8859-1", java.nio.charset.StandardCharsets.ISO_8859_1); |
88 map.put("us-ascii", US_ASCII.INSTANCE); |
88 map.put("us-ascii", java.nio.charset.StandardCharsets.US_ASCII); |
|
89 map.put("utf-16", java.nio.charset.StandardCharsets.UTF_16); |
|
90 map.put("utf-16be", java.nio.charset.StandardCharsets.UTF_16BE); |
|
91 map.put("utf-16le", java.nio.charset.StandardCharsets.UTF_16LE); |
89 cache = map; |
92 cache = map; |
90 } |
93 } |
91 return map; |
94 return map; |
92 } |
95 } |
93 |
96 |
121 |
124 |
122 // By checking these built-ins we can avoid initializing Aliases and |
125 // By checking these built-ins we can avoid initializing Aliases and |
123 // Classes eagerly during bootstrap |
126 // Classes eagerly during bootstrap |
124 String csn; |
127 String csn; |
125 if (charsetName.equals("UTF-8")) { |
128 if (charsetName.equals("UTF-8")) { |
126 return UTF_8.INSTANCE; |
129 return java.nio.charset.StandardCharsets.UTF_8; |
127 } else if (charsetName.equals("US-ASCII")) { |
130 } else if (charsetName.equals("US-ASCII")) { |
128 return US_ASCII.INSTANCE; |
131 return java.nio.charset.StandardCharsets.US_ASCII; |
129 } else if (charsetName.equals("ISO-8859-1")) { |
132 } else if (charsetName.equals("ISO-8859-1")) { |
130 return ISO_8859_1.INSTANCE; |
133 return java.nio.charset.StandardCharsets.ISO_8859_1; |
131 } else { |
134 } else { |
132 csn = canonicalize(toLower(charsetName)); |
135 csn = canonicalize(toLower(charsetName)); |
133 } |
136 } |
134 |
137 |
135 // Check cache first |
138 // Check cache first |