mirror of
https://github.com/ethauvin/JSON-java.git
synced 2025-06-17 07:50:52 -07:00
Merge pull request #271 from johnjaylward/EnumCleanup
Update enum support to be more fully featured.
This commit is contained in:
commit
ebe69df8e4
1 changed files with 6 additions and 1 deletions
|
@ -1710,6 +1710,9 @@ public class JSONObject {
|
||||||
if (value.getClass().isArray()) {
|
if (value.getClass().isArray()) {
|
||||||
return new JSONArray(value).toString();
|
return new JSONArray(value).toString();
|
||||||
}
|
}
|
||||||
|
if(value instanceof Enum<?>){
|
||||||
|
return quote(((Enum<?>)value).name());
|
||||||
|
}
|
||||||
return quote(value.toString());
|
return quote(value.toString());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1737,7 +1740,7 @@ public class JSONObject {
|
||||||
|| object instanceof Long || object instanceof Boolean
|
|| object instanceof Long || object instanceof Boolean
|
||||||
|| object instanceof Float || object instanceof Double
|
|| object instanceof Float || object instanceof Double
|
||||||
|| object instanceof String || object instanceof BigInteger
|
|| object instanceof String || object instanceof BigInteger
|
||||||
|| object instanceof BigDecimal) {
|
|| object instanceof BigDecimal || object instanceof Enum) {
|
||||||
return object;
|
return object;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1799,6 +1802,8 @@ public class JSONObject {
|
||||||
writer.write(numberToString((Number) value));
|
writer.write(numberToString((Number) value));
|
||||||
} else if (value instanceof Boolean) {
|
} else if (value instanceof Boolean) {
|
||||||
writer.write(value.toString());
|
writer.write(value.toString());
|
||||||
|
} else if (value instanceof Enum<?>) {
|
||||||
|
writer.write(quote(((Enum<?>)value).name()));
|
||||||
} else if (value instanceof JSONString) {
|
} else if (value instanceof JSONString) {
|
||||||
Object o;
|
Object o;
|
||||||
try {
|
try {
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue