Bug fixes

Author: alwinsanil

src/main/java/org/json/JSONArray.java

@@ -62,9 +62,6 @@
  */
 public class JSONArray implements Iterable<Object>, JSONSimilar {
 
-    /**
-     * The constants used for the method toString to eliminate magic number code smell.
-     */
     private static final int commaMultiplier = 2; // Each value requires a comma in output
     private static final int minimumBufferSize = 16; // Minimum reasonable buffer size for small arrays
 
@@ -1716,11 +1713,11 @@ public String toString() {
 
     /**
      * Make a pretty-printed JSON text of this JSONArray.
-     *
+     * 
      * <p>If <pre> {@code indentFactor > 0}</pre> and the {@link JSONArray} has only
      * one element, then the array will be output on a single line:
      * <pre>{@code [1]}</pre>
-     *
+     * 
      * <p>If an array has 2 or more elements, then it will be output across
      * multiple lines: <pre>{@code
      * [
@@ -1732,8 +1729,9 @@ public String toString() {
      * <p><b>
      * Warning: This method assumes that the data structure is acyclical.
      * </b>
-     *
-     * @param indentFactor The number of spaces to add to each level of indentation.
+     * 
+     * @param indentFactor
+     *            The number of spaces to add to each level of indentation.
      * @return a printable, displayable, transmittable representation of the
      *         object, beginning with <code>[</code>&nbsp;<small>(left
      *         bracket)</small> and ending with <code>]</code>
@@ -1742,18 +1740,25 @@ public String toString() {
      */
     @SuppressWarnings("resource")
     public String toString(int indentFactor) throws JSONException {
-        int initialSize = calculateInitialBufferSize(commaMultiplier);
-        Writer stringWriter = new StringBuilderWriter(Math.max(initialSize, minimumBufferSize));
-        return this.write(stringWriter, indentFactor, 0).toString();
+        // each value requires a comma, so multiply the count by 2
+        // We don't want to oversize the initial capacity
+        int initialSize = myArrayList.size() * commaMultiplier;
+        Writer sw = new StringBuilderWriter(Math.max(initialSize, minimumBufferSize));
+        return this.write(sw, indentFactor, 0).toString();
     }
 
     /**
-     * Calculates the initial buffer size needed for JSON string representation.
-     * @param elementsPerItem Multiplier accounting for commas between elements
-     * @return Calculated initial size based on array contents
+     * Write the contents of the JSONArray as JSON text to a writer. For
+     * compactness, no whitespace is added.
+     * <p><b>
+     * Warning: This method assumes that the data structure is acyclical.
+     *</b>
+     * @param writer the writer object
+     * @return The writer.
+     * @throws JSONException if a called function fails
      */
-    private int calculateInitialBufferSize(int elementsPerItem) {
-        return myArrayList.size() * elementsPerItem;
+    public Writer write(Writer writer) throws JSONException {
+        return this.write(writer, 0, 0);
     }
 
     /**