diff options
Diffstat (limited to 'src/library/scala/xml')
45 files changed, 96 insertions, 49 deletions
diff --git a/src/library/scala/xml/dtd/ContentModel.scala b/src/library/scala/xml/dtd/ContentModel.scala index 24d7840ec3..085d33f56a 100644 --- a/src/library/scala/xml/dtd/ContentModel.scala +++ b/src/library/scala/xml/dtd/ContentModel.scala @@ -9,7 +9,8 @@ // $Id$ -package scala.xml.dtd +package scala.xml +package dtd import scala.util.regexp.WordExp import scala.util.automata.{DetWordAutom, SubsetConstruction, WordBerrySethi} diff --git a/src/library/scala/xml/dtd/ContentModelParser.scala b/src/library/scala/xml/dtd/ContentModelParser.scala index d9912ee0f8..a7c1f3b4e1 100644 --- a/src/library/scala/xml/dtd/ContentModelParser.scala +++ b/src/library/scala/xml/dtd/ContentModelParser.scala @@ -9,7 +9,8 @@ // $Id$ -package scala.xml.dtd +package scala.xml +package dtd /** Parser for regexps (content models in DTD element declarations) */ diff --git a/src/library/scala/xml/dtd/DTD.scala b/src/library/scala/xml/dtd/DTD.scala index a64e40fa92..d5654d4ee6 100644 --- a/src/library/scala/xml/dtd/DTD.scala +++ b/src/library/scala/xml/dtd/DTD.scala @@ -9,7 +9,8 @@ // $Id$ -package scala.xml.dtd +package scala.xml +package dtd import scala.collection.mutable.{HashMap, Map} diff --git a/src/library/scala/xml/dtd/Decl.scala b/src/library/scala/xml/dtd/Decl.scala index af7ef47fef..9f987b4175 100644 --- a/src/library/scala/xml/dtd/Decl.scala +++ b/src/library/scala/xml/dtd/Decl.scala @@ -9,7 +9,9 @@ // $Id$ -package scala.xml.dtd +package scala.xml +package dtd + import Utility.sbToString abstract class Decl diff --git a/src/library/scala/xml/dtd/DocType.scala b/src/library/scala/xml/dtd/DocType.scala index eb5eb27c55..3f95f0f87d 100644 --- a/src/library/scala/xml/dtd/DocType.scala +++ b/src/library/scala/xml/dtd/DocType.scala @@ -9,7 +9,8 @@ // $Id$ -package scala.xml.dtd +package scala.xml +package dtd /** An XML node for document type declaration. * diff --git a/src/library/scala/xml/dtd/DtdTypeSymbol.scala b/src/library/scala/xml/dtd/DtdTypeSymbol.scala index 8b857db9a4..10930261ae 100644 --- a/src/library/scala/xml/dtd/DtdTypeSymbol.scala +++ b/src/library/scala/xml/dtd/DtdTypeSymbol.scala @@ -9,7 +9,8 @@ // $Id$ -package scala.xml.dtd +package scala.xml +package dtd trait DtdTypeSymbol diff --git a/src/library/scala/xml/dtd/ElementValidator.scala b/src/library/scala/xml/dtd/ElementValidator.scala index 53fe483bc2..cb64c20f8d 100644 --- a/src/library/scala/xml/dtd/ElementValidator.scala +++ b/src/library/scala/xml/dtd/ElementValidator.scala @@ -9,8 +9,8 @@ // $Id$ -package scala.xml.dtd - +package scala.xml +package dtd import ContentModel.ElemName import scala.util.automata._ diff --git a/src/library/scala/xml/dtd/ExternalID.scala b/src/library/scala/xml/dtd/ExternalID.scala index c59a5032c8..2df8994d17 100644 --- a/src/library/scala/xml/dtd/ExternalID.scala +++ b/src/library/scala/xml/dtd/ExternalID.scala @@ -9,7 +9,8 @@ // $Id$ -package scala.xml.dtd +package scala.xml +package dtd /** an ExternalIDs - either PublicID or SystemID * diff --git a/src/library/scala/xml/dtd/Scanner.scala b/src/library/scala/xml/dtd/Scanner.scala index 49f36aabf9..abef812422 100644 --- a/src/library/scala/xml/dtd/Scanner.scala +++ b/src/library/scala/xml/dtd/Scanner.scala @@ -9,7 +9,8 @@ // $Id$ -package scala.xml.dtd +package scala.xml +package dtd /** Scanner for regexps (content models in DTD element declarations) diff --git a/src/library/scala/xml/dtd/Tokens.scala b/src/library/scala/xml/dtd/Tokens.scala index 73834e3838..c3466ee0e7 100644 --- a/src/library/scala/xml/dtd/Tokens.scala +++ b/src/library/scala/xml/dtd/Tokens.scala @@ -9,7 +9,8 @@ // $Id$ -package scala.xml.dtd +package scala.xml +package dtd class Tokens { diff --git a/src/library/scala/xml/dtd/ValidationException.scala b/src/library/scala/xml/dtd/ValidationException.scala index a05233a031..b77aab7d6c 100644 --- a/src/library/scala/xml/dtd/ValidationException.scala +++ b/src/library/scala/xml/dtd/ValidationException.scala @@ -9,7 +9,8 @@ // $Id$ -package scala.xml.dtd +package scala.xml +package dtd case class ValidationException(e: String) extends Exception(e) diff --git a/src/library/scala/xml/factory/Binder.scala b/src/library/scala/xml/factory/Binder.scala index b53aa64d9b..e2e0821aaf 100644 --- a/src/library/scala/xml/factory/Binder.scala +++ b/src/library/scala/xml/factory/Binder.scala @@ -9,8 +9,8 @@ // $Id$ -package scala.xml.factory - +package scala.xml +package factory import scala.xml.parsing.ValidatingMarkupHandler diff --git a/src/library/scala/xml/factory/LoggedNodeFactory.scala b/src/library/scala/xml/factory/LoggedNodeFactory.scala index 5fee5a5a2b..1b12b63dcc 100644 --- a/src/library/scala/xml/factory/LoggedNodeFactory.scala +++ b/src/library/scala/xml/factory/LoggedNodeFactory.scala @@ -9,7 +9,8 @@ // $Id$ -package scala.xml.factory +package scala.xml +package factory /** <p> diff --git a/src/library/scala/xml/factory/NodeFactory.scala b/src/library/scala/xml/factory/NodeFactory.scala index 718240760d..5b4ba2d822 100644 --- a/src/library/scala/xml/factory/NodeFactory.scala +++ b/src/library/scala/xml/factory/NodeFactory.scala @@ -8,7 +8,8 @@ // $Id$ -package scala.xml.factory +package scala.xml +package factory import parsing.{ FactoryAdapter, NoBindingFactoryAdapter } import org.xml.sax.InputSource diff --git a/src/library/scala/xml/factory/XMLLoader.scala b/src/library/scala/xml/factory/XMLLoader.scala index 8526d6d623..50ad1cfc25 100644 --- a/src/library/scala/xml/factory/XMLLoader.scala +++ b/src/library/scala/xml/factory/XMLLoader.scala @@ -8,7 +8,8 @@ // $Id$ -package scala.xml.factory +package scala.xml +package factory import parsing.{ FactoryAdapter, NoBindingFactoryAdapter } import org.xml.sax.InputSource @@ -57,4 +58,4 @@ trait XMLLoader[T <: Node] /** Loads XML from the given String. */ def loadString(string: String): T = loadXML(fromString(string), parser) -}
\ No newline at end of file +} diff --git a/src/library/scala/xml/include/CircularIncludeException.scala b/src/library/scala/xml/include/CircularIncludeException.scala index 300267ad79..94efca2b02 100644 --- a/src/library/scala/xml/include/CircularIncludeException.scala +++ b/src/library/scala/xml/include/CircularIncludeException.scala @@ -8,7 +8,8 @@ // $Id$ -package scala.xml.include +package scala.xml +package include /** * <p> diff --git a/src/library/scala/xml/include/UnavailableResourceException.scala b/src/library/scala/xml/include/UnavailableResourceException.scala index 2510916f83..d2e26e0d19 100644 --- a/src/library/scala/xml/include/UnavailableResourceException.scala +++ b/src/library/scala/xml/include/UnavailableResourceException.scala @@ -8,7 +8,8 @@ // $Id$ -package scala.xml.include +package scala.xml +package include /** * <p> diff --git a/src/library/scala/xml/include/XIncludeException.scala b/src/library/scala/xml/include/XIncludeException.scala index 6580957897..83a339562a 100644 --- a/src/library/scala/xml/include/XIncludeException.scala +++ b/src/library/scala/xml/include/XIncludeException.scala @@ -8,7 +8,8 @@ // $Id$ -package scala.xml.include +package scala.xml +package include /** * <p> diff --git a/src/library/scala/xml/include/sax/EncodingHeuristics.scala b/src/library/scala/xml/include/sax/EncodingHeuristics.scala index 888cf378f1..ad08ef68cf 100644 --- a/src/library/scala/xml/include/sax/EncodingHeuristics.scala +++ b/src/library/scala/xml/include/sax/EncodingHeuristics.scala @@ -8,7 +8,9 @@ // $Id$ -package scala.xml.include.sax +package scala.xml +package include.sax +import scala.xml.include._ import java.io.InputStream import scala.util.matching.Regex diff --git a/src/library/scala/xml/include/sax/Main.scala b/src/library/scala/xml/include/sax/Main.scala index 5190b98fea..23b379af2b 100644 --- a/src/library/scala/xml/include/sax/Main.scala +++ b/src/library/scala/xml/include/sax/Main.scala @@ -8,7 +8,9 @@ // $Id$ -package scala.xml.include.sax +package scala.xml +package include.sax +import scala.xml.include._ import org.xml.sax.SAXException import org.xml.sax.SAXParseException diff --git a/src/library/scala/xml/include/sax/XIncludeFilter.scala b/src/library/scala/xml/include/sax/XIncludeFilter.scala index e4b1d4fbc8..ed8953ea69 100644 --- a/src/library/scala/xml/include/sax/XIncludeFilter.scala +++ b/src/library/scala/xml/include/sax/XIncludeFilter.scala @@ -8,7 +8,9 @@ // $Id$ -package scala.xml.include.sax +package scala.xml +package include.sax +import scala.xml.include._ import org.xml.sax.Attributes import org.xml.sax.SAXException diff --git a/src/library/scala/xml/include/sax/XIncluder.scala b/src/library/scala/xml/include/sax/XIncluder.scala index 212ea79c99..d27c518488 100644 --- a/src/library/scala/xml/include/sax/XIncluder.scala +++ b/src/library/scala/xml/include/sax/XIncluder.scala @@ -8,7 +8,9 @@ // $Id$ -package scala.xml.include.sax +package scala.xml +package include.sax +import scala.xml.include._ import org.xml.sax.SAXException import org.xml.sax.SAXParseException diff --git a/src/library/scala/xml/parsing/ConstructingHandler.scala b/src/library/scala/xml/parsing/ConstructingHandler.scala index f21cca2a7f..a213a72590 100644 --- a/src/library/scala/xml/parsing/ConstructingHandler.scala +++ b/src/library/scala/xml/parsing/ConstructingHandler.scala @@ -9,7 +9,8 @@ // $Id$ -package scala.xml.parsing +package scala.xml +package parsing /** Implementation of MarkupHandler that constructs nodes. * diff --git a/src/library/scala/xml/parsing/ConstructingParser.scala b/src/library/scala/xml/parsing/ConstructingParser.scala index 1a5119baf8..623d2e3f37 100644 --- a/src/library/scala/xml/parsing/ConstructingParser.scala +++ b/src/library/scala/xml/parsing/ConstructingParser.scala @@ -9,7 +9,8 @@ // $Id$ -package scala.xml.parsing +package scala.xml +package parsing import java.io.File diff --git a/src/library/scala/xml/parsing/DefaultMarkupHandler.scala b/src/library/scala/xml/parsing/DefaultMarkupHandler.scala index 9d2bdabaad..68750b6fa2 100644 --- a/src/library/scala/xml/parsing/DefaultMarkupHandler.scala +++ b/src/library/scala/xml/parsing/DefaultMarkupHandler.scala @@ -9,7 +9,8 @@ // $Id$ -package scala.xml.parsing +package scala.xml +package parsing /** default implemenation of markup handler always returns NodeSeq.Empty */ diff --git a/src/library/scala/xml/parsing/ExternalSources.scala b/src/library/scala/xml/parsing/ExternalSources.scala index 832da420c9..01bbcb356d 100644 --- a/src/library/scala/xml/parsing/ExternalSources.scala +++ b/src/library/scala/xml/parsing/ExternalSources.scala @@ -9,7 +9,8 @@ // $Id$ -package scala.xml.parsing +package scala.xml +package parsing import java.net.URL diff --git a/src/library/scala/xml/parsing/FactoryAdapter.scala b/src/library/scala/xml/parsing/FactoryAdapter.scala index f212761db6..8353f4177f 100644 --- a/src/library/scala/xml/parsing/FactoryAdapter.scala +++ b/src/library/scala/xml/parsing/FactoryAdapter.scala @@ -9,7 +9,8 @@ // $Id$ -package scala.xml.parsing +package scala.xml +package parsing import java.io.{InputStream, Reader, File, FileDescriptor, FileInputStream} import scala.collection.mutable.Stack diff --git a/src/library/scala/xml/parsing/FatalError.scala b/src/library/scala/xml/parsing/FatalError.scala index 8974629ee1..3a1f408df8 100644 --- a/src/library/scala/xml/parsing/FatalError.scala +++ b/src/library/scala/xml/parsing/FatalError.scala @@ -9,7 +9,8 @@ // $Id$ -package scala.xml.parsing; +package scala.xml +package parsing; case class FatalError(msg:String) extends java.lang.RuntimeException(msg); diff --git a/src/library/scala/xml/parsing/MarkupHandler.scala b/src/library/scala/xml/parsing/MarkupHandler.scala index e49254f386..62a87f286c 100644 --- a/src/library/scala/xml/parsing/MarkupHandler.scala +++ b/src/library/scala/xml/parsing/MarkupHandler.scala @@ -9,7 +9,8 @@ // $Id$ -package scala.xml.parsing +package scala.xml +package parsing import scala.collection.mutable.{HashMap, Map} import scala.io.Source diff --git a/src/library/scala/xml/parsing/MarkupParser.scala b/src/library/scala/xml/parsing/MarkupParser.scala index 369c0010e7..fa60329456 100644 --- a/src/library/scala/xml/parsing/MarkupParser.scala +++ b/src/library/scala/xml/parsing/MarkupParser.scala @@ -9,7 +9,8 @@ // $Id$ -package scala.xml.parsing +package scala.xml +package parsing import scala.io.Source import scala.xml.dtd._ diff --git a/src/library/scala/xml/parsing/NoBindingFactoryAdapter.scala b/src/library/scala/xml/parsing/NoBindingFactoryAdapter.scala index ee0b8a9ec0..6f01886bb2 100644 --- a/src/library/scala/xml/parsing/NoBindingFactoryAdapter.scala +++ b/src/library/scala/xml/parsing/NoBindingFactoryAdapter.scala @@ -8,7 +8,8 @@ // $Id$ -package scala.xml.parsing +package scala.xml +package parsing import scala.xml.factory.NodeFactory import org.xml.sax.InputSource diff --git a/src/library/scala/xml/parsing/TokenTests.scala b/src/library/scala/xml/parsing/TokenTests.scala index 2fd6e39ec7..e4d9b371f8 100644 --- a/src/library/scala/xml/parsing/TokenTests.scala +++ b/src/library/scala/xml/parsing/TokenTests.scala @@ -9,7 +9,8 @@ // $Id$ -package scala.xml.parsing; +package scala.xml +package parsing; /** diff --git a/src/library/scala/xml/parsing/ValidatingMarkupHandler.scala b/src/library/scala/xml/parsing/ValidatingMarkupHandler.scala index 087238ac3d..a1e191dea8 100644 --- a/src/library/scala/xml/parsing/ValidatingMarkupHandler.scala +++ b/src/library/scala/xml/parsing/ValidatingMarkupHandler.scala @@ -9,8 +9,8 @@ // $Id$ -package scala.xml.parsing - +package scala.xml +package parsing import scala.xml.dtd._ import scala.util.logging.Logged diff --git a/src/library/scala/xml/parsing/XhtmlEntities.scala b/src/library/scala/xml/parsing/XhtmlEntities.scala index 53dd24c140..bb704b3c06 100644 --- a/src/library/scala/xml/parsing/XhtmlEntities.scala +++ b/src/library/scala/xml/parsing/XhtmlEntities.scala @@ -9,7 +9,8 @@ // $Id$ -package scala.xml.parsing +package scala.xml +package parsing import scala.xml.dtd.{IntDef, ParsedEntityDecl} diff --git a/src/library/scala/xml/parsing/XhtmlParser.scala b/src/library/scala/xml/parsing/XhtmlParser.scala index 67482beb58..1b395a2739 100644 --- a/src/library/scala/xml/parsing/XhtmlParser.scala +++ b/src/library/scala/xml/parsing/XhtmlParser.scala @@ -9,7 +9,8 @@ // $Id$ -package scala.xml.parsing +package scala.xml +package parsing import scala.io.Source diff --git a/src/library/scala/xml/path/Expression.scala b/src/library/scala/xml/path/Expression.scala index b62414c889..30de790a3c 100644 --- a/src/library/scala/xml/path/Expression.scala +++ b/src/library/scala/xml/path/Expression.scala @@ -9,7 +9,8 @@ // $Id$ -package scala.xml.path +package scala.xml +package path object Expression { diff --git a/src/library/scala/xml/persistent/CachedFileStorage.scala b/src/library/scala/xml/persistent/CachedFileStorage.scala index aa958b68ea..923e8c2557 100644 --- a/src/library/scala/xml/persistent/CachedFileStorage.scala +++ b/src/library/scala/xml/persistent/CachedFileStorage.scala @@ -8,7 +8,8 @@ // $Id$ -package scala.xml.persistent +package scala.xml +package persistent import java.io.{File, FileOutputStream} import java.nio.ByteBuffer diff --git a/src/library/scala/xml/persistent/Index.scala b/src/library/scala/xml/persistent/Index.scala index 753bd964b0..b9d9debb7b 100644 --- a/src/library/scala/xml/persistent/Index.scala +++ b/src/library/scala/xml/persistent/Index.scala @@ -9,7 +9,8 @@ // $Id$ -package scala.xml.persistent +package scala.xml +package persistent /** an Index returns some unique key that is part of a node */ diff --git a/src/library/scala/xml/persistent/IndexedStorage.scala b/src/library/scala/xml/persistent/IndexedStorage.scala index 979a048b63..0f1200b76c 100644 --- a/src/library/scala/xml/persistent/IndexedStorage.scala +++ b/src/library/scala/xml/persistent/IndexedStorage.scala @@ -9,7 +9,8 @@ // $Id$ -package scala.xml.persistent +package scala.xml +package persistent import scala.collection.mutable import java.io.File diff --git a/src/library/scala/xml/persistent/SetStorage.scala b/src/library/scala/xml/persistent/SetStorage.scala index 90c59f80c3..b30e0ee080 100644 --- a/src/library/scala/xml/persistent/SetStorage.scala +++ b/src/library/scala/xml/persistent/SetStorage.scala @@ -8,7 +8,8 @@ // $Id$ -package scala.xml.persistent +package scala.xml +package persistent import scala.collection.mutable import java.io.File diff --git a/src/library/scala/xml/pull/XMLEvent.scala b/src/library/scala/xml/pull/XMLEvent.scala index e0956aae86..a2177d61c9 100644 --- a/src/library/scala/xml/pull/XMLEvent.scala +++ b/src/library/scala/xml/pull/XMLEvent.scala @@ -9,7 +9,8 @@ // $Id$ -package scala.xml.pull +package scala.xml +package pull /** This class represents an XML event for pull parsing. * Pull parsing means that during the traversal of the XML diff --git a/src/library/scala/xml/pull/XMLEventReader.scala b/src/library/scala/xml/pull/XMLEventReader.scala index dfb6ac4049..c32bd81f4b 100644 --- a/src/library/scala/xml/pull/XMLEventReader.scala +++ b/src/library/scala/xml/pull/XMLEventReader.scala @@ -8,7 +8,8 @@ // $Id$ -package scala.xml.pull +package scala.xml +package pull import java.util.concurrent.LinkedBlockingQueue import java.nio.channels.ClosedChannelException diff --git a/src/library/scala/xml/transform/BasicTransformer.scala b/src/library/scala/xml/transform/BasicTransformer.scala index 90e248019d..917884617c 100644 --- a/src/library/scala/xml/transform/BasicTransformer.scala +++ b/src/library/scala/xml/transform/BasicTransformer.scala @@ -9,7 +9,8 @@ // $Id$ -package scala.xml.transform +package scala.xml +package transform /** A class for XML transformations. * diff --git a/src/library/scala/xml/transform/RewriteRule.scala b/src/library/scala/xml/transform/RewriteRule.scala index 88de32599e..d2712f4552 100644 --- a/src/library/scala/xml/transform/RewriteRule.scala +++ b/src/library/scala/xml/transform/RewriteRule.scala @@ -9,7 +9,8 @@ // $Id$ -package scala.xml.transform +package scala.xml +package transform /** a RewriteRule, when applied to a term, yields either * the resulting of rewriting or the term itself it the rule diff --git a/src/library/scala/xml/transform/RuleTransformer.scala b/src/library/scala/xml/transform/RuleTransformer.scala index 52049115d5..7275c562ba 100644 --- a/src/library/scala/xml/transform/RuleTransformer.scala +++ b/src/library/scala/xml/transform/RuleTransformer.scala @@ -9,7 +9,8 @@ // $Id$ -package scala.xml.transform +package scala.xml +package transform class RuleTransformer(rules: RewriteRule*) extends BasicTransformer { override def transform(n: Node): Seq[Node] = |