summaryrefslogtreecommitdiff
path: root/src/main/scala/cc/spray/json/JsValue.scala
diff options
context:
space:
mode:
authorMathias <mathias@spray.cc>2011-11-09 11:42:25 +0100
committerMathias <mathias@spray.cc>2011-11-09 12:40:16 +0100
commit6cbaa4c1782bcb4060af9f8ef2fd72e737f7982a (patch)
tree32039efb3097ff16686819806da842539185d27f /src/main/scala/cc/spray/json/JsValue.scala
parent9cda445514efe7700544e2b121c2258a69b9b207 (diff)
downloadspray-json-6cbaa4c1782bcb4060af9f8ef2fd72e737f7982a.tar.gz
spray-json-6cbaa4c1782bcb4060af9f8ef2fd72e737f7982a.tar.bz2
spray-json-6cbaa4c1782bcb4060af9f8ef2fd72e737f7982a.zip
Fix #6 (rename JsValue:fromJson to 'convertTo', add .prettyPrint and .compactPrint
Diffstat (limited to 'src/main/scala/cc/spray/json/JsValue.scala')
-rw-r--r--src/main/scala/cc/spray/json/JsValue.scala9
1 files changed, 7 insertions, 2 deletions
diff --git a/src/main/scala/cc/spray/json/JsValue.scala b/src/main/scala/cc/spray/json/JsValue.scala
index e4ab734..86d4101 100644
--- a/src/main/scala/cc/spray/json/JsValue.scala
+++ b/src/main/scala/cc/spray/json/JsValue.scala
@@ -24,9 +24,14 @@ import collection.mutable.ListBuffer
* The general type of a JSON AST node.
*/
sealed trait JsValue {
- override def toString = CompactPrinter(this)
+ override def toString = compactPrint
def toString(printer: (JsValue => String)) = printer(this)
- def fromJson[T :JsonReader]: T = jsonReader[T].read(this)
+ def compactPrint = CompactPrinter(this)
+ def prettyPrint = PrettyPrinter(this)
+ def convertTo[T :JsonReader]: T = jsonReader[T].read(this)
+
+ @deprecated("Superceded by 'convertTo'", "1.1.0")
+ def fromJson[T :JsonReader]: T = convertTo
}
object JsValue {