removed CharData from library

9 files changed, 4 insertions, 53 deletions

diff --git a/config/list/library.lst b/config/list/library.lst
index 7f7c0921c7..e36ad9ef01 100644
--- a/config/list/library.lst
+++ b/config/list/library.lst
@@ -217,7 +217,6 @@ util/logging/ConsoleLogger.scala
 xml/Attribute.scala
 xml/AttributeSeq.scala
 xml/BindingFactoryAdapter.scala
-xml/CharData.scala
 xml/Comment.scala
 xml/DocType.scala
 xml/Elem.scala
diff --git a/sources/scala/xml/CharData.scala b/sources/scala/xml/CharData.scala
deleted file mode 100644
index 287bcdc390..0000000000
--- a/sources/scala/xml/CharData.scala
+++ /dev/null
@@ -1,33 +0,0 @@
-/*                     __                                               *\
-**     ________ ___   / /  ___     Scala API                            **
-**    / __/ __// _ | / /  / _ |    (c) 2003-2004, LAMP/EPFL             **
-**  __\ \/ /__/ __ |/ /__/ __ |                                         **
-** /____/\___/_/ |_/____/_/ | |                                         **
-**                          |/                                          **
-** $Id$
-\*                                                                      */
-
-package scala.xml;
-
-import scala.collection.immutable ;
-
-/** an XML node for unparsed character data (CDATA).
- * @author Burak Emir
- * @param text text contained in this node, may not contain "]]>"
-**/
-
-case class CharData( text:String ) extends SpecialNode {
-
-  final override def typeTag$:Int = -4;
-
-  if( text.indexOf( "]]>" ) != -1 )
-    throw new IllegalArgumentException(" CDATA text may not contain \"]]>\" ");
-
-  /** the constant "#CDATA"
-  */
-  def label    = "#CDATA";
-
-  /** returns  "<![CDATA["+text+"]]>" */
-  final override def toString() = "<![CDATA["+text+"]]>";
-
-}
diff --git a/sources/scala/xml/LoggedNodeFactory.scala b/sources/scala/xml/LoggedNodeFactory.scala
index 12945a7762..94d8286302 100644
--- a/sources/scala/xml/LoggedNodeFactory.scala
+++ b/sources/scala/xml/LoggedNodeFactory.scala
@@ -27,7 +27,6 @@ with scala.util.logging.Logged {
   val logText      = false;
   val logComment   = false;
   val logProcInstr = false;
-  val logCharData  = false;
 
   final val NONE  = 0;
   final val CACHE = 1;
@@ -75,8 +74,4 @@ with scala.util.logging.Logged {
     super.makeProcInstr(t,s);
   }
 
-  /* 2 be removed
-  override def makeCharData(s: String) = {}
-  */
-
 }
diff --git a/sources/scala/xml/NodeFactory.scala b/sources/scala/xml/NodeFactory.scala
index a119caf402..43ee23a53c 100644
--- a/sources/scala/xml/NodeFactory.scala
+++ b/sources/scala/xml/NodeFactory.scala
@@ -72,9 +72,4 @@ abstract class NodeFactory[A <: Node] {
   def makeProcInstr(t: String, s: String): Seq[ProcInstr] =
     if(ignoreProcInstr) Nil else List(ProcInstr(t, s));
 
-  /*
-  def makeCharData(s: String) =
-    CharData( s );
-  */
-
 }
