You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by rv...@apache.org on 2014/11/11 11:55:35 UTC
[2/2] jena git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/jena
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/jena
Merge together mine and Andy's javadoc changes
Conflicts:
jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/DatasetGraphCollection.java
jena-arq/src/main/java/org/apache/jena/atlas/iterator/Iter.java
jena-arq/src/main/java/org/apache/jena/atlas/iterator/IteratorConcat.java
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/6c2c87cd
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/6c2c87cd
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/6c2c87cd
Branch: refs/heads/master
Commit: 6c2c87cd98785149984a9e13c012e4489a608ce9
Parents: e4f6d62 44fdb1e
Author: Rob Vesse <rv...@apache.org>
Authored: Tue Nov 11 10:55:00 2014 +0000
Committer: Rob Vesse <rv...@apache.org>
Committed: Tue Nov 11 10:55:00 2014 +0000
----------------------------------------------------------------------
.../com/hp/hpl/jena/sparql/core/DatasetGraphCollection.java | 2 +-
.../java/org/apache/jena/atlas/iterator/IteratorConcat.java | 7 +++++++
2 files changed, 8 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/6c2c87cd/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/DatasetGraphCollection.java
----------------------------------------------------------------------
diff --cc jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/DatasetGraphCollection.java
index 1656469,ac9530d..3986e30
--- a/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/DatasetGraphCollection.java
+++ b/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/DatasetGraphCollection.java
@@@ -72,6 -72,7 +72,7 @@@ public abstract class DatasetGraphColle
{
Iterator<Node> gnames = listGraphNodes() ;
IteratorConcat<Quad> iter = new IteratorConcat<>() ;
-
++
// Named graphs
for ( ; gnames.hasNext() ; )
{
http://git-wip-us.apache.org/repos/asf/jena/blob/6c2c87cd/jena-arq/src/main/java/org/apache/jena/atlas/iterator/IteratorConcat.java
----------------------------------------------------------------------
diff --cc jena-arq/src/main/java/org/apache/jena/atlas/iterator/IteratorConcat.java
index 3860d0c,bc8bdfd..3d5958c
--- a/jena-arq/src/main/java/org/apache/jena/atlas/iterator/IteratorConcat.java
+++ b/jena-arq/src/main/java/org/apache/jena/atlas/iterator/IteratorConcat.java
@@@ -37,6 -37,13 +37,13 @@@ public class IteratorConcat<T> implemen
private Iterator<T> removeFrom = null ;
boolean finished = false ;
+ /**
- * Usually better to create an IteratorConcat explicitly and add iterator if theer are going to be many.
++ * Usually better to create an IteratorConcat explicitly and add iterator if there are going to be many.
+ * @param iter1
+ * @param iter2
+ * @return Iterator
+ * @see IteratorCons
+ */
public static <T> Iterator<T> concat(Iterator<T> iter1, Iterator<T> iter2)
{
if (iter2 == null) return iter1 ;