Merge pull request stleary#41 from ajayk/master

Code formatting Tabs to spaces and Minor java cleanup

Author: douglascrockford

CDL.java

@@ -64,18 +64,18 @@ private static String getValue(JSONTokener x) throws JSONException {
             return null;
         case '"':
         case '\'':
-        	q = c;
-        	sb = new StringBuffer();
-        	for (;;) {
-        		c = x.next();
-        		if (c == q) {
-        			break;
-        		}
+            q = c;
+            sb = new StringBuffer();
+            for (;;) {
+                c = x.next();
+                if (c == q) {
+                    break;
+                }
                 if (c == 0 || c == '\n' || c == '\r') {
                     throw x.syntaxError("Missing close quote '" + q + "'.");
                 }
                 sb.append(c);
-        	}
+            }
             return sb.toString();
         case ',':
             x.back();
@@ -98,7 +98,7 @@ public static JSONArray rowToJSONArray(JSONTokener x) throws JSONException {
             String value = getValue(x);
             char c = x.next();
             if (value == null || 
-            		(ja.length() == 0 && value.length() == 0 && c != ',')) {
+                    (ja.length() == 0 && value.length() == 0 && c != ',')) {
                 return null;
             }
             ja.put(value);
@@ -135,43 +135,43 @@ public static JSONObject rowToJSONObject(JSONArray names, JSONTokener x)
     }
 
     /**
-	 * Produce a comma delimited text row from a JSONArray. Values containing
-	 * the comma character will be quoted. Troublesome characters may be 
-	 * removed.
-	 * @param ja A JSONArray of strings.
-	 * @return A string ending in NEWLINE.
-	 */
-	public static String rowToString(JSONArray ja) {
-	    StringBuffer sb = new StringBuffer();
-	    for (int i = 0; i < ja.length(); i += 1) {
-	        if (i > 0) {
-	            sb.append(',');
-	        }
-	        Object object = ja.opt(i);
-	        if (object != null) {
-	            String string = object.toString();
-	            if (string.length() > 0 && (string.indexOf(',') >= 0 || 
-	            		string.indexOf('\n') >= 0 || string.indexOf('\r') >= 0 || 
-	            		string.indexOf(0) >= 0 || string.charAt(0) == '"')) {
-	                sb.append('"');
-	            	int length = string.length();
-	            	for (int j = 0; j < length; j += 1) {
-	            		char c = string.charAt(j);
-	            		if (c >= ' ' && c != '"') {
-	            			sb.append(c);
-	            		}
-	                }
-	                sb.append('"');
-	            } else {
-	                sb.append(string);
-	            }
-	        }
-	    }
-	    sb.append('\n');
-	    return sb.toString();
-	}
+     * Produce a comma delimited text row from a JSONArray. Values containing
+     * the comma character will be quoted. Troublesome characters may be 
+     * removed.
+     * @param ja A JSONArray of strings.
+     * @return A string ending in NEWLINE.
+     */
+    public static String rowToString(JSONArray ja) {
+        StringBuffer sb = new StringBuffer();
+        for (int i = 0; i < ja.length(); i += 1) {
+            if (i > 0) {
+                sb.append(',');
+            }
+            Object object = ja.opt(i);
+            if (object != null) {
+                String string = object.toString();
+                if (string.length() > 0 && (string.indexOf(',') >= 0 || 
+                        string.indexOf('\n') >= 0 || string.indexOf('\r') >= 0 || 
+                        string.indexOf(0) >= 0 || string.charAt(0) == '"')) {
+                    sb.append('"');
+                    int length = string.length();
+                    for (int j = 0; j < length; j += 1) {
+                        char c = string.charAt(j);
+                        if (c >= ' ' && c != '"') {
+                            sb.append(c);
+                        }
+                    }
+                    sb.append('"');
+                } else {
+                    sb.append(string);
+                }
+            }
+        }
+        sb.append('\n');
+        return sb.toString();
+    }
 
-	/**
+    /**
      * Produce a JSONArray of JSONObjects from a comma delimited text string,
      * using the first row as a source of names.
      * @param string The comma delimited text.

HTTP.java

@@ -148,9 +148,9 @@ public static String toString(JSONObject jo) throws JSONException {
         sb.append(CRLF);
         while (keys.hasNext()) {
             string = keys.next().toString();
-            if (!string.equals("HTTP-Version")      && !string.equals("Status-Code") &&
-                    !string.equals("Reason-Phrase") && !string.equals("Method") &&
-                    !string.equals("Request-URI")   && !jo.isNull(string)) {
+            if (!"HTTP-Version".equals(string)      && !"Status-Code".equals(string) &&
+                    !"Reason-Phrase".equals(string) && !"Method".equals(string) &&
+                    !"Request-URI".equals(string)   && !jo.isNull(string)) {
                 sb.append(string);
                 sb.append(": ");
                 sb.append(jo.getString(string));

JSONException.java

@@ -6,8 +6,8 @@
  * @version 2010-12-24
  */
 public class JSONException extends Exception {
-	private static final long serialVersionUID = 0;
-	private Throwable cause;
+    private static final long serialVersionUID = 0;
+    private Throwable cause;
 
     /**
      * Constructs a JSONException with an explanatory message.