summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPaul Phillips <paulp@improving.org>2009-12-31 21:37:32 +0000
committerPaul Phillips <paulp@improving.org>2009-12-31 21:37:32 +0000
commite132d06e6b58c11b31824d1c9d4085636961e5f1 (patch)
treef25b98a847471136395377a8e594149f0a2e1b96 /src
parentb858cef58795459435c10fa06e5db8f2e6d9ca8e (diff)
downloadscala-e132d06e6b58c11b31824d1c9d4085636961e5f1.tar.gz
scala-e132d06e6b58c11b31824d1c9d4085636961e5f1.tar.bz2
scala-e132d06e6b58c11b31824d1c9d4085636961e5f1.zip
Added an XML.load overload which takes an URL.
Diffstat (limited to 'src')
-rw-r--r--src/library/scala/xml/factory/XMLLoader.scala4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/library/scala/xml/factory/XMLLoader.scala b/src/library/scala/xml/factory/XMLLoader.scala
index b167029907..a1bca21b40 100644
--- a/src/library/scala/xml/factory/XMLLoader.scala
+++ b/src/library/scala/xml/factory/XMLLoader.scala
@@ -15,6 +15,7 @@ import parsing.{ FactoryAdapter, NoBindingFactoryAdapter }
import org.xml.sax.InputSource
import java.io.{ InputStream, Reader, StringReader, File, FileDescriptor, FileInputStream }
import javax.xml.parsers.{ SAXParser, SAXParserFactory }
+import java.net.URL
/** Presents collection of XML loading methods which use the parser
* created by "def parser".
@@ -53,11 +54,12 @@ trait XMLLoader[T <: Node]
def loadFile(fd: FileDescriptor): T = loadXML(fromFile(fd), parser)
def loadFile(name: String): T = loadXML(fromFile(name), parser)
- /** loads XML from given InputStream, Reader, sysID, or InputSource. */
+ /** loads XML from given InputStream, Reader, sysID, InputSource, or URL. */
def load(is: InputStream): T = loadXML(fromInputStream(is), parser)
def load(reader: Reader): T = loadXML(fromReader(reader), parser)
def load(sysID: String): T = loadXML(fromSysId(sysID), parser)
def load(source: InputSource): T = loadXML(source, parser)
+ def load(url: URL): T = loadXML(fromInputStream(url.openStream()), parser)
/** Loads XML from the given String. */
def loadString(string: String): T = loadXML(fromString(string), parser)