diff --git a/sources/scala/xml/NodeTraverser.scala b/sources/scala/xml/NodeTraverser.scala
index ff60ac865e..f70a684d8d 100644
--- a/sources/scala/xml/NodeTraverser.scala
+++ b/sources/scala/xml/NodeTraverser.scala
@@ -17,7 +17,6 @@ class NodeTraverser[A <: AnyRef](handle: parsing.MarkupHandler[A]) {
     case Text(t)          => handle.text(0,t);
     case ProcInstr(ta,te) => handle.procInstr(0,ta,te);
     case Comment(t)       => handle.comment(0,t);
-    case CharData(cd)     => handle.charData(0,cd);
     case EntityRef(n)     => handle.entityRef(0,n);
     case _ =>
       val nb = new mutable.ArrayBuffer[A]();
diff --git a/sources/scala/xml/PrettyPrinter.scala b/sources/scala/xml/PrettyPrinter.scala
index 34d94891db..0b1e233481 100644
--- a/sources/scala/xml/PrettyPrinter.scala
+++ b/sources/scala/xml/PrettyPrinter.scala
@@ -163,7 +163,7 @@ class PrettyPrinter( width:Int, step:Int ) {
     val it = n.child.elements;
     while( it.hasNext )
       it.next match {
-        case _:Text | _:CharData | _:Comment | _:EntityRef | _:ProcInstr =>
+        case _:Text | _:Comment | _:EntityRef | _:ProcInstr =>
         case _:Node => return true;
       }
     return false
@@ -172,7 +172,7 @@ class PrettyPrinter( width:Int, step:Int ) {
     protected def traverse( node:Node, ind:int ):Unit = {
       node match {
 
-        case _:Text | _:CharData | _:Comment | _:EntityRef | _:ProcInstr =>
+        case _:Text | _:Comment | _:EntityRef | _:ProcInstr =>
           makeBox( ind, node.toString() );
 
         case _:Node =>
@@ -222,7 +222,7 @@ class PrettyPrinter( width:Int, step:Int ) {
     protected def traverse1( node:Node, ind:int ):Unit = {
       node match {
 
-        case _:Text | _:CharData | _:Comment | _:EntityRef | _:ProcInstr =>
+        case _:Text | _:Comment | _:EntityRef | _:ProcInstr =>
           makeBox( ind, node.toString() );
 
         case _:Node => {
diff --git a/sources/scala/xml/parsing/ConstructingHandler.scala b/sources/scala/xml/parsing/ConstructingHandler.scala
index f49af1eed1..7fbb48b878 100644
--- a/sources/scala/xml/parsing/ConstructingHandler.scala
+++ b/sources/scala/xml/parsing/ConstructingHandler.scala
@@ -41,9 +41,6 @@ class ConstructingHandler extends MarkupHandler[Node] {
     Some(Elem(uri, label, AttributeSeq.fromAttrs(uri,attrSeq:_*), ch:_*));
   };
 
-  def charData(pos: Int, txt: String ) =
-    CharData( txt );
-
   def procInstr(pos: Int, target: String, txt: String ) =
     ProcInstr(target, txt);
 
diff --git a/sources/scala/xml/parsing/MarkupHandler.scala b/sources/scala/xml/parsing/MarkupHandler.scala
index 7bea74e5fe..cf6f9286c1 100644
--- a/sources/scala/xml/parsing/MarkupHandler.scala
+++ b/sources/scala/xml/parsing/MarkupHandler.scala
@@ -49,7 +49,6 @@ abstract class MarkupHandler[A <: AnyRef] {
    */
   def element(pos: int, uri: String, label: String, attrMap1: Map[Pair[String,String],Attribute], args: mutable.Buffer[A]): Iterable[A];
 
-  def charData(pos: Int, txt: String ): Iterable[A];
   def procInstr(pos: Int, target: String, txt: String): Iterable[A];
   def comment(pos: Int, comment: String ): Iterable[A];
   def entityRef(pos: Int, n: String): Iterable[A];
diff --git a/sources/scala/xml/parsing/MarkupParser.scala b/sources/scala/xml/parsing/MarkupParser.scala
index 224bee2802..c2bbf42338 100644
--- a/sources/scala/xml/parsing/MarkupParser.scala
+++ b/sources/scala/xml/parsing/MarkupParser.scala
@@ -211,7 +211,7 @@ abstract class MarkupParser[MarkupType <: AnyRef] {
          { sb.append(ch); nextch; ch == '>' } ) {
         sb.setLength(sb.length() - 2);
         nextch;
-        return handle.charData( pos1, sb.toString() );
+        return handle.text( pos1, sb.toString() );
       } else sb.append( ch );
       nextch;
     }