From 5252f044512e2b5344c403c80ace22525ddf8e40 Mon Sep 17 00:00:00 2001
From: Ziver Koc <ziver@koc.se>
Date: Fri, 2 Jul 2010 21:39:59 +0000
Subject: [PATCH] Fixed some things

---
 src/zutil/parser/json/JSONNode.java   | 21 +++++++++++++++++++++
 src/zutil/parser/json/JSONWriter.java | 23 +++++++++++++++++++++--
 2 files changed, 42 insertions(+), 2 deletions(-)

diff --git a/src/zutil/parser/json/JSONNode.java b/src/zutil/parser/json/JSONNode.java
index a191806..efa3e39 100644
--- a/src/zutil/parser/json/JSONNode.java
+++ b/src/zutil/parser/json/JSONNode.java
@@ -44,6 +44,13 @@ public class JSONNode implements Iterable<JSONNode>{
 		this.type = JSONType.Number;
 		this.value = ""+value;
 	}
+	/**
+	 * Creates an instance with an long value
+	 */
+	public JSONNode(long value){
+		this.type = JSONType.Number;
+		this.value = ""+value;
+	}
 	/**
 	 * Creates an instance with an String value
 	 */
@@ -130,6 +137,9 @@ public class JSONNode implements Iterable<JSONNode>{
 	public void add(double value){
 		list.add(new JSONNode( value ));
 	}
+	public void add(long value){
+		list.add(new JSONNode( value ));
+	}
 	public void add(String value){
 		list.add(new JSONNode( value ));
 	}
@@ -148,6 +158,9 @@ public class JSONNode implements Iterable<JSONNode>{
 	public void add(String key, double value){
 		map.put(key, new JSONNode(value));
 	}
+	public void add(String key, long value){
+		map.put(key, new JSONNode(value));
+	}
 	public void add(String key, String value){
 		map.put(key, new JSONNode(value));
 	}
@@ -175,6 +188,14 @@ public class JSONNode implements Iterable<JSONNode>{
 		type = JSONType.Boolean;
 		this.value = ""+value;
 	}
+	/**
+	 * Sets the value of the node, but only if it is setup as an JSONType.Value
+	 */
+	public void set(long value){
+		if( !this.isValue() ) throw new NullPointerException("The node is not setup as a value");
+		type = JSONType.Number;
+		this.value = ""+value;
+	}
 	/**
 	 * Sets the value of the node, but only if it is setup as an JSONType.Value
 	 */
diff --git a/src/zutil/parser/json/JSONWriter.java b/src/zutil/parser/json/JSONWriter.java
index 8bec175..d5c369d 100644
--- a/src/zutil/parser/json/JSONWriter.java
+++ b/src/zutil/parser/json/JSONWriter.java
@@ -2,6 +2,7 @@ package zutil.parser.json;
 
 import java.io.OutputStream;
 import java.io.PrintStream;
+import java.io.PrintWriter;
 import java.util.Iterator;
 
 import zutil.parser.json.JSONNode.JSONType;
@@ -12,7 +13,7 @@ import zutil.parser.json.JSONNode.JSONType;
  * @author Ziver
  */
 public class JSONWriter{
-	private PrintStream out;
+	private PrintWriter out;
 	
 	/**
 	 * Creates a new instance of the writer
@@ -20,7 +21,25 @@ public class JSONWriter{
 	 * @param out the OutputStream that the Nodes will be sent to
 	 */
 	public JSONWriter(OutputStream out){
-		this.out = new PrintStream(out);
+		this( new PrintWriter(out) );
+	}
+	
+	/**
+	 * Creates a new instance of the writer
+	 * 
+	 * @param out the OutputStream that the Nodes will be sent to
+	 */
+	public JSONWriter(PrintStream out){
+		this( new PrintWriter(out) );
+	}
+	
+	/**
+	 * Creates a new instance of the writer
+	 * 
+	 * @param out the OutputStream that the Nodes will be sent to
+	 */
+	public JSONWriter(PrintWriter out){
+		this.out = out;
 	}
 	
 	/**