Merge remote-tracking branch 'upstream/master' into EnumCleanup

John J. Aylward · John J. Aylward · commit 349a209df3fd · 2016-08-15T10:25:27.000-04:00
diff --git a/JSONArray.java b/JSONArray.java
@@ -78,7 +78,7 @@ of this software and associated documentation files (the "Software"), to deal
  * </ul>
  *
  * @author JSON.org
- * @version 2016-05-20
+ * @version 2016-08/15
  */
 public class JSONArray implements Iterable<Object> {
 
@@ -961,7 +961,7 @@ public JSONArray put(int index, Object value) throws JSONException {
     }
     
     /**
-     * Creates a JSONPointer using an intialization string and tries to 
+     * Creates a JSONPointer using an initialization string and tries to 
      * match it to an item within this JSONArray. For example, given a
      * JSONArray initialized with this document:
      * <pre>
diff --git a/JSONObject.java b/JSONObject.java
@@ -93,7 +93,7 @@ of this software and associated documentation files (the "Software"), to deal
  * </ul>
  *
  * @author JSON.org
- * @version 2016-05-20
+ * @version 2016-08-15
  */
 public class JSONObject {
     /**
@@ -132,6 +132,7 @@ public boolean equals(Object object) {
          *
          * @return The string "null".
          */
+        @Override
         public String toString() {
             return "null";
         }
@@ -1621,6 +1622,7 @@ public JSONArray toJSONArray(JSONArray names) throws JSONException {
      *         brace)</small> and ending with <code>}</code>&nbsp;<small>(right
      *         brace)</small>.
      */
+    @Override
     public String toString() {
         try {
             return this.toString(0);
@@ -1885,13 +1887,13 @@ public Writer write(Writer writer, int indentFactor, int indent)
     }
 
     /**
-     * Returns a java.util.Map containing all of the entrys in this object.
+     * Returns a java.util.Map containing all of the entries in this object.
      * If an entry in the object is a JSONArray or JSONObject it will also
      * be converted.
      * <p>
      * Warning: This method assumes that the data structure is acyclical.
      *
-     * @return a java.util.Map containing the entrys of this object
+     * @return a java.util.Map containing the entries of this object
      */
     public Map<String, Object> toMap() {
         Map<String, Object> results = new HashMap<String, Object>();
