made Elem serializable again, added Utility.sor...

made Elem serializable again, added Utility.sort method for attribute
sorting

2 files changed, 15 insertions, 1 deletions

diff --git a/src/library/scala/xml/Elem.scala b/src/library/scala/xml/Elem.scala
index 027a1120b0..37c2f3e6a4 100644
--- a/src/library/scala/xml/Elem.scala
+++ b/src/library/scala/xml/Elem.scala
@@ -32,7 +32,7 @@ object Elem {
  *  @param child the children of this node
  */
 // "val" is redundant for non-overriding arguments
-/*case*/ class Elem(override val prefix: String,
+@serializable class Elem(override val prefix: String,
                 val label: String,
                 override val attributes: MetaData,
                 override val scope: NamespaceBinding,
diff --git a/src/library/scala/xml/Utility.scala b/src/library/scala/xml/Utility.scala
index c0be4bc280..c0b28b89ae 100644
--- a/src/library/scala/xml/Utility.scala
+++ b/src/library/scala/xml/Utility.scala
@@ -40,6 +40,20 @@ object Utility extends AnyRef with parsing.TokenTests {
     case _ =>
       x
   }
+  /** returns a sorted attribute list */
+  def sort(md: MetaData): MetaData = if((md eq Null) || (md.next eq Null)) md else {
+    val key = md.key
+    val smaller = sort(md.filter { m => m.key < key })
+    val greater = sort(md.filter { m => m.key > key })
+    smaller.append( Null ).append(md.copy ( greater ))
+  }
+
+  /** returns the node with its attribute list sorted alphabetically (prefixes are ignored) */
+  def sort(n:Node): Node = n match {
+	  case Elem(pre,lab,md,scp,child@_*) =>
+		  Elem(pre,lab,sort(md),scp, (child map sort):_*)
+	  case _ => n
+  }
 
   /** @deprecated a string might also be Atom(s) - define your own conversion
    */