diff --git a/shared/src/main/scala/scala/xml/dtd/ContentModelParser.scala b/shared/src/main/scala/scala/xml/dtd/ContentModelParser.scala index c69dca9f2..a5676052f 100644 --- a/shared/src/main/scala/scala/xml/dtd/ContentModelParser.scala +++ b/shared/src/main/scala/scala/xml/dtd/ContentModelParser.scala @@ -12,6 +12,7 @@ package dtd /** Parser for regexps (content models in DTD element declarations) */ +@deprecated("This object will be removed", "1.3.0") object ContentModelParser extends Scanner { // a bit too permissive concerning #PCDATA import ContentModel._ diff --git a/shared/src/main/scala/scala/xml/dtd/ElementValidator.scala b/shared/src/main/scala/scala/xml/dtd/ElementValidator.scala index 45618f06c..4f5d0097f 100644 --- a/shared/src/main/scala/scala/xml/dtd/ElementValidator.scala +++ b/shared/src/main/scala/scala/xml/dtd/ElementValidator.scala @@ -23,6 +23,7 @@ import impl._ * validate children and/or attributes of an element * exceptions are created but not thrown. */ +@deprecated("This class will be removed", "1.3.0") class ElementValidator() extends Function1[Node, Boolean] { private var exc: List[ValidationException] = Nil diff --git a/shared/src/main/scala/scala/xml/dtd/Scanner.scala b/shared/src/main/scala/scala/xml/dtd/Scanner.scala index cb042d5a9..4612e4ce8 100644 --- a/shared/src/main/scala/scala/xml/dtd/Scanner.scala +++ b/shared/src/main/scala/scala/xml/dtd/Scanner.scala @@ -16,6 +16,7 @@ import scala.collection.Seq * Scanner for regexps (content models in DTD element declarations) * todo: cleanup */ +@deprecated("This class will be removed", "1.3.0") class Scanner extends Tokens with parsing.TokenTests { final val ENDCH = '\u0000' diff --git a/shared/src/main/scala/scala/xml/factory/Binder.scala b/shared/src/main/scala/scala/xml/factory/Binder.scala index 3c1b595ac..24e81257f 100755 --- a/shared/src/main/scala/scala/xml/factory/Binder.scala +++ b/shared/src/main/scala/scala/xml/factory/Binder.scala @@ -15,6 +15,7 @@ import parsing.ValidatingMarkupHandler /** * @author Burak Emir */ +@deprecated("This class will be removed", "1.3.0") abstract class Binder(val preserveWS: Boolean) extends ValidatingMarkupHandler { var result: NodeBuffer = new NodeBuffer() diff --git a/shared/src/main/scala/scala/xml/parsing/ValidatingMarkupHandler.scala b/shared/src/main/scala/scala/xml/parsing/ValidatingMarkupHandler.scala index a1821bd95..8bbcbefca 100644 --- a/shared/src/main/scala/scala/xml/parsing/ValidatingMarkupHandler.scala +++ b/shared/src/main/scala/scala/xml/parsing/ValidatingMarkupHandler.scala @@ -12,6 +12,7 @@ package parsing import scala.xml.dtd._ +@deprecated("This class will be removed", "1.3.0") abstract class ValidatingMarkupHandler extends MarkupHandler { var rootLabel: String = _