stleary#863 replace short switch statements with if-else

Simulant87 · Mar 5, 2024 · c010033 · c010033
1 parent 5407423
commit c010033
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 10 deletions.
diff --git a/src/main/java/org/json/JSONObject.java b/src/main/java/org/json/JSONObject.java
@@ -216,12 +216,11 @@ public JSONObject(JSONTokener x) throws JSONException {
         }
         c = x.nextClean();
         for (;;) {
-            switch (c) {
-            case 0:
+            if (c == 0) {
                 throw x.syntaxError("A JSONObject text must end with '}'");
-            case '}':
+            } else if (c == '}') {
                 return;
-            default:
+            } else {
                 key = x.nextSimpleValue(c).toString();
             }
 

diff --git a/src/main/java/org/json/JSONTokener.java b/src/main/java/org/json/JSONTokener.java
@@ -397,15 +397,14 @@ public String nextTo(String delimiters) throws JSONException {
      */
     public Object nextValue() throws JSONException {
         char c = this.nextClean();
-        switch (c) {
-        case '{':
+        if (c == '{') {
             this.back();
             try {
                 return new JSONObject(this);
             } catch (StackOverflowError e) {
                 throw new JSONException("JSON Array or Object depth too large to process.", e);
             }
-        case '[':
+        } else if (c == '[') {
             this.back();
             try {
                 return new JSONArray(this);
@@ -419,9 +418,7 @@ public Object nextValue() throws JSONException {
     Object nextSimpleValue(char c) {
         String string;
 
-        switch (c) {
-        case '"':
-        case '\'':
+        if (c == '"' || c == '\'') {
             return this.nextString(c);
         }