You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commonsrdf.apache.org by st...@apache.org on 2016/10/26 12:41:07 UTC
[2/3] incubator-commonsrdf git commit: Merge branch 'master' into
COMMONSRDF-46
Merge branch 'master' into COMMONSRDF-46
Project: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/commit/46e159db
Tree: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/tree/46e159db
Diff: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/diff/46e159db
Branch: refs/heads/COMMONSRDF-46
Commit: 46e159db15c8290820e0abebe6bf61ed9c250c3d
Parents: d6306ad 9f73a14
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Wed Oct 26 12:58:47 2016 +0100
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Wed Oct 26 12:58:47 2016 +0100
----------------------------------------------------------------------
.../main/java/org/apache/commons/rdf/rdf4j/RDF4JDataset.java | 3 ++-
.../main/java/org/apache/commons/rdf/rdf4j/RDF4JGraph.java | 7 ++++---
2 files changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/46e159db/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/RDF4JDataset.java
----------------------------------------------------------------------
diff --cc rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/RDF4JDataset.java
index fb54a09,e5edde7..7b5cbaa
--- a/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/RDF4JDataset.java
+++ b/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/RDF4JDataset.java
@@@ -25,13 -25,14 +25,14 @@@ import org.apache.commons.rdf.api.Datas
import org.apache.commons.rdf.api.IRI;
import org.apache.commons.rdf.api.Quad;
import org.apache.commons.rdf.api.RDFTerm;
-import org.apache.commons.rdf.rdf4j.RDF4JFactory.Option;
++import org.apache.commons.rdf.rdf4j.RDF4J.Option;
/**
* Marker interface for RDF4J implementations of Dataset.
*
- * @see RDF4JFactory#createDataset()
- * @see RDF4JFactory#asDataset(org.eclipse.rdf4j.repository.Repository, Option...)
+ * @see RDF4J#createDataset()
- * @see RDF4J#asDataset(org.eclipse.rdf4j.repository.Repository, org.apache.commons.rdf.rdf4j.RDF4JFactory.Option...)
++ * @see RDF4J#asDataset(org.eclipse.rdf4j.repository.Repository, Option...)
*/
public interface RDF4JDataset extends Dataset, RDF4JGraphLike<Quad> {
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/46e159db/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/RDF4JGraph.java
----------------------------------------------------------------------
diff --cc rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/RDF4JGraph.java
index d1ab485,4968b99..65cdf67
--- a/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/RDF4JGraph.java
+++ b/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/RDF4JGraph.java
@@@ -28,15 -28,16 +28,16 @@@ import org.apache.commons.rdf.api.RDFTe
import org.apache.commons.rdf.api.Triple;
import org.eclipse.rdf4j.model.Model;
import org.eclipse.rdf4j.repository.Repository;
-import org.apache.commons.rdf.rdf4j.RDF4JFactory.Option;
++import org.apache.commons.rdf.rdf4j.RDF4J.Option;
/**
* Marker interface for RDF4J implementations of Graph.
*
- * @see RDF4JFactory#createGraph()
- * @see RDF4JFactory#asGraph(Model)
- * @see RDF4JFactory#asGraph(Repository, Option...)
- * @see RDF4JFactory#asGraphUnion(Repository, Option...)
+ * @see RDF4J#createGraph()
+ * @see RDF4J#asGraph(Model)
- * @see RDF4J#asGraph(Repository, org.apache.commons.rdf.rdf4j.RDF4JFactory.Option...)
- * @see RDF4J#asGraphUnion(Repository, org.apache.commons.rdf.rdf4j.RDF4JFactory.Option...)
++ * @see RDF4J#asGraph(Repository, Option...)
++ * @see RDF4J#asGraphUnion(Repository, Option...)
* @see RDF4JDataset#getGraph()
* @see RDF4JDataset#getGraph(BlankNodeOrIRI)
*/
@@@ -64,7 -65,7 +65,7 @@@ public interface RDF4JGraph extends Gra
* Note that the context mask itself cannot be <code>null</code>.
* <p>
* The returned set is an immutable copy; to specify a different mask, use
- * {@link RDF4J#asGraph(Repository, Set, org.apache.commons.rdf.rdf4j.RDF4JFactory.Option...)}
- * {@link RDF4JFactory#asGraph(Repository, Set, Option...)}
++ * {@link RDF4J#asGraph(Repository, Set, Option...)}
*
* @return The context mask as a set of {@link BlankNodeOrIRI} graph names, which
* may contain the value <code>null</code>.