@@ -54,7 +54,7 @@ public interface JSONAppendable {
      * value {@code null}.
      * <p>
      * If a runtime exception is thrown, this will be caught and propagated
-     * as a <code>JSONException</code>.</p>
+     * as a {@code JSONException}.</p>
      *
      * @param appender an {@code Appendable} to which a strictly syntactically
      * correct JSON value must be written
 
@@ -460,7 +460,7 @@ public String join(String separator) throws JSONException {
             if (i > 0) {
                 sb.append(separator);
             }
-            JSONWriter.writeValue(sb, this.myArrayList.get(i));
+            JSONWriter.writeValue(this.myArrayList.get(i), sb);
         }
         return sb.toString();
     }
 
@@ -1466,7 +1466,7 @@ public Object optQuery(String jsonPointer) {
     public static String quote(CharSequence string) {
         StringBuilder sb = new StringBuilder();
         try {
-            return JSONWriter.quote(string, sb).toString();
+            return JSONWriter.writeString(string, sb).toString();
         } catch (IOException ignored) {
             // will never happen - we are writing to a string builder
             return "";
@@ -1491,7 +1491,7 @@ public static String quote(CharSequence string) {
      * @throws IOException there was a problem writing to the Appendable
      */
     public static <T extends Appendable> T quote(CharSequence string, T w) throws IOException {
-        return JSONWriter.quote(string, w);
+        return JSONWriter.writeString(string, w);
     }
 
     /**
@@ -1725,7 +1725,7 @@ public static String valueToString(Object value) throws JSONException {
                 return result;
             }
         } else {
-            result = JSONWriter.writeValue(new StringBuilder(), value).toString();
+            result = JSONWriter.writeValue(value, new StringBuilder()).toString();
         }
         return result;
     }
 
@@ -132,7 +132,7 @@ public char nextClean() throws JSONException {
      * @return the Token type representing the next token type
      */
     @Override
-    public JSONToken nextTokenType() throws JSONException {
+    public JSONTokener.JSONToken nextTokenType() throws JSONException {
         char c = nextClean();
 
         switch(c) {
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ public interface JSONAppendable {`
`54`	`54`	`* value {@code null}.`
`55`	`55`	`* <p>`
`56`	`56`	`* If a runtime exception is thrown, this will be caught and propagated`
`57`		`- * as a <code>JSONException</code>.</p>`
	`57`	`+ * as a {@code JSONException}.</p>`
`58`	`58`	`*`
`59`	`59`	`* @param appender an {@code Appendable} to which a strictly syntactically`
`60`	`60`	`* correct JSON value must be written`
Original file line number	Diff line number	Diff line change
`@@ -460,7 +460,7 @@ public String join(String separator) throws JSONException {`
`460`	`460`	`if (i > 0) {`
`461`	`461`	`sb.append(separator);`
`462`	`462`	`}`
`463`		`- JSONWriter.writeValue(sb, this.myArrayList.get(i));`
	`463`	`+ JSONWriter.writeValue(this.myArrayList.get(i), sb);`
`464`	`464`	`}`
`465`	`465`	`return sb.toString();`
`466`	`466`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1466,7 +1466,7 @@ public Object optQuery(String jsonPointer) {`
`1466`	`1466`	`public static String quote(CharSequence string) {`
`1467`	`1467`	`StringBuilder sb = new StringBuilder();`
`1468`	`1468`	`try {`
`1469`		`- return JSONWriter.quote(string, sb).toString();`
	`1469`	`+ return JSONWriter.writeString(string, sb).toString();`
`1470`	`1470`	`} catch (IOException ignored) {`
`1471`	`1471`	`// will never happen - we are writing to a string builder`
`1472`	`1472`	`return "";`
`@@ -1491,7 +1491,7 @@ public static String quote(CharSequence string) {`
`1491`	`1491`	`* @throws IOException there was a problem writing to the Appendable`
`1492`	`1492`	`*/`
`1493`	`1493`	`public static <T extends Appendable> T quote(CharSequence string, T w) throws IOException {`
`1494`		`- return JSONWriter.quote(string, w);`
	`1494`	`+ return JSONWriter.writeString(string, w);`
`1495`	`1495`	`}`
`1496`	`1496`
`1497`	`1497`	`/**`
`@@ -1725,7 +1725,7 @@ public static String valueToString(Object value) throws JSONException {`
`1725`	`1725`	`return result;`
`1726`	`1726`	`}`
`1727`	`1727`	`} else {`
`1728`		`- result = JSONWriter.writeValue(new StringBuilder(), value).toString();`
	`1728`	`+ result = JSONWriter.writeValue(value, new StringBuilder()).toString();`
`1729`	`1729`	`}`
`1730`	`1730`	`return result;`
`1731`	`1731`	`}`