From 537b80d752881575adb55a4c20b8d805051d2cfa Mon Sep 17 00:00:00 2001 From: buraq Date: Thu, 9 Jun 2005 12:27:47 +0000 Subject: hello --- config/list/library.lst | 1 + sources/scala/util/logging/Logged.scala | 2 +- sources/scala/xml/parsing/ConstructingParser.scala | 1 - sources/scala/xml/parsing/DefaultMarkupHandler.scala | 16 ++++++++++++++++ sources/scala/xml/parsing/MarkupParser.scala | 4 ++-- sources/scala/xml/parsing/ValidatingMarkupHandler.scala | 2 ++ 6 files changed, 22 insertions(+), 4 deletions(-) create mode 100644 sources/scala/xml/parsing/DefaultMarkupHandler.scala diff --git a/config/list/library.lst b/config/list/library.lst index 85b3ffda7c..3136ff6229 100644 --- a/config/list/library.lst +++ b/config/list/library.lst @@ -256,6 +256,7 @@ xml/factory/LoggedNodeFactory.scala xml/parsing/ConstructingHandler.scala xml/parsing/ConstructingParser.scala +xml/parsing/DefaultMarkupHandler.scala xml/parsing/ExternalSources.scala xml/parsing/FatalError.scala xml/parsing/MarkupHandler.scala diff --git a/sources/scala/util/logging/Logged.scala b/sources/scala/util/logging/Logged.scala index 7e34ff64f3..a19429c1f6 100644 --- a/sources/scala/util/logging/Logged.scala +++ b/sources/scala/util/logging/Logged.scala @@ -19,5 +19,5 @@ trait Logged { /** this method should log the message given as argument somewhere * as a side-effect */ - def log(msg:String): Unit; + def log(msg:String): Unit = {}; } diff --git a/sources/scala/xml/parsing/ConstructingParser.scala b/sources/scala/xml/parsing/ConstructingParser.scala index e0c94833e6..7d1f06c15f 100644 --- a/sources/scala/xml/parsing/ConstructingParser.scala +++ b/sources/scala/xml/parsing/ConstructingParser.scala @@ -38,6 +38,5 @@ with MarkupParser { val preserveWS = presWS; val input = inp; - val handle = this; } diff --git a/sources/scala/xml/parsing/DefaultMarkupHandler.scala b/sources/scala/xml/parsing/DefaultMarkupHandler.scala new file mode 100644 index 0000000000..14fd8ec9a7 --- /dev/null +++ b/sources/scala/xml/parsing/DefaultMarkupHandler.scala @@ -0,0 +1,16 @@ +package scala.xml.parsing; + +/** default implemenation of markup handler always returns NodeSeq.Empty */ +abstract class DefaultMarkupHandler extends MarkupHandler { + + def elem(pos: int, pre: String, label: String, attrs: MetaData, scope:NamespaceBinding, args: NodeSeq) = NodeSeq.Empty; + + def procInstr(pos: Int, target: String, txt: String) = NodeSeq.Empty; + + def comment(pos: Int, comment: String ): NodeSeq = NodeSeq.Empty; + + def entityRef(pos: Int, n: String) = NodeSeq.Empty; + + def text(pos: Int, txt:String) = NodeSeq.Empty; + +} diff --git a/sources/scala/xml/parsing/MarkupParser.scala b/sources/scala/xml/parsing/MarkupParser.scala index 524c029475..012d8cbdaa 100644 --- a/sources/scala/xml/parsing/MarkupParser.scala +++ b/sources/scala/xml/parsing/MarkupParser.scala @@ -38,8 +38,8 @@ abstract class MarkupParser: (MarkupParser with MarkupHandler) extends AnyRef wi var curInput: Source = input; - /** the handler of the markup, should return this */ - val handle: MarkupHandler; + /** the handler of the markup, returns this */ + private val handle: MarkupHandler = this; /** stack of inputs */ var inpStack: List[Source] = Nil; diff --git a/sources/scala/xml/parsing/ValidatingMarkupHandler.scala b/sources/scala/xml/parsing/ValidatingMarkupHandler.scala index 15eddbf5ce..c81b2b8f3e 100644 --- a/sources/scala/xml/parsing/ValidatingMarkupHandler.scala +++ b/sources/scala/xml/parsing/ValidatingMarkupHandler.scala @@ -14,6 +14,8 @@ abstract class ValidatingMarkupHandler extends MarkupHandler with Logged { final override val isValidating = true; + override def log(msg:String) = {}; + /* override def checkChildren(pos:int, pre: String, label:String,ns:NodeSeq): Unit = { Console.println("checkChildren()"); -- cgit v1.2.3