You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@clerezza.apache.org by re...@apache.org on 2011/01/17 16:12:33 UTC

svn commit: r1059947 - in /incubator/clerezza/trunk/org.apache.clerezza.parent: org.apache.clerezza.rdf.jena.commons/src/main/java/org/apache/clerezza/rdf/jena/commons/ org.apache.clerezza.rdf.jena.facade/src/main/java/org/apache/clerezza/rdf/jena/faca...

Author: reto
Date: Mon Jan 17 15:12:33 2011
New Revision: 1059947

URL: http://svn.apache.org/viewvc?rev=1059947&view=rev
Log:
CLEREZZA-392: keeping reference in bnode-instance

Modified:
    incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.rdf.jena.commons/src/main/java/org/apache/clerezza/rdf/jena/commons/Jena2TriaUtil.java
    incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.rdf.jena.commons/src/main/java/org/apache/clerezza/rdf/jena/commons/Tria2JenaUtil.java
    incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.rdf.jena.facade/src/main/java/org/apache/clerezza/rdf/jena/facade/JenaGraph.java
    incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.rdf.jena.storage/src/main/java/org/apache/clerezza/rdf/jena/storage/JenaGraphAdaptor.java

Modified: incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.rdf.jena.commons/src/main/java/org/apache/clerezza/rdf/jena/commons/Jena2TriaUtil.java
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.rdf.jena.commons/src/main/java/org/apache/clerezza/rdf/jena/commons/Jena2TriaUtil.java?rev=1059947&r1=1059946&r2=1059947&view=diff
==============================================================================
--- incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.rdf.jena.commons/src/main/java/org/apache/clerezza/rdf/jena/commons/Jena2TriaUtil.java (original)
+++ incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.rdf.jena.commons/src/main/java/org/apache/clerezza/rdf/jena/commons/Jena2TriaUtil.java Mon Jan 17 15:12:33 2011
@@ -42,11 +42,11 @@ public class Jena2TriaUtil {
 		this.tria2JenaBNodes = tria2JenaBNodes;
 	}
 
-	private BNode convertJenaNode2TriaBlankNode(Node node, boolean createBNode) {
+	private BNode convertJenaNode2TriaBlankNode(Node node) {
 		BNode result = tria2JenaBNodes.get(node);
-		if (result == null && createBNode) {
-			result = new BNode();
-			tria2JenaBNodes.put(node,result);
+		if (result == null) {
+			result = new JenaBNodeWrapper(node);
+			//tria2JenaBNodes.put(node,result);
 		}
 		return result;
 	}
@@ -91,21 +91,11 @@ public class Jena2TriaUtil {
 	 * @return BNode if it is a Blank Node, UriRef if it is a URI and Literal if it is a literal.
 	 */
 	public Resource convertJenaNode2Resource(Node node) {
-		return convertJenaNode2Resource(node, false);
-	}
-
-	/**
-	 * Converts a jena node to a resource. If covertBNode is true, then a new
-	 * BNode is created for a blank node if no mapping already exists.
-	 * @param node
-	 * @return BNode if it is a Blank Node, UriRef if it is a URI and Literal if it is a literal.
-	 */
-	public Resource convertJenaNode2Resource(Node node, boolean createBNode) {
 		if (node == null) {
 			throw new IllegalArgumentException("null argument not allowed");
 		}
 		if (node.isBlank()) {
-			return convertJenaNode2TriaBlankNode(node, createBNode);
+			return convertJenaNode2TriaBlankNode(node);
 		}
 		if (node.isURI()) {
 			return convertJenaUri2UriRef(node);
@@ -125,23 +115,11 @@ public class Jena2TriaUtil {
 	 * @return BNode if it is a Blank Node otherwise a UriRef
 	 */
 	public NonLiteral convertNonLiteral(Node node) {
-		return convertNonLiteral(node, false);
-	}
-
-	/**
-	 * Converts a node to a BNode if it is a Blank Node otherwise to a UriRef.
-	 * If covertBNode is true, then a new BNode is created for a blank node if
-	 * no mapping already exists.
-	 *
-	 * @param node
-	 * @return BNode if it is a Blank Node otherwise a UriRef
-	 */
-	public NonLiteral convertNonLiteral(Node node, boolean createBNode) {
 		if (node == null) {
 			throw new IllegalArgumentException("null argument not allowed");
 		}
 		if (node.isBlank()) {
-			return convertJenaNode2TriaBlankNode(node, createBNode);
+			return convertJenaNode2TriaBlankNode(node);
 		}
 		if (node.isURI()) {
 			return convertJenaUri2UriRef(node);
@@ -150,13 +128,9 @@ public class Jena2TriaUtil {
 	}
 
 	public Triple convertTriple(com.hp.hpl.jena.graph.Triple triple) {
-		return convertTriple(triple, false);
-	}
-
-	public Triple convertTriple(com.hp.hpl.jena.graph.Triple triple, boolean createBnodes) {
-		NonLiteral subject = convertNonLiteral(triple.getSubject(), createBnodes);
+		NonLiteral subject = convertNonLiteral(triple.getSubject());
 		UriRef predicate = convertJenaUri2UriRef(triple.getPredicate());
-		Resource object = convertJenaNode2Resource(triple.getObject(), createBnodes);
+		Resource object = convertJenaNode2Resource(triple.getObject());
 		if (subject == null || object == null) {
 			return null;
 		}

Modified: incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.rdf.jena.commons/src/main/java/org/apache/clerezza/rdf/jena/commons/Tria2JenaUtil.java
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.rdf.jena.commons/src/main/java/org/apache/clerezza/rdf/jena/commons/Tria2JenaUtil.java?rev=1059947&r1=1059946&r2=1059947&view=diff
==============================================================================
--- incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.rdf.jena.commons/src/main/java/org/apache/clerezza/rdf/jena/commons/Tria2JenaUtil.java (original)
+++ incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.rdf.jena.commons/src/main/java/org/apache/clerezza/rdf/jena/commons/Tria2JenaUtil.java Mon Jan 17 15:12:33 2011
@@ -98,6 +98,9 @@ public class Tria2JenaUtil {
 		if (bnode == null) {
 			throw new IllegalArgumentException("null argument not allowed");
 		}
+		if (bnode instanceof JenaBNodeWrapper) {
+			return ((JenaBNodeWrapper)bnode).node;
+		}
 		Node result = tria2JenaBNodes.get(bnode);
 		if (result == null && createBlankNode) {
 			result = com.hp.hpl.jena.graph.Node.createAnon();

Modified: incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.rdf.jena.facade/src/main/java/org/apache/clerezza/rdf/jena/facade/JenaGraph.java
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.rdf.jena.facade/src/main/java/org/apache/clerezza/rdf/jena/facade/JenaGraph.java?rev=1059947&r1=1059946&r2=1059947&view=diff
==============================================================================
--- incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.rdf.jena.facade/src/main/java/org/apache/clerezza/rdf/jena/facade/JenaGraph.java (original)
+++ incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.rdf.jena.facade/src/main/java/org/apache/clerezza/rdf/jena/facade/JenaGraph.java Mon Jan 17 15:12:33 2011
@@ -73,7 +73,7 @@ public class JenaGraph extends GraphBase
 
 	@Override
 	public void performAdd(com.hp.hpl.jena.graph.Triple triple) {
-		graph.add(jena2TriaUtil.convertTriple(triple, true));
+		graph.add(jena2TriaUtil.convertTriple(triple));
 	}
 
 	@Override
@@ -99,7 +99,7 @@ public class JenaGraph extends GraphBase
 			public com.hp.hpl.jena.graph.Triple next() {
 				Triple baseNext = base.next();
 				lastReturned = baseNext;
-				return (baseNext == null) ? null : tria2JenaUtil.convertTriple(baseNext, true);
+				return (baseNext == null) ? null : tria2JenaUtil.convertTriple(baseNext);
 			}
 
 			@Override

Modified: incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.rdf.jena.storage/src/main/java/org/apache/clerezza/rdf/jena/storage/JenaGraphAdaptor.java
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.rdf.jena.storage/src/main/java/org/apache/clerezza/rdf/jena/storage/JenaGraphAdaptor.java?rev=1059947&r1=1059946&r2=1059947&view=diff
==============================================================================
--- incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.rdf.jena.storage/src/main/java/org/apache/clerezza/rdf/jena/storage/JenaGraphAdaptor.java (original)
+++ incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.rdf.jena.storage/src/main/java/org/apache/clerezza/rdf/jena/storage/JenaGraphAdaptor.java Mon Jan 17 15:12:33 2011
@@ -61,8 +61,7 @@ public class JenaGraphAdaptor extends Ab
 
 	@Override
 	public void clear() {
-		BulkUpdateHandler handler = jenaGraph.getBulkUpdateHandler();
-		handler.removeAll();
+		super.clear();
 		tria2JenaBNodes.clear();
 	}
 
@@ -114,7 +113,7 @@ public class JenaGraphAdaptor extends Ab
 					lastReturned =  precached.next();
 				} else {
 					lastReturned = jena2TriaUtil.convertTriple(
-							(com.hp.hpl.jena.graph.Triple)jenaIter.next(), true);
+							(com.hp.hpl.jena.graph.Triple)jenaIter.next());
 				}
 				return lastReturned;
 			}