From e60aae5374172f773db9665e6668ddc569d51989 Mon Sep 17 00:00:00 2001
From: James Strachan <james.strachan@gmail.com>
Date: Wed, 18 Apr 2012 08:38:29 +0100
Subject: [PATCH] added parseXml() helper methods

---
 libraries/stdlib/src/kotlin/dom/DomJVM.kt | 50 ++++++++++++++++++++++-
 1 file changed, 48 insertions(+), 2 deletions(-)

diff --git a/libraries/stdlib/src/kotlin/dom/DomJVM.kt b/libraries/stdlib/src/kotlin/dom/DomJVM.kt
index 97431099d8d..3cbce87851c 100644
--- a/libraries/stdlib/src/kotlin/dom/DomJVM.kt
+++ b/libraries/stdlib/src/kotlin/dom/DomJVM.kt
@@ -18,6 +18,9 @@ import java.lang.Iterable
 import java.util.List
 import java.util.Collection
 import java.io.Writer
+import java.io.File
+import java.io.InputStream
+import org.xml.sax.InputSource
 
 /** Creates a new document with the given document builder*/
 public fun createDocument(builder: DocumentBuilder): Document {
@@ -25,10 +28,53 @@ public fun createDocument(builder: DocumentBuilder): Document {
 }
 
 /** Creates a new document with an optional DocumentBuilderFactory */
-public fun createDocument(builderFactory: DocumentBuilderFactory = DocumentBuilderFactory.newInstance().sure()): Document {
-    return createDocument(builderFactory.newDocumentBuilder().sure())
+public fun createDocument(builderFactory: DocumentBuilderFactory = defaultDocumentBuilderFactory()): Document {
+    return createDocument(builderFactory.newDocumentBuilder()!!)
 }
 
+/**
+ * Returns the default [[DocumentBuilderFactory]]
+ */
+public fun defaultDocumentBuilderFactory(): DocumentBuilderFactory {
+    return DocumentBuilderFactory.newInstance()!!
+}
+
+/**
+ * Returns the default [[DocumentBuilder]]
+ */
+public fun defaultDocumentBuilder(builderFactory: DocumentBuilderFactory = defaultDocumentBuilderFactory()): DocumentBuilder {
+    return builderFactory.newDocumentBuilder()!!
+}
+
+/**
+ * Parses the XML document using the given *file*
+ */
+public fun parseXml(file: File, builder: DocumentBuilder = defaultDocumentBuilder()): Document {
+    return builder.parse(file)!!
+}
+
+/**
+ * Parses the XML document using the given *uri*
+ */
+public fun parseXml(uri: String, builder: DocumentBuilder = defaultDocumentBuilder()): Document {
+    return builder.parse(uri)!!
+}
+
+/**
+ * Parses the XML document using the given *inputStream*
+ */
+public fun parseXml(inputStream: InputStream, builder: DocumentBuilder = defaultDocumentBuilder()): Document {
+    return builder.parse(inputStream)!!
+}
+
+/**
+ * Parses the XML document using the given *inputSource*
+ */
+public fun parseXml(inputSource: InputSource, builder: DocumentBuilder = defaultDocumentBuilder()): Document {
+    return builder.parse(inputSource)!!
+}
+
+
 /** Creates a new TrAX transformer */
 public fun createTransformer(source: Source? = null, factory: TransformerFactory = TransformerFactory.newInstance().sure()): Transformer {
     val transformer = if (source != null) {