diff options
| author | buraq <buraq@epfl.ch> | 2004-08-02 15:46:22 +0000 |
|---|---|---|
| committer | buraq <buraq@epfl.ch> | 2004-08-02 15:46:22 +0000 |
| commit | 66e469b90433209ae7d180ecc7211a2f18af35f8 (patch) | |
| tree | 5c58173057722c349610e3d40a1920418d47f03d | |
| parent | 20de82010be891861b83f40358154788afc5d832 (diff) | |
| download | scala-66e469b90433209ae7d180ecc7211a2f18af35f8.tar.gz scala-66e469b90433209ae7d180ecc7211a2f18af35f8.tar.bz2 scala-66e469b90433209ae7d180ecc7211a2f18af35f8.zip | |
modified xml parsing
| -rw-r--r-- | sources/scala/xml/AttributeSeq.scala | 6 | ||||
| -rw-r--r-- | sources/scala/xml/BindingFactoryAdapter.scala | 2 | ||||
| -rw-r--r-- | sources/scala/xml/nobinding/NoBindingFactoryAdapter.scala | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/sources/scala/xml/AttributeSeq.scala b/sources/scala/xml/AttributeSeq.scala index 9f2c0b09d4..f3a8800c98 100644 --- a/sources/scala/xml/AttributeSeq.scala +++ b/sources/scala/xml/AttributeSeq.scala @@ -9,20 +9,20 @@ package scala.xml ; -import scala.collection.mutable.HashMap ; +import scala.collection.Map ; import scala.collection.immutable.TreeSet ; object AttributeSeq { final val Empty = new AttributeSeq { final def sortedSeq = new TreeSet[Attribute] } - final def fromHashMap(as:HashMap[Pair[String,String],String]) = { + final def fromMap(as:Map[Pair[String,String],String]) = { AttributeSeq.fromAttrs( { for( val a <- as.keys.toList ) yield Attribute(a._1,a._2.intern(), as(a)) }:_* ) } - final def fromHashMap(ns:String, as:HashMap[Pair[String,String],String]) = { + final def fromMap(ns:String, as:Map[Pair[String,String],String]) = { AttributeSeq.fromAttrs( { for( val a <- as.keys.toList ) yield { diff --git a/sources/scala/xml/BindingFactoryAdapter.scala b/sources/scala/xml/BindingFactoryAdapter.scala index 7922a060ef..8468024106 100644 --- a/sources/scala/xml/BindingFactoryAdapter.scala +++ b/sources/scala/xml/BindingFactoryAdapter.scala @@ -45,7 +45,7 @@ abstract class BindingFactoryAdapter extends FactoryAdapter() { children:List[Node] ):Node = { val uri$ = uri.intern(); - val attribs1 = AttributeSeq.fromHashMap(attribs); + val attribs1 = AttributeSeq.fromMap(attribs); // 2do:optimize if( !compress ) { // get constructor diff --git a/sources/scala/xml/nobinding/NoBindingFactoryAdapter.scala b/sources/scala/xml/nobinding/NoBindingFactoryAdapter.scala index 852822b919..189a1f5208 100644 --- a/sources/scala/xml/nobinding/NoBindingFactoryAdapter.scala +++ b/sources/scala/xml/nobinding/NoBindingFactoryAdapter.scala @@ -40,7 +40,7 @@ class NoBindingFactoryAdapter extends FactoryAdapter { } else { uri.intern(); } - val attrSeq = AttributeSeq.fromHashMap( uri$, attrs ); + val attrSeq = AttributeSeq.fromMap( uri$, attrs ); val elHashCode = Utility.hashCode( uri$, label, attrSeq.hashCode(), children ) ; cache.get( elHashCode ).match{ |