Changeset 325 for binary-improvements/7dtd-server-fixes/src/JSON/JSONArray.cs

Timestamp:

Sep 4, 2018, 1:00:48 PM (6 years ago)

Author:

alloc

Message:

Code style cleanup (mostly whitespace changes, enforcing braces, using cleanup)

File:

• binary-improvements/7dtd-server-fixes/src/JSON/JSONArray.cs (modified) (4 diffs)

binary-improvements/7dtd-server-fixes/src/JSON/JSONArray.cs

@@ -1 @@
-using System;
 using System.Collections.Generic;
 using System.Text;
 
-namespace AllocsFixes.JSON
-{
-        public class JSONArray : JSONNode
-        {
-                private List<JSONNode> nodes = new List<JSONNode> ();
+namespace AllocsFixes.JSON {
+        public class JSONArray : JSONNode {
+                private readonly List<JSONNode> nodes = new List<JSONNode> ();
 
                 public JSONNode this [int index] {
@@ -18 +15 @@
                 }
 
-                public void Add (JSONNode node)
-                {
+                public void Add (JSONNode node) {
                         nodes.Add (node);
                 }
 
-                public override void ToString (StringBuilder stringBuilder, bool prettyPrint = false, int currentLevel = 0)
-                {
+                public override void ToString (StringBuilder stringBuilder, bool prettyPrint = false, int currentLevel = 0) {
                         stringBuilder.Append ("[");
-                        if (prettyPrint)
+                        if (prettyPrint) {
                                 stringBuilder.Append ('\n');
+                        }
+
                         foreach (JSONNode n in nodes) {
-                                if (prettyPrint)
-                                        stringBuilder.Append (new String ('\t', currentLevel + 1));
+                                if (prettyPrint) {
+                                        stringBuilder.Append (new string ('\t', currentLevel + 1));
+                                }
+
                                 n.ToString (stringBuilder, prettyPrint, currentLevel + 1);
                                 stringBuilder.Append (",");
-                                if (prettyPrint)
+                                if (prettyPrint) {
                                         stringBuilder.Append ('\n');
+                                }
                         }
-                        if (nodes.Count > 0)
+
+                        if (nodes.Count > 0) {
                                 stringBuilder.Remove (stringBuilder.Length - (prettyPrint ? 2 : 1), 1);
-                        if (prettyPrint)
-                                stringBuilder.Append (new String ('\t', currentLevel));
+                        }
+
+                        if (prettyPrint) {
+                                stringBuilder.Append (new string ('\t', currentLevel));
+                        }
+
                         stringBuilder.Append ("]");
                 }
 
-                public static JSONArray Parse (string json, ref int offset)
-                {
+                public static JSONArray Parse (string json, ref int offset) {
                         //Log.Out ("ParseArray enter (" + offset + ")");
                         JSONArray arr = new JSONArray ();
@@ -58 +62 @@
                                                         nextElemAllowed = true;
                                                         offset++;
-                                                } else
-                                                        throw new MalformedJSONException ("Could not parse array, found a comma without a value first");
+                                                } else {
+                                                        throw new MalformedJSONException (
+                                                                "Could not parse array, found a comma without a value first");
+                                                }
+
                                                 break;
                                         case ']':
                                                 offset++;
+
                                                 //Log.Out ("JSON:Parsed Array: " + arr.ToString ());
                                                 return arr;
@@ -72 +80 @@
                         }
                 }
-
         }
 }
-