mirror of
https://github.com/ethauvin/JSON-java.git
synced 2025-06-17 16:00:51 -07:00
AjayKemparaj: Tabs to spaces and minor java code fixups
This commit is contained in:
parent
6394d92279
commit
9420bb7e8b
9 changed files with 435 additions and 435 deletions
|
@ -148,9 +148,9 @@ public class HTTP {
|
||||||
sb.append(CRLF);
|
sb.append(CRLF);
|
||||||
while (keys.hasNext()) {
|
while (keys.hasNext()) {
|
||||||
string = keys.next().toString();
|
string = keys.next().toString();
|
||||||
if (!string.equals("HTTP-Version") && !string.equals("Status-Code") &&
|
if (!"HTTP-Version".equals(string) && !"Status-Code".equals(string) &&
|
||||||
!string.equals("Reason-Phrase") && !string.equals("Method") &&
|
!"Reason-Phrase".equals(string) && !"Method".equals(string) &&
|
||||||
!string.equals("Request-URI") && !jo.isNull(string)) {
|
!"Request-URI".equals(string) && !jo.isNull(string)) {
|
||||||
sb.append(string);
|
sb.append(string);
|
||||||
sb.append(": ");
|
sb.append(": ");
|
||||||
sb.append(jo.getString(string));
|
sb.append(jo.getString(string));
|
||||||
|
|
|
@ -418,7 +418,7 @@ public class JSONML {
|
||||||
keys = jo.keys();
|
keys = jo.keys();
|
||||||
while (keys.hasNext()) {
|
while (keys.hasNext()) {
|
||||||
key = keys.next().toString();
|
key = keys.next().toString();
|
||||||
if (!key.equals("tagName") && !key.equals("childNodes")) {
|
if (!"tagName".equals(key) && !"childNodes".equals(key)) {
|
||||||
XML.noSpace(key);
|
XML.noSpace(key);
|
||||||
value = jo.optString(key);
|
value = jo.optString(key);
|
||||||
if (value != null) {
|
if (value != null) {
|
||||||
|
|
|
@ -967,8 +967,8 @@ public class JSONObject {
|
||||||
String name = method.getName();
|
String name = method.getName();
|
||||||
String key = "";
|
String key = "";
|
||||||
if (name.startsWith("get")) {
|
if (name.startsWith("get")) {
|
||||||
if (name.equals("getClass") ||
|
if ("getClass".equals(name) ||
|
||||||
name.equals("getDeclaringClass")) {
|
"getDeclaringClass".equals(name)) {
|
||||||
key = "";
|
key = "";
|
||||||
} else {
|
} else {
|
||||||
key = name.substring(3);
|
key = name.substring(3);
|
||||||
|
|
|
@ -383,7 +383,7 @@ public class JSONTokener {
|
||||||
this.back();
|
this.back();
|
||||||
|
|
||||||
string = sb.toString().trim();
|
string = sb.toString().trim();
|
||||||
if (string.equals("")) {
|
if ("".equals(string)) {
|
||||||
throw this.syntaxError("Missing value");
|
throw this.syntaxError("Missing value");
|
||||||
}
|
}
|
||||||
return JSONObject.stringToValue(string);
|
return JSONObject.stringToValue(string);
|
||||||
|
|
16
XML.java
16
XML.java
|
@ -160,7 +160,7 @@ public class XML {
|
||||||
x.back();
|
x.back();
|
||||||
} else if (c == '[') {
|
} else if (c == '[') {
|
||||||
token = x.nextToken();
|
token = x.nextToken();
|
||||||
if (token.equals("CDATA")) {
|
if ("CDATA".equals(token)) {
|
||||||
if (x.next() == '[') {
|
if (x.next() == '[') {
|
||||||
string = x.nextCDATA();
|
string = x.nextCDATA();
|
||||||
if (string.length() > 0) {
|
if (string.length() > 0) {
|
||||||
|
@ -301,19 +301,19 @@ public class XML {
|
||||||
* @return A simple JSON value.
|
* @return A simple JSON value.
|
||||||
*/
|
*/
|
||||||
public static Object stringToValue(String string) {
|
public static Object stringToValue(String string) {
|
||||||
if (string.equals("")) {
|
if ("".equals(string)) {
|
||||||
return string;
|
return string;
|
||||||
}
|
}
|
||||||
if (string.equalsIgnoreCase("true")) {
|
if ("true".equalsIgnoreCase(string)) {
|
||||||
return Boolean.TRUE;
|
return Boolean.TRUE;
|
||||||
}
|
}
|
||||||
if (string.equalsIgnoreCase("false")) {
|
if ("false".equalsIgnoreCase(string)) {
|
||||||
return Boolean.FALSE;
|
return Boolean.FALSE;
|
||||||
}
|
}
|
||||||
if (string.equalsIgnoreCase("null")) {
|
if ("null".equalsIgnoreCase(string)) {
|
||||||
return JSONObject.NULL;
|
return JSONObject.NULL;
|
||||||
}
|
}
|
||||||
if (string.equals("0")) {
|
if ("0".equals(string)) {
|
||||||
return new Integer(0);
|
return new Integer(0);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -429,7 +429,7 @@ public class XML {
|
||||||
|
|
||||||
// Emit content in body
|
// Emit content in body
|
||||||
|
|
||||||
if (key.equals("content")) {
|
if ("content".equals(key)) {
|
||||||
if (value instanceof JSONArray) {
|
if (value instanceof JSONArray) {
|
||||||
ja = (JSONArray)value;
|
ja = (JSONArray)value;
|
||||||
length = ja.length();
|
length = ja.length();
|
||||||
|
@ -462,7 +462,7 @@ public class XML {
|
||||||
sb.append(toString(value, key));
|
sb.append(toString(value, key));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else if (value.equals("")) {
|
} else if ("".equals(value)) {
|
||||||
sb.append('<');
|
sb.append('<');
|
||||||
sb.append(key);
|
sb.append(key);
|
||||||
sb.append("/>");
|
sb.append("/>");
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue