summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorburaq <buraq@epfl.ch>2004-06-14 15:37:40 +0000
committerburaq <buraq@epfl.ch>2004-06-14 15:37:40 +0000
commitf020b6c5bad5e8cb4ab4a8f24d6cd9a83e38cf2e (patch)
treec9ccd0b0666ee06b0fc30d21875da259e1fc6729
parentbb777251ab0c23484ff5cddfcb1b86cf18558868 (diff)
downloadscala-f020b6c5bad5e8cb4ab4a8f24d6cd9a83e38cf2e.tar.gz
scala-f020b6c5bad5e8cb4ab4a8f24d6cd9a83e38cf2e.tar.bz2
scala-f020b6c5bad5e8cb4ab4a8f24d6cd9a83e38cf2e.zip
fix
-rw-r--r--sources/scala/xml/Elem.scala2
-rw-r--r--sources/scala/xml/ExternalID.scala6
-rw-r--r--sources/scala/xml/NodeFactory.scala4
3 files changed, 7 insertions, 5 deletions
diff --git a/sources/scala/xml/Elem.scala b/sources/scala/xml/Elem.scala
index c8885da5d9..bf292c8936 100644
--- a/sources/scala/xml/Elem.scala
+++ b/sources/scala/xml/Elem.scala
@@ -31,7 +31,7 @@ case class Elem( nsCode:Int, label: String, attribute:immutable.Map[String,Strin
this(nsCode, label, Node.NoAttributes, child:_*);
def this(label: String, child: Node*) =
- this(Node.EmptyNamespace, label, Node.NoAttributes, child:_*);
+ this(Node.EmptyNamespace.code, label, Node.NoAttributes, child:_*);
/** Return a new element with updated attributes
*
diff --git a/sources/scala/xml/ExternalID.scala b/sources/scala/xml/ExternalID.scala
index 2abcd43ed8..47cf08f770 100644
--- a/sources/scala/xml/ExternalID.scala
+++ b/sources/scala/xml/ExternalID.scala
@@ -26,7 +26,7 @@ class ExternalID ;
case class SystemID( systemLiteral:String ) extends ExternalID {
- if( !Utility.checkSysID( systemLiteral ) )
+ if( !Parsing.checkSysID( systemLiteral ) )
throw new IllegalArgumentException(
"can't use both \" and ' in systemLiteral"
);
@@ -43,11 +43,11 @@ case class SystemID( systemLiteral:String ) extends ExternalID {
**/
case class PublicID( publicLiteral:String, systemLiteral:String ) extends ExternalID {
- if( !Utility.checkPubID( publicLiteral ))
+ if( !Parsing.checkPubID( publicLiteral ))
throw new IllegalArgumentException(
"publicLiteral must consist of PubidChars"
);
- if( !Utility.checkSysID( systemLiteral ) )
+ if( !Parsing.checkSysID( systemLiteral ) )
throw new IllegalArgumentException(
"can't use both \" and ' in systemLiteral"
);
diff --git a/sources/scala/xml/NodeFactory.scala b/sources/scala/xml/NodeFactory.scala
index 8355db36ec..0dab5b90f1 100644
--- a/sources/scala/xml/NodeFactory.scala
+++ b/sources/scala/xml/NodeFactory.scala
@@ -8,7 +8,9 @@
\* */
package scala.xml ;
-abstract class NodeFactory( config:NodeFactoryConfig ) {
+abstract class NodeFactory {
+
+ val config:NodeFactoryConfig ;
def makeNode( elemName:String, attribs:Map[String,String], chIter:Seq[Node] ):Node;