You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by an...@apache.org on 2011/09/25 22:08:31 UTC

svn commit: r1175562 - in /incubator/jena/Jena2/ARQ/trunk/src/com/hp/hpl/jena/sparql/engine/binding: BindingHashMap.java BindingUtils.java

Author: andy
Date: Sun Sep 25 20:08:31 2011
New Revision: 1175562

URL: http://svn.apache.org/viewvc?rev=1175562&view=rev
Log:
Tidy up Bindings

Modified:
    incubator/jena/Jena2/ARQ/trunk/src/com/hp/hpl/jena/sparql/engine/binding/BindingHashMap.java
    incubator/jena/Jena2/ARQ/trunk/src/com/hp/hpl/jena/sparql/engine/binding/BindingUtils.java

Modified: incubator/jena/Jena2/ARQ/trunk/src/com/hp/hpl/jena/sparql/engine/binding/BindingHashMap.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/com/hp/hpl/jena/sparql/engine/binding/BindingHashMap.java?rev=1175562&r1=1175561&r2=1175562&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/com/hp/hpl/jena/sparql/engine/binding/BindingHashMap.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/com/hp/hpl/jena/sparql/engine/binding/BindingHashMap.java Sun Sep 25 20:08:31 2011
@@ -84,13 +84,7 @@ public class BindingHashMap extends Bind
     //@Override
     final public void addAll(Binding other)
     {
-        Iterator<Var> iter = other.vars() ;
-        for ( ; iter.hasNext(); )
-        {
-            Var v = iter.next();
-            Node n = other.get(v) ;
-            add(v, n) ;
-        }
+        BindingUtils.addAll(this, other) ;
     }
     
     private void checkAdd(Var var, Node node)

Modified: incubator/jena/Jena2/ARQ/trunk/src/com/hp/hpl/jena/sparql/engine/binding/BindingUtils.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/com/hp/hpl/jena/sparql/engine/binding/BindingUtils.java?rev=1175562&r1=1175561&r2=1175562&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/com/hp/hpl/jena/sparql/engine/binding/BindingUtils.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/com/hp/hpl/jena/sparql/engine/binding/BindingUtils.java Sun Sep 25 20:08:31 2011
@@ -9,6 +9,7 @@ import java.util.Iterator ;
 
 import org.openjena.atlas.logging.Log ;
 
+import com.hp.hpl.jena.graph.Node ;
 import com.hp.hpl.jena.query.QuerySolution ;
 import com.hp.hpl.jena.rdf.model.RDFNode ;
 import com.hp.hpl.jena.sparql.ARQInternalErrorException ;
@@ -73,6 +74,18 @@ public class BindingUtils
         }
     }
     
+    
+    public static void addAll(BindingMap dest, Binding src)
+    {
+        Iterator<Var> iter = src.vars() ;
+        for ( ; iter.hasNext() ; )
+        {
+            Var v = iter.next() ;
+            Node n = dest.get(v) ;
+            dest.add(v, n) ;
+        }
+    }
+    
     public static boolean equals(Binding b1, Binding b2)
     {
         return BindingBase.equals(b1, b2) ;