jdk-sandbox: comparison jdk/src/share/classes/javax/swing/text/html/parser/Parser.java

equal deleted inserted replaced

-:9a5191a2e798
+:425e2c6b5941
 /*
-* Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * This code is free software; you can redistribute it and/or modify it
 * under the terms of the GNU General Public License version 2 only, as
 * published by the Free Software Foundation.  Oracle designates this
 case ';':
 ch = readCh();
 break;
 }
-char data[] = {mapNumericReference((char) n)};
+char data[] = mapNumericReference(n);
 return data;
 }
 addString('#');
 if (!parseIdentifier(false)) {
 error("ident.expected");
 }
 return ent.getData();
 }
 /**
-* Converts numeric character reference to Unicode character.
+* Converts numeric character reference to char array.
 *
 * Normally the code in a reference should be always converted
 * to the Unicode character with the same code, but due to
 * wide usage of Cp1252 charset most browsers map numeric references
 * in the range 130-159 (which are control chars in Unicode set)
 * to displayable characters with other codes.
 *
 * @param c the code of numeric character reference.
-* @return the character corresponding to the reference code.
+* @return a char array corresponding to the reference code.
 */
-private char mapNumericReference(char c) {
+private char[] mapNumericReference(int c) {
-if (c < 130 || c > 159) {
+char[] data;
-return c;
+if (c >= 0xffff) { // outside unicode BMP.
-}
+try {
-return cp1252Map[c - 130];
+data = Character.toChars(c);
+} catch (IllegalArgumentException e) {
+data = new char[0];
+}
+} else {
+data = new char[1];
+data[0] = (c < 130 || c > 159) ? (char) c : cp1252Map[c - 130];
+}
+return data;
 }
 /**
 * Parse a comment. [92] 391:7
 */

changeset 14309	425e2c6b5941
parent 12999	d0cec5582bd7
child 17678	ec24ad8455ec