Tore out some unnecessary ambiguity-creating al...

Tore out some unnecessary ambiguity-creating aliases in the XML package
object. I have a feeling we'll be traversing this kind of territory
again. Closes #3264, no review.

Author: paulp

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".

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>

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

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
 }