--- a/aRDF/src/main/scala/JenaModel.scala Sun Feb 05 16:54:43 2012 -0500
+++ b/aRDF/src/main/scala/JenaModel.scala Sun Feb 05 17:46:59 2012 -0500
@@ -54,19 +54,19 @@
if (node.isURI || node.isBlank || node.isLiteral) Some(node) else None
}
- type NodeIRI = Node_URI
+ type NodeIRI = JenaNode
object NodeIRI extends AlgebraicDataType1[IRI, NodeIRI] {
def apply(iri: IRI): NodeIRI = { val IRI(s) = iri ; JenaNode.createURI(s).asInstanceOf[Node_URI] }
def unapply(node: NodeIRI): Option[IRI] = if (node.isURI) Some(IRI(node.getURI)) else None
}
- type NodeBNode = Node_Blank
+ type NodeBNode = JenaNode
object NodeBNode extends AlgebraicDataType1[BNode, NodeBNode] {
def apply(node: BNode): NodeBNode = node
def unapply(node: NodeBNode): Option[BNode] = if (node.isBlank) Some(node.asInstanceOf[Node_Blank]) else None
}
- type NodeLiteral = Node_Literal
+ type NodeLiteral = JenaNode
object NodeLiteral extends AlgebraicDataType1[Literal, NodeLiteral] {
def apply(literal: Literal): NodeLiteral = literal
def unapply(node: NodeLiteral): Option[Literal] =
--- a/aRDF/src/main/scala/Transformer.scala Sun Feb 05 16:54:43 2012 -0500
+++ b/aRDF/src/main/scala/Transformer.scala Sun Feb 05 17:46:59 2012 -0500
@@ -7,7 +7,10 @@
def transformTriple(t: a.Triple): b.Triple = {
val a.Triple(s, p, o) = t
- b.Triple(transformNode(s), transformIRI(p), transformNode(o))
+ b.Triple(
+ transformNode(s),
+ transformIRI(p),
+ transformNode(o))
}
def transformNode(n: a.Node): b.Node = n match {