From f28c845709d3a129c488d14e134053cd9473ba87 Mon Sep 17 00:00:00 2001 From: buraq Date: Thu, 29 Apr 2004 15:59:45 +0000 Subject: *** empty log message *** --- .../tools/dtd2scala/template/ObjectTemplate.scala.xml | 6 +++--- .../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 @@ 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 -- cgit v1.2.3