From af440720f80653aa2b2c792a4cc5ee49901b5468 Mon Sep 17 00:00:00 2001
From: "chris.nokleberg" <chris.nokleberg@b68fe964-5755-0410-a06c-9fee2ea08261>
Date: Tue, 20 Jan 2009 06:48:00 +0000
Subject: [PATCH] improve toString performance

---
 src/org/json/simple/ItemList.java   | 147 ----------------------------
 src/org/json/simple/JSONArray.java  |  22 +++--
 src/org/json/simple/JSONObject.java |  65 +++++++-----
 3 files changed, 52 insertions(+), 182 deletions(-)
 delete mode 100644 src/org/json/simple/ItemList.java

diff --git a/src/org/json/simple/ItemList.java b/src/org/json/simple/ItemList.java
deleted file mode 100644
index 07231e6..0000000
--- a/src/org/json/simple/ItemList.java
+++ /dev/null
@@ -1,147 +0,0 @@
-/*
- * $Id: ItemList.java,v 1.1 2006/04/15 14:10:48 platform Exp $
- * Created on 2006-3-24
- */
-package org.json.simple;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.StringTokenizer;
-
-/**
- * |a:b:c| => |a|,|b|,|c|
- * |:| => ||,||
- * |a:| => |a|,||
- * @author FangYidong<fangyidong@yahoo.com.cn>
- */
-public class ItemList {
-	private String sp=",";
-	List items=new ArrayList();
-	
-	
-	public ItemList(){}
-	
-	
-	public ItemList(String s){
-		this.split(s,sp,items);
-	}
-	
-	public ItemList(String s,String sp){
-		this.sp=s;
-		this.split(s,sp,items);
-	}
-	
-	public ItemList(String s,String sp,boolean isMultiToken){
-		split(s,sp,items,isMultiToken);
-	}
-	
-	public List getItems(){
-		return this.items;
-	}
-	
-	public String[] getArray(){
-		return (String[])this.items.toArray();
-	}
-	
-	public void split(String s,String sp,List append,boolean isMultiToken){
-		if(s==null || sp==null)
-			return;
-		if(isMultiToken){
-			StringTokenizer tokens=new StringTokenizer(s,sp);
-			while(tokens.hasMoreTokens()){
-				append.add(tokens.nextToken().trim());
-			}
-		}
-		else{
-			this.split(s,sp,append);
-		}
-	}
-	
-	public void split(String s,String sp,List append){
-		if(s==null || sp==null)
-			return;
-		int pos=0;
-		int prevPos=0;
-		do{
-			prevPos=pos;
-			pos=s.indexOf(sp,pos);
-			if(pos==-1)
-				break;
-			append.add(s.substring(prevPos,pos).trim());
-			pos+=sp.length();
-		}while(pos!=-1);
-		append.add(s.substring(prevPos).trim());
-	}
-	
-	public void setSP(String sp){
-		this.sp=sp;
-	}
-	
-	public void add(int i,String item){
-		if(item==null)
-			return;
-		items.add(i,item.trim());
-	}
-
-	public void add(String item){
-		if(item==null)
-			return;
-		items.add(item.trim());
-	}
-	
-	public void addAll(ItemList list){
-		items.addAll(list.items);
-	}
-	
-	public void addAll(String s){
-		this.split(s,sp,items);
-	}
-	
-	public void addAll(String s,String sp){
-		this.split(s,sp,items);
-	}
-	
-	public void addAll(String s,String sp,boolean isMultiToken){
-		this.split(s,sp,items,isMultiToken);
-	}
-	
-	/**
-	 * @param i 0-based
-	 * @return
-	 */
-	public String get(int i){
-		return (String)items.get(i);
-	}
-	
-	public int size(){
-		return items.size();
-	}
-
-	public String toString(){
-		return toString(sp);
-	}
-	
-	public String toString(String sp){
-		StringBuffer sb=new StringBuffer();
-		
-		for(int i=0;i<items.size();i++){
-			if(i==0)
-				sb.append(items.get(i));
-			else{
-				sb.append(sp);
-				sb.append(items.get(i));
-			}
-		}
-		return sb.toString();
-
-	}
-	
-	public void clear(){
-		items.clear();
-	}
-	
-	public void reset(){
-		sp=",";
-		items.clear();
-	}
-}
diff --git a/src/org/json/simple/JSONArray.java b/src/org/json/simple/JSONArray.java
index 318f5cb..b758ec6 100644
--- a/src/org/json/simple/JSONArray.java
+++ b/src/org/json/simple/JSONArray.java
@@ -13,19 +13,21 @@ import java.util.Iterator;
  */
 public class JSONArray extends ArrayList {
 	public String toString(){
-		ItemList list=new ItemList();
-		
 		Iterator iter=iterator();
-		
+
+        boolean first = true;
+        StringBuffer sb = new StringBuffer();
+        sb.append('[');
 		while(iter.hasNext()){
-			Object value=iter.next();				
-			if(value instanceof String){
-				list.add("\""+JSONObject.escape((String)value)+"\"");
-			}
-			else
-				list.add(String.valueOf(value));
+            if (first) {
+                first = false;
+            } else {
+                sb.append(',');
+            }
+            JSONObject.escapeValue(iter.next(), sb);
 		}
-		return "["+list.toString()+"]";
+        sb.append(']');
+        return sb.toString();
 	}
 		
 }
diff --git a/src/org/json/simple/JSONObject.java b/src/org/json/simple/JSONObject.java
index d6d0c05..d6fe95d 100644
--- a/src/org/json/simple/JSONObject.java
+++ b/src/org/json/simple/JSONObject.java
@@ -14,37 +14,47 @@ import java.util.Map;
 public class JSONObject extends HashMap{
 	
 	public String toString(){
-		ItemList list=new ItemList();
 		Iterator iter=entrySet().iterator();
-		
+
+        boolean first = true;
+        StringBuffer sb = new StringBuffer();
+        sb.append('{');
 		while(iter.hasNext()){
+            if (first) {
+                first = false;
+            } else {
+                sb.append(',');
+            }
 			Map.Entry entry=(Map.Entry)iter.next();
-			list.add(toString(entry.getKey().toString(),entry.getValue()));
+			toString(entry.getKey().toString(), entry.getValue(), sb);
 		}
-		return "{"+list.toString()+"}";
+        sb.append('}');
+        return sb.toString();
 	}
 	
-	public static String toString(String key,Object value){
-		StringBuffer sb=new StringBuffer();
-		
-		sb.append("\"");
-		sb.append(escape(key));
+	public static String toString(String key, Object value){
+        return toString(key, value, new StringBuffer()).toString();
+    }
+
+    private static StringBuffer toString(String key, Object value, StringBuffer sb){
+        sb.append('\"');
+        escape(key, sb);
 		sb.append("\":");
-		if(value==null){
-			sb.append("null");
-			return sb.toString();
-		}
-		
-		if(value instanceof String){
-			sb.append("\"");
-			sb.append(escape((String)value));
-			sb.append("\"");
-		}
-		else
-			sb.append(value);
-		return sb.toString();
+        escapeValue(value, sb);
+        return sb;
 	}
-	
+
+    // Package-protected for JSONArray
+    static void escapeValue(Object value, StringBuffer sb) {
+		if (value instanceof String){
+			sb.append('\"');
+			escape((String) value, sb);
+			sb.append('\"');
+		} else {
+            sb.append(String.valueOf(value));
+        }
+    }
+
 	/**
 	 * " => \" , \ => \\
 	 * @param s
@@ -53,7 +63,13 @@ public class JSONObject extends HashMap{
 	public static String escape(String s){
 		if(s==null)
 			return null;
-		StringBuffer sb=new StringBuffer();
+        StringBuffer sb = new StringBuffer();
+        escape(s, sb);
+        return sb.toString();
+    }
+
+    // Package-protected for JSONArray
+    static void escape(String s, StringBuffer sb) {
 		for(int i=0;i<s.length();i++){
 			char ch=s.charAt(i);
 			switch(ch){
@@ -104,6 +120,5 @@ public class JSONObject extends HashMap{
 				}
 			}
 		}//for
-		return sb.toString();
 	}
 }