1
0
Fork 0
mirror of https://github.com/ethauvin/JSON-java.git synced 2025-06-17 07:50:52 -07:00

Java 1.8.

This commit is contained in:
Douglas Crockford 2014-05-05 15:09:32 -07:00
parent 48d31b7f5c
commit a9a0762383
26 changed files with 747 additions and 819 deletions

View file

@ -28,7 +28,7 @@ SOFTWARE.
* The XMLTokener extends the JSONTokener to provide additional methods
* for the parsing of XML texts.
* @author JSON.org
* @version 2012-11-13
* @version 2014-05-03
*/
public class XMLTokener extends JSONTokener {
@ -36,10 +36,10 @@ public class XMLTokener extends JSONTokener {
/** The table of entity values. It initially contains Character values for
* amp, apos, gt, lt, quot.
*/
public static final java.util.HashMap entity;
public static final java.util.HashMap<String, Character> entity;
static {
entity = new java.util.HashMap(8);
entity = new java.util.HashMap<String, Character>(8);
entity.put("amp", XML.AMP);
entity.put("apos", XML.APOS);
entity.put("gt", XML.GT);
@ -63,7 +63,7 @@ public class XMLTokener extends JSONTokener {
public String nextCDATA() throws JSONException {
char c;
int i;
StringBuffer sb = new StringBuffer();
StringBuilder sb = new StringBuilder();
for (;;) {
c = next();
if (end()) {
@ -91,7 +91,7 @@ public class XMLTokener extends JSONTokener {
*/
public Object nextContent() throws JSONException {
char c;
StringBuffer sb;
StringBuilder sb;
do {
c = next();
} while (Character.isWhitespace(c));
@ -101,7 +101,7 @@ public class XMLTokener extends JSONTokener {
if (c == '<') {
return XML.LT;
}
sb = new StringBuffer();
sb = new StringBuilder();
for (;;) {
if (c == '<' || c == 0) {
back();
@ -125,7 +125,7 @@ public class XMLTokener extends JSONTokener {
* @throws JSONException If missing ';' in XML entity.
*/
public Object nextEntity(char ampersand) throws JSONException {
StringBuffer sb = new StringBuffer();
StringBuilder sb = new StringBuilder();
for (;;) {
char c = next();
if (Character.isLetterOrDigit(c) || c == '#') {
@ -219,7 +219,7 @@ public class XMLTokener extends JSONTokener {
public Object nextToken() throws JSONException {
char c;
char q;
StringBuffer sb;
StringBuilder sb;
do {
c = next();
} while (Character.isWhitespace(c));
@ -244,7 +244,7 @@ public class XMLTokener extends JSONTokener {
case '"':
case '\'':
q = c;
sb = new StringBuffer();
sb = new StringBuilder();
for (;;) {
c = next();
if (c == 0) {
@ -263,7 +263,7 @@ public class XMLTokener extends JSONTokener {
// Name
sb = new StringBuffer();
sb = new StringBuilder();
for (;;) {
sb.append(c);
c = next();