Merge pull request #185 from colinrgodsey/master

Trimming of URI tag contents.
eed3si9n · Jan 13, 2013 · fb06cf2 · fb06cf2
2 parents bbb8f12 + 136a191
commit fb06cf2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/cli/src/main/resources/scalaxb.scala.template b/cli/src/main/resources/scalaxb.scala.template
@@ -805,7 +805,7 @@ object Helper {
   }
 
   def toURI(value: String) =
-    java.net.URI.create(value)
+    java.net.URI.create(value.trim)
 
   def isNil(node: scala.xml.Node) =
     (node \ ("@{" + XSI_URL + "}nil")).headOption map { _.text == "true" } getOrElse {

diff --git a/cli/src_managed/scalaxb/scalaxb.scala b/cli/src_managed/scalaxb/scalaxb.scala
@@ -405,7 +405,7 @@ object DataRecord extends XMLStandardTypes {
     case _ => DataRecord(value)
   }
 
-  def apply[A:CanWriteXML](node: Node, parent: Node, value: A): DataRecord[A] = node match {
+  def apply[A:CanWriteXML](node: Node, parent: Node, value: A): DataRecord[A] = (node: Any) match {
     case elem: Elem => DataRecord(node, value)
     case attr: UnprefixedAttribute =>
       val key = Some(attr.key)
@@ -805,7 +805,7 @@ object Helper {
   }
 
   def toURI(value: String) =
-    java.net.URI.create(value)
+    java.net.URI.create(value.trim)
 
   def isNil(node: scala.xml.Node) =
     (node \ ("@{" + XSI_URL + "}nil")).headOption map { _.text == "true" } getOrElse {