diff options
-rw-r--r-- | src/library/scala/xml/factory/XMLLoader.scala | 1 | ||||
-rw-r--r-- | src/library/scala/xml/include/sax/XIncludeFilter.scala | 4 | ||||
-rw-r--r-- | src/library/scala/xml/include/sax/XIncluder.scala | 2 | ||||
-rw-r--r-- | src/library/scala/xml/package.scala | 7 |
4 files changed, 5 insertions, 9 deletions
diff --git a/src/library/scala/xml/factory/XMLLoader.scala b/src/library/scala/xml/factory/XMLLoader.scala index 8bb0cf4188..6321c10e97 100644 --- a/src/library/scala/xml/factory/XMLLoader.scala +++ b/src/library/scala/xml/factory/XMLLoader.scala @@ -14,6 +14,7 @@ package factory import javax.xml.parsers.SAXParserFactory import parsing.{ FactoryAdapter, NoBindingFactoryAdapter } import java.io.{ InputStream, Reader, StringReader, File, FileDescriptor, FileInputStream } +import java.net.URL /** Presents collection of XML loading methods which use the parser * created by "def parser". diff --git a/src/library/scala/xml/include/sax/XIncludeFilter.scala b/src/library/scala/xml/include/sax/XIncludeFilter.scala index 6e64fa9aa5..b5c468dc81 100644 --- a/src/library/scala/xml/include/sax/XIncludeFilter.scala +++ b/src/library/scala/xml/include/sax/XIncludeFilter.scala @@ -10,13 +10,15 @@ package scala.xml package include.sax + import scala.xml.include._ import org.xml.sax.{ Attributes, XMLReader, Locator } import org.xml.sax.helpers.{ XMLReaderFactory, XMLFilterImpl, NamespaceSupport, AttributesImpl } -import java.io.{ InputStream, BufferedInputStream, InputStreamReader } +import java.io.{ InputStream, BufferedInputStream, InputStreamReader, IOException, UnsupportedEncodingException } import java.util.Stack +import java.net.{ URL, MalformedURLException } /** * <p> diff --git a/src/library/scala/xml/include/sax/XIncluder.scala b/src/library/scala/xml/include/sax/XIncluder.scala index bd9da10c59..8bc3c4e41a 100644 --- a/src/library/scala/xml/include/sax/XIncluder.scala +++ b/src/library/scala/xml/include/sax/XIncluder.scala @@ -16,7 +16,7 @@ import collection.mutable.Stack import org.xml.sax.{ ContentHandler, XMLReader, Locator, Attributes } import org.xml.sax.ext.LexicalHandler -import java.io.{ File, OutputStream, OutputStreamWriter, Writer } +import java.io.{ File, OutputStream, OutputStreamWriter, Writer, IOException } /** XIncluder is a SAX <code>ContentHandler</code> * that writes its XML document onto an output stream after resolving diff --git a/src/library/scala/xml/package.scala b/src/library/scala/xml/package.scala index 33639ed978..dec05abd2a 100644 --- a/src/library/scala/xml/package.scala +++ b/src/library/scala/xml/package.scala @@ -7,12 +7,5 @@ package object xml { type SAXParseException = org.xml.sax.SAXParseException type EntityResolver = org.xml.sax.EntityResolver type InputSource = org.xml.sax.InputSource - type SAXParser = javax.xml.parsers.SAXParser - - type IOException = java.io.IOException - type UnsupportedEncodingException = java.io.UnsupportedEncodingException - - type URL = java.net.URL - type MalformedURLException = java.net.MalformedURLException }
\ No newline at end of file |