diff options
| -rw-r--r-- | sources/scala/tools/dtd2scala/template/ObjectTemplate.scala.xml | 6 | ||||
| -rw-r--r-- | sources/scala/xml/nobinding/NoBindingFactoryAdapter.scala | 18 |
2 files changed, 12 insertions, 12 deletions
diff --git a/sources/scala/tools/dtd2scala/template/ObjectTemplate.scala.xml b/sources/scala/tools/dtd2scala/template/ObjectTemplate.scala.xml index 20e859edc5..ee404c651c 100644 --- a/sources/scala/tools/dtd2scala/template/ObjectTemplate.scala.xml +++ b/sources/scala/tools/dtd2scala/template/ObjectTemplate.scala.xml @@ -33,7 +33,7 @@ <elementBinding> def constr_&ccElementName;( ch:childrenT, attrs:attribMapT ) = new &ccElementName;(ch:_*) { private val hmap = attrs; - override def attribute = attrs.elements.toSeq( hmap.size ); + override def attribute = attrs.toList; }; @@ -56,7 +56,7 @@ for( val p <- attrs ) { newmap += p._1 -> p._2 }; new &ccElementName;( child:_* ) { private val hmap = newmap; - override def attribute = newmap.elements.toSeq( newmap.size ); + override def attribute = newmap.toList; } } @@ -67,7 +67,7 @@ newmap += attr._1 -> attr._2; new &ccElementName;( child:_* ) { private val hmap = newmap; - override def attribute = newmap.elements.toSeq( newmap.size ); + override def attribute = newmap.toList; } } } diff --git a/sources/scala/xml/nobinding/NoBindingFactoryAdapter.scala b/sources/scala/xml/nobinding/NoBindingFactoryAdapter.scala index d8649ab438..28472e397d 100644 --- a/sources/scala/xml/nobinding/NoBindingFactoryAdapter.scala +++ b/sources/scala/xml/nobinding/NoBindingFactoryAdapter.scala @@ -41,17 +41,17 @@ class NoBindingFactoryAdapter extends FactoryAdapter { //System.err.println("[using cached elem +"+cachedElem.toXML+"!]"); //DEBUG cachedElem case None => val el = if( children.isEmpty ) { - new Elem( label ) { - private val hmap = attrs; - override def attribute = attrs.elements.toSeq( attrs.size ); - override def hashCode() = elHashCode; + new Elem( label ) { + override def `@` = attrs; + override def attribute = `@`.toList; + override def hashCode() = elHashCode; }; } else { - new Elem( label, children:_* ) { - private val hmap = attrs; - override def attribute = attrs.elements.toSeq( attrs.size ); - override def hashCode() = elHashCode; - }; + new Elem( label, children:_* ) { + override def `@` = attrs; + override def attribute = `@`.toList; + override def hashCode() = elHashCode; + }; } cache.update( elHashCode, el ); el |