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 2015/09/06 17:52:31 UTC
[01/10] jena git commit: Making Model attributes private and final in
many vocabulary classes.
Repository: jena
Updated Branches:
refs/heads/master af1697aca -> 0cc6b6bc6
Making Model attributes private and final in many vocabulary classes.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/d0f9daa4
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/d0f9daa4
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/d0f9daa4
Branch: refs/heads/master
Commit: d0f9daa4b9dcbf7678917cf404debdb8ba1c6485
Parents: 7370989
Author: Ramiro Pereira de Magalhães <ra...@gmail.com>
Authored: Thu Sep 3 18:13:03 2015 -0300
Committer: Ramiro Pereira de Magalhães <ra...@gmail.com>
Committed: Thu Sep 3 18:13:03 2015 -0300
----------------------------------------------------------------------
jena-core/src/main/java/org/apache/jena/vocabulary/DCTerms.java | 2 +-
jena-core/src/main/java/org/apache/jena/vocabulary/DCTypes.java | 2 +-
jena-core/src/main/java/org/apache/jena/vocabulary/DC_11.java | 2 +-
jena-core/src/main/java/org/apache/jena/vocabulary/OWL.java | 2 +-
jena-core/src/main/java/org/apache/jena/vocabulary/OWLResults.java | 2 +-
jena-core/src/main/java/org/apache/jena/vocabulary/OWLTest.java | 2 +-
.../main/java/org/apache/jena/vocabulary/OntDocManagerVocab.java | 2 +-
.../src/main/java/org/apache/jena/vocabulary/OntEventsVocab.java | 2 +-
jena-core/src/main/java/org/apache/jena/vocabulary/RDFTest.java | 2 +-
jena-core/src/main/java/org/apache/jena/vocabulary/SKOS.java | 2 +-
jena-core/src/main/java/org/apache/jena/vocabulary/SKOSXL.java | 2 +-
.../src/main/java/org/apache/jena/vocabulary/TestManifest.java | 2 +-
.../src/main/java/org/apache/jena/vocabulary/TestManifestX.java | 2 +-
jena-core/src/main/java/org/apache/jena/vocabulary/VCARD.java | 2 +-
14 files changed, 14 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/d0f9daa4/jena-core/src/main/java/org/apache/jena/vocabulary/DCTerms.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/vocabulary/DCTerms.java b/jena-core/src/main/java/org/apache/jena/vocabulary/DCTerms.java
index 9b4f8a7..9aaed7e 100644
--- a/jena-core/src/main/java/org/apache/jena/vocabulary/DCTerms.java
+++ b/jena-core/src/main/java/org/apache/jena/vocabulary/DCTerms.java
@@ -24,7 +24,7 @@ import org.apache.jena.rdf.model.* ;
*/
public class DCTerms {
/** <p>The RDF model that holds the vocabulary terms</p> */
- private static Model m_model = ModelFactory.createDefaultModel();
+ private static final Model m_model = ModelFactory.createDefaultModel();
/** <p>The namespace of the vocabulary as a string</p> */
public static final String NS = "http://purl.org/dc/terms/";
http://git-wip-us.apache.org/repos/asf/jena/blob/d0f9daa4/jena-core/src/main/java/org/apache/jena/vocabulary/DCTypes.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/vocabulary/DCTypes.java b/jena-core/src/main/java/org/apache/jena/vocabulary/DCTypes.java
index 7c7f04a..43c1e7c 100644
--- a/jena-core/src/main/java/org/apache/jena/vocabulary/DCTypes.java
+++ b/jena-core/src/main/java/org/apache/jena/vocabulary/DCTypes.java
@@ -24,7 +24,7 @@ import org.apache.jena.rdf.model.* ;
*/
public class DCTypes {
/** <p>The RDF model that holds the vocabulary terms</p> */
- private static Model m_model = ModelFactory.createDefaultModel();
+ private static final Model m_model = ModelFactory.createDefaultModel();
/** <p>The namespace of the vocabulary as a string</p> */
public static final String NS = "http://purl.org/dc/dcmitype/";
http://git-wip-us.apache.org/repos/asf/jena/blob/d0f9daa4/jena-core/src/main/java/org/apache/jena/vocabulary/DC_11.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/vocabulary/DC_11.java b/jena-core/src/main/java/org/apache/jena/vocabulary/DC_11.java
index 70f7c41..3978499 100644
--- a/jena-core/src/main/java/org/apache/jena/vocabulary/DC_11.java
+++ b/jena-core/src/main/java/org/apache/jena/vocabulary/DC_11.java
@@ -26,7 +26,7 @@ import org.apache.jena.rdf.model.* ;
*/
public class DC_11 {
/** <p>The RDF model that holds the vocabulary terms</p> */
- private static Model m_model = ModelFactory.createDefaultModel();
+ private static final Model m_model = ModelFactory.createDefaultModel();
/** <p>The namespace of the vocabalary as a string ({@value})</p> */
public static final String NS = "http://purl.org/dc/elements/1.1/";
http://git-wip-us.apache.org/repos/asf/jena/blob/d0f9daa4/jena-core/src/main/java/org/apache/jena/vocabulary/OWL.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/vocabulary/OWL.java b/jena-core/src/main/java/org/apache/jena/vocabulary/OWL.java
index 39e861c..4e2df46 100644
--- a/jena-core/src/main/java/org/apache/jena/vocabulary/OWL.java
+++ b/jena-core/src/main/java/org/apache/jena/vocabulary/OWL.java
@@ -33,7 +33,7 @@ import org.apache.jena.rdf.model.* ;
*/
public class OWL {
/** <p>The RDF model that holds the vocabulary terms</p> */
- private static Model m_model = ModelFactory.createDefaultModel();
+ private static final Model m_model = ModelFactory.createDefaultModel();
/** <p>The namespace of the vocabulary as a string ({@value})</p> */
public static final String NS = "http://www.w3.org/2002/07/owl#";
http://git-wip-us.apache.org/repos/asf/jena/blob/d0f9daa4/jena-core/src/main/java/org/apache/jena/vocabulary/OWLResults.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/vocabulary/OWLResults.java b/jena-core/src/main/java/org/apache/jena/vocabulary/OWLResults.java
index 75959e3..44b3ba3 100644
--- a/jena-core/src/main/java/org/apache/jena/vocabulary/OWLResults.java
+++ b/jena-core/src/main/java/org/apache/jena/vocabulary/OWLResults.java
@@ -27,7 +27,7 @@ import org.apache.jena.rdf.model.* ;
*/
public class OWLResults {
/** <p>The RDF model that holds the vocabulary terms</p> */
- private static Model m_model = ModelFactory.createDefaultModel();
+ private static final Model m_model = ModelFactory.createDefaultModel();
/** <p>The namespace of the vocabalary as a string ({@value})</p> */
public static final String NS = "http://www.w3.org/2002/03owlt/resultsOntology#";
http://git-wip-us.apache.org/repos/asf/jena/blob/d0f9daa4/jena-core/src/main/java/org/apache/jena/vocabulary/OWLTest.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/vocabulary/OWLTest.java b/jena-core/src/main/java/org/apache/jena/vocabulary/OWLTest.java
index 7aef9b3..a816ce7 100644
--- a/jena-core/src/main/java/org/apache/jena/vocabulary/OWLTest.java
+++ b/jena-core/src/main/java/org/apache/jena/vocabulary/OWLTest.java
@@ -28,7 +28,7 @@ import org.apache.jena.rdf.model.* ;
public class OWLTest {
/** <p>The RDF model that holds the vocabulary terms</p> */
- private static Model m_model = ModelFactory.createDefaultModel();
+ private static final Model m_model = ModelFactory.createDefaultModel();
/** <p>The namespace of the vocabalary as a string ({@value})</p> */
public static final String NS = "http://www.w3.org/2002/03owlt/testOntology#";
http://git-wip-us.apache.org/repos/asf/jena/blob/d0f9daa4/jena-core/src/main/java/org/apache/jena/vocabulary/OntDocManagerVocab.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/vocabulary/OntDocManagerVocab.java b/jena-core/src/main/java/org/apache/jena/vocabulary/OntDocManagerVocab.java
index dfaa5a9..8f752e3 100644
--- a/jena-core/src/main/java/org/apache/jena/vocabulary/OntDocManagerVocab.java
+++ b/jena-core/src/main/java/org/apache/jena/vocabulary/OntDocManagerVocab.java
@@ -33,7 +33,7 @@ import org.apache.jena.rdf.model.* ;
*/
public class OntDocManagerVocab {
/** <p>The RDF model that holds the vocabulary terms</p> */
- private static Model m_model = ModelFactory.createDefaultModel();
+ private static final Model m_model = ModelFactory.createDefaultModel();
/** <p>The namespace of the vocabulary as a string ({@value})</p> */
public static final String NS = "http://jena.hpl.hp.com/schemas/2003/03/ont-manager#";
http://git-wip-us.apache.org/repos/asf/jena/blob/d0f9daa4/jena-core/src/main/java/org/apache/jena/vocabulary/OntEventsVocab.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/vocabulary/OntEventsVocab.java b/jena-core/src/main/java/org/apache/jena/vocabulary/OntEventsVocab.java
index 12bf1e9..34d92ec 100644
--- a/jena-core/src/main/java/org/apache/jena/vocabulary/OntEventsVocab.java
+++ b/jena-core/src/main/java/org/apache/jena/vocabulary/OntEventsVocab.java
@@ -33,7 +33,7 @@ import org.apache.jena.rdf.model.* ;
*/
public class OntEventsVocab {
/** <p>The ontology model that holds the vocabulary terms</p> */
- private static OntModel m_model = ModelFactory.createOntologyModel( OntModelSpec.OWL_MEM, null );
+ private static final OntModel m_model = ModelFactory.createOntologyModel( OntModelSpec.OWL_MEM, null );
/** <p>The namespace of the vocabulary as a string ({@value})</p> */
public static final String NS = "http://jena.hpl.hp.com/schemas/2003/03/ont-event#";
http://git-wip-us.apache.org/repos/asf/jena/blob/d0f9daa4/jena-core/src/main/java/org/apache/jena/vocabulary/RDFTest.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/vocabulary/RDFTest.java b/jena-core/src/main/java/org/apache/jena/vocabulary/RDFTest.java
index 4df4370..94c542e 100644
--- a/jena-core/src/main/java/org/apache/jena/vocabulary/RDFTest.java
+++ b/jena-core/src/main/java/org/apache/jena/vocabulary/RDFTest.java
@@ -28,7 +28,7 @@ import org.apache.jena.rdf.model.* ;
public class RDFTest {
/** <p>The RDF model that holds the vocabulary terms</p> */
- private static Model m_model = ModelFactory.createDefaultModel();
+ private static final Model m_model = ModelFactory.createDefaultModel();
/** <p>The namespace of the vocabalary as a string ({@value})</p> */
public static final String NS = "http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#";
http://git-wip-us.apache.org/repos/asf/jena/blob/d0f9daa4/jena-core/src/main/java/org/apache/jena/vocabulary/SKOS.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/vocabulary/SKOS.java b/jena-core/src/main/java/org/apache/jena/vocabulary/SKOS.java
index 4f3a40f..426a3a4 100644
--- a/jena-core/src/main/java/org/apache/jena/vocabulary/SKOS.java
+++ b/jena-core/src/main/java/org/apache/jena/vocabulary/SKOS.java
@@ -32,7 +32,7 @@ public class SKOS {
/**
* The RDF model that holds the SKOS entities
*/
- public static Model m = ModelFactory.createDefaultModel();
+ private static final Model m = ModelFactory.createDefaultModel();
/**
* The namespace of the SKOS vocabulary as a string
*/
http://git-wip-us.apache.org/repos/asf/jena/blob/d0f9daa4/jena-core/src/main/java/org/apache/jena/vocabulary/SKOSXL.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/vocabulary/SKOSXL.java b/jena-core/src/main/java/org/apache/jena/vocabulary/SKOSXL.java
index c09047b..05f4b0f 100644
--- a/jena-core/src/main/java/org/apache/jena/vocabulary/SKOSXL.java
+++ b/jena-core/src/main/java/org/apache/jena/vocabulary/SKOSXL.java
@@ -31,7 +31,7 @@ public class SKOSXL {
/**
* The RDF model that holds the SKOS-XL entities
*/
- public static Model m = ModelFactory.createDefaultModel();
+ private static final Model m = ModelFactory.createDefaultModel();
/**
* The namespace of the SKOS-XL vocabulary as a string
*/
http://git-wip-us.apache.org/repos/asf/jena/blob/d0f9daa4/jena-core/src/main/java/org/apache/jena/vocabulary/TestManifest.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/vocabulary/TestManifest.java b/jena-core/src/main/java/org/apache/jena/vocabulary/TestManifest.java
index d918a2f..3527b4e 100644
--- a/jena-core/src/main/java/org/apache/jena/vocabulary/TestManifest.java
+++ b/jena-core/src/main/java/org/apache/jena/vocabulary/TestManifest.java
@@ -27,7 +27,7 @@ import org.apache.jena.rdf.model.* ;
*/
public class TestManifest {
/** <p>The RDF model that holds the vocabulary terms</p> */
- private static Model m_model = ModelFactory.createDefaultModel();
+ private static final Model m_model = ModelFactory.createDefaultModel();
/** <p>The namespace of the vocabulary as a string</p> */
public static final String NS = "http://www.w3.org/2001/sw/DataAccess/tests/test-manifest#";
http://git-wip-us.apache.org/repos/asf/jena/blob/d0f9daa4/jena-core/src/main/java/org/apache/jena/vocabulary/TestManifestX.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/vocabulary/TestManifestX.java b/jena-core/src/main/java/org/apache/jena/vocabulary/TestManifestX.java
index b699cdc..5547ec5 100644
--- a/jena-core/src/main/java/org/apache/jena/vocabulary/TestManifestX.java
+++ b/jena-core/src/main/java/org/apache/jena/vocabulary/TestManifestX.java
@@ -27,7 +27,7 @@ import org.apache.jena.rdf.model.* ;
*/
public class TestManifestX {
/** <p>The RDF model that holds the vocabulary terms</p> */
- private static Model m_model = ModelFactory.createDefaultModel();
+ private static final Model m_model = ModelFactory.createDefaultModel();
/** <p>The namespace of the vocabulary as a string</p> */
public static final String NS = "http://jena.hpl.hp.com/2005/05/test-manifest-extra#";
http://git-wip-us.apache.org/repos/asf/jena/blob/d0f9daa4/jena-core/src/main/java/org/apache/jena/vocabulary/VCARD.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/vocabulary/VCARD.java b/jena-core/src/main/java/org/apache/jena/vocabulary/VCARD.java
index 506e1f0..4f2286c 100644
--- a/jena-core/src/main/java/org/apache/jena/vocabulary/VCARD.java
+++ b/jena-core/src/main/java/org/apache/jena/vocabulary/VCARD.java
@@ -41,7 +41,7 @@ public class VCARD {
return uri;
}
- private static Model m = ModelFactory.createDefaultModel();
+ private static final Model m = ModelFactory.createDefaultModel();
public static final Resource ORGPROPERTIES = m.createResource(uri + "ORGPROPERTIES" );
public static final Resource ADRTYPES = m.createResource(uri + "ADRTYPES" );
[02/10] jena git commit: Correct private member name.
Posted by an...@apache.org.
Correct private member name.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/6ed9cdd5
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/6ed9cdd5
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/6ed9cdd5
Branch: refs/heads/master
Commit: 6ed9cdd595fc3716656a7b23e67b890072ac3fef
Parents: af1697a
Author: Andy Seaborne <an...@apache.org>
Authored: Sat Sep 5 21:34:53 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Sat Sep 5 21:34:53 2015 +0100
----------------------------------------------------------------------
.../java/org/apache/jena/sparql/algebra/op/OpPropFunc.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/6ed9cdd5/jena-arq/src/main/java/org/apache/jena/sparql/algebra/op/OpPropFunc.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/algebra/op/OpPropFunc.java b/jena-arq/src/main/java/org/apache/jena/sparql/algebra/op/OpPropFunc.java
index 03d1257..a124930 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/algebra/op/OpPropFunc.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/algebra/op/OpPropFunc.java
@@ -34,14 +34,14 @@ public class OpPropFunc extends Op1
// Safer to have two (Ops are mainly abstract syntax, not executional).
private Node uri ;
private PropFuncArg subjectArgs ;
- private PropFuncArg objectArgs2 ;
+ private PropFuncArg objectArgs ;
public OpPropFunc(Node uri, PropFuncArg args1 , PropFuncArg args2, Op op)
{
super(op) ;
this.uri = uri ;
this.subjectArgs = args1 ;
- this.objectArgs2 = args2 ;
+ this.objectArgs = args2 ;
}
public PropFuncArg getSubjectArgs()
@@ -51,7 +51,7 @@ public class OpPropFunc extends Op1
public PropFuncArg getObjectArgs()
{
- return objectArgs2 ;
+ return objectArgs ;
}
@Override
@@ -69,7 +69,7 @@ public class OpPropFunc extends Op1
@Override
public Op1 copy(Op op)
{
- return new OpPropFunc(uri, subjectArgs, objectArgs2, op) ;
+ return new OpPropFunc(uri, subjectArgs, objectArgs, op) ;
}
@Override
[08/10] jena git commit: Catch all unimplemented froms. Add some new
forms as processed.
Posted by an...@apache.org.
Catch all unimplemented froms. Add some new forms as processed.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/c9760dfa
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/c9760dfa
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/c9760dfa
Branch: refs/heads/master
Commit: c9760dfa5067cf829f32575571f73b34c9737490
Parents: f4e017a
Author: Andy Seaborne <an...@apache.org>
Authored: Sat Sep 5 21:52:54 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Sat Sep 5 21:52:54 2015 +0100
----------------------------------------------------------------------
.../jena/sparql/engine/main/VarFinder.java | 95 ++++++++++++++++++--
1 file changed, 88 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/c9760dfa/jena-arq/src/main/java/org/apache/jena/sparql/engine/main/VarFinder.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/engine/main/VarFinder.java b/jena-arq/src/main/java/org/apache/jena/sparql/engine/main/VarFinder.java
index b5314da..a1a73fb 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/engine/main/VarFinder.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/engine/main/VarFinder.java
@@ -18,7 +18,11 @@
package org.apache.jena.sparql.engine.main;
-import static org.apache.jena.sparql.util.VarUtils.* ;
+import static org.apache.jena.sparql.util.VarUtils.addVar ;
+import static org.apache.jena.sparql.util.VarUtils.addVars ;
+import static org.apache.jena.sparql.util.VarUtils.addVarsFromQuad ;
+import static org.apache.jena.sparql.util.VarUtils.addVarsFromTriple ;
+import static org.apache.jena.sparql.util.VarUtils.addVarsFromTriplePath ;
import java.util.HashSet ;
import java.util.List ;
@@ -26,14 +30,16 @@ import java.util.Map ;
import java.util.Map.Entry ;
import java.util.Set ;
+import org.apache.jena.atlas.lib.NotImplemented ;
import org.apache.jena.sparql.algebra.Op ;
-import org.apache.jena.sparql.algebra.OpVisitorBase ;
+import org.apache.jena.sparql.algebra.OpVisitor ;
import org.apache.jena.sparql.algebra.op.* ;
import org.apache.jena.sparql.core.BasicPattern ;
import org.apache.jena.sparql.core.Var ;
import org.apache.jena.sparql.core.VarExprList ;
import org.apache.jena.sparql.expr.Expr ;
import org.apache.jena.sparql.expr.ExprList ;
+import org.apache.jena.sparql.util.VarUtils ;
public class VarFinder
{
@@ -66,8 +72,9 @@ public class VarFinder
public Set<Var> getAssign() { return varUsageVisitor.assignMentions ; }
public Set<Var> getFixed() { return varUsageVisitor.defines ; }
- private static class VarUsageVisitor extends OpVisitorBase // implements
- // OpVisitor
+ private static class VarUsageVisitor
+ //extends OpVisitorBase
+ implements OpVisitor
{
static VarUsageVisitor apply(Op op) {
VarUsageVisitor v = new VarUsageVisitor();
@@ -96,9 +103,7 @@ public class VarFinder
@Override
public void visit(OpQuadPattern quadPattern) {
- addVar(defines, quadPattern.getGraphNode());
- BasicPattern triples = quadPattern.getBasicPattern();
- addVars(defines, triples);
+ addVars(defines, quadPattern.getGraphNode(), quadPattern.getBasicPattern());
}
@Override
@@ -108,6 +113,26 @@ public class VarFinder
}
@Override
+ public void visit(OpQuadBlock quadBlock) {
+ addVars(defines, quadBlock.getPattern()) ;
+ }
+
+ @Override
+ public void visit(OpTriple opTriple) {
+ addVarsFromTriple(defines, opTriple.getTriple()) ;
+ }
+
+ @Override
+ public void visit(OpQuad opQuad) {
+ addVarsFromQuad(defines, opQuad.getQuad()) ;
+ }
+
+ @Override
+ public void visit(OpPath opPath) {
+ addVarsFromTriplePath(defines, opPath.getTriplePath());
+ }
+
+ @Override
public void visit(OpExt opExt) {
opExt.effectiveOp().visit(this);
}
@@ -235,5 +260,61 @@ public class VarFinder
@Override
public void visit(OpNull opNull) {}
+
+ @Override
+ public void visit(OpPropFunc opPropFunc) {
+ VarUtils.addVarNodes(defines, opPropFunc.getSubjectArgs().getArgList()) ;
+ VarUtils.addVarNodes(defines, opPropFunc.getObjectArgs().getArgList()) ;
+ }
+
+ // Not implemented: with checking.
+
+ private void no() {
+ throw new NotImplemented() ;
+ }
+
+ @Override
+ public void visit(OpProcedure opProc) { no() ; }
+
+
+ @Override
+ public void visit(OpService opService) { no(); }
+
+ @Override
+ public void visit(OpDatasetNames dsNames) { no(); }
+
+ @Override
+ public void visit(OpLabel opLabel) { no(); }
+
+ @Override
+ public void visit(OpDiff opDiff) { no(); }
+
+ @Override
+ public void visit(OpMinus opMinus) { no(); }
+
+ @Override
+ public void visit(OpDisjunction opDisjunction) { no(); }
+
+ @Override
+ public void visit(OpList opList) { no(); }
+
+ @Override
+ public void visit(OpOrder opOrder) { no(); }
+
+ @Override
+ public void visit(OpReduced opReduced) { no(); }
+
+ @Override
+ public void visit(OpDistinct opDistinct) { no(); }
+
+ @Override
+ public void visit(OpSlice opSlice) { no(); }
+
+ @Override
+ public void visit(OpGroup opGroup) { no(); }
+
+ @Override
+ public void visit(OpTopN opTop) { no(); }
}
+
}
[03/10] jena git commit: Fix .equals
Posted by an...@apache.org.
Fix .equals
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/92106286
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/92106286
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/92106286
Branch: refs/heads/master
Commit: 921062862d974fb228f3f5460c0f4ced10ab9e9f
Parents: 6ed9cdd
Author: Andy Seaborne <an...@apache.org>
Authored: Sat Sep 5 21:42:13 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Sat Sep 5 21:42:13 2015 +0100
----------------------------------------------------------------------
.../jena/sparql/algebra/op/OpPropFunc.java | 21 ++++++++++++++++++--
1 file changed, 19 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/92106286/jena-arq/src/main/java/org/apache/jena/sparql/algebra/op/OpPropFunc.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/algebra/op/OpPropFunc.java b/jena-arq/src/main/java/org/apache/jena/sparql/algebra/op/OpPropFunc.java
index a124930..e79df00 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/algebra/op/OpPropFunc.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/algebra/op/OpPropFunc.java
@@ -18,12 +18,15 @@
package org.apache.jena.sparql.algebra.op;
+import java.util.List ;
+
import org.apache.jena.graph.Node ;
import org.apache.jena.sparql.algebra.Op ;
import org.apache.jena.sparql.algebra.OpVisitor ;
import org.apache.jena.sparql.algebra.Transform ;
import org.apache.jena.sparql.pfunction.PropFuncArg ;
import org.apache.jena.sparql.sse.Tags ;
+import org.apache.jena.sparql.util.Iso ;
import org.apache.jena.sparql.util.NodeIsomorphismMap ;
/** Property functions (or any OpBGP replacement)
@@ -83,11 +86,25 @@ public class OpPropFunc extends Op1
{
if ( ! ( other instanceof OpPropFunc ) ) return false ;
OpPropFunc procFunc = (OpPropFunc)other ;
-
-
+ if ( ! isomorphic(getSubjectArgs(), procFunc.getSubjectArgs(), labelMap) )
+ return false ;
+ if ( ! isomorphic(getObjectArgs(), procFunc.getObjectArgs(), labelMap) )
+ return false ;
return getSubOp().equalTo(procFunc.getSubOp(), labelMap) ;
}
+ private static boolean isomorphic(PropFuncArg pfa1, PropFuncArg pfa2, NodeIsomorphismMap labelMap) {
+ if ( pfa1 == null && pfa2 == null )
+ return true ;
+ if ( pfa1 == null ) return false ;
+ if ( pfa2 == null ) return false ;
+
+ List<Node> list1 = pfa1.getArgList() ;
+ List<Node> list2 = pfa2.getArgList() ;
+
+ return Iso.isomorphicNodes(list1, list2, labelMap) ;
+ }
+
@Override
public String getName()
{
[05/10] jena git commit: Add various utility operations to find
variables in structures.
Posted by an...@apache.org.
Add various utility operations to find variables in structures.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/964e10f1
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/964e10f1
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/964e10f1
Branch: refs/heads/master
Commit: 964e10f1205223c966da10779f37024a8e092120
Parents: 657593b
Author: Andy Seaborne <an...@apache.org>
Authored: Sat Sep 5 21:43:15 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Sat Sep 5 21:43:15 2015 +0100
----------------------------------------------------------------------
.../org/apache/jena/sparql/util/VarUtils.java | 86 ++++++++++++--------
1 file changed, 51 insertions(+), 35 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/964e10f1/jena-arq/src/main/java/org/apache/jena/sparql/util/VarUtils.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/util/VarUtils.java b/jena-arq/src/main/java/org/apache/jena/sparql/util/VarUtils.java
index 18b55c8..e2e73e6 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/util/VarUtils.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/util/VarUtils.java
@@ -18,56 +18,72 @@
package org.apache.jena.sparql.util;
-import java.util.Collection ;
-import java.util.HashSet ;
-import java.util.Set ;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Set;
-import org.apache.jena.graph.Node ;
-import org.apache.jena.graph.Triple ;
-import org.apache.jena.sparql.core.BasicPattern ;
-import org.apache.jena.sparql.core.TriplePath ;
-import org.apache.jena.sparql.core.Var ;
+import org.apache.jena.graph.Node;
+import org.apache.jena.graph.Triple;
+import org.apache.jena.sparql.core.* ;
-public class VarUtils
-{
- public static Set<Var> getVars(Triple triple)
- {
- Set<Var> x = new HashSet<>() ;
- addVarsFromTriple(x, triple) ;
- return x ;
+public class VarUtils {
+ public static Set<Var> getVars(Triple triple) {
+ Set<Var> x = new HashSet<>();
+ addVarsFromTriple(x, triple);
+ return x;
}
-
- public static void addVarsFromTriple(Collection<Var> acc, Triple t)
- {
- addVar(acc, t.getSubject()) ;
- addVar(acc, t.getPredicate()) ;
- addVar(acc, t.getObject()) ;
+
+ public static void addVarsFromTriple(Collection<Var> acc, Triple triple) {
+ addVar(acc, triple.getSubject());
+ addVar(acc, triple.getPredicate());
+ addVar(acc, triple.getObject());
+ }
+
+ public static void addVarsFromQuad(Collection<Var> acc, Quad quad) {
+ addVar(acc, quad.getGraph());
+ addVar(acc, quad.getSubject());
+ addVar(acc, quad.getPredicate());
+ addVar(acc, quad.getObject());
}
- public static void addVarsFromTriplePath(Collection<Var> acc, TriplePath tpath)
- {
- addVar(acc, tpath.getSubject()) ;
- addVar(acc, tpath.getObject()) ;
+ public static void addVarsFromTriplePath(Collection<Var> acc, TriplePath tpath) {
+ addVar(acc, tpath.getSubject());
+ addVar(acc, tpath.getObject());
}
- public static void addVar(Collection<Var> acc, Node n)
- {
+ public static void addVar(Collection<Var> acc, Node n) {
if ( n == null )
- return ;
+ return;
if ( n.isVariable() )
- acc.add(Var.alloc(n)) ;
+ acc.add(Var.alloc(n));
}
- public static void addVars(Collection<Var> acc, BasicPattern pattern)
- {
- addVars(acc, pattern.getList()) ;
+ // Name to avoid erasure clash
+ public static void addVarNodes(Collection<Var> acc, Collection<Node> nodes) {
+ for ( Node n : nodes )
+ addVar(acc, n) ;
}
- public static void addVars(Collection<Var> acc, Collection<Triple> triples)
- {
+ public static void addVarsTriples(Collection<Var> acc, Collection<Triple> triples) {
for ( Triple triple : triples )
- addVarsFromTriple(acc, triple) ;
+ addVarsFromTriple(acc, triple);
+ }
+
+ public static void addVars(Collection<Var> acc, BasicPattern pattern) {
+ addVarsTriples(acc, pattern.getList());
}
+ public static void addVars(Collection<Var> acc, Node graphNode, BasicPattern triples) {
+ addVar(acc, graphNode) ;
+ addVars(acc, triples) ;
+ }
+
+ public static void addVars(Collection<Var> acc, QuadPattern quadPattern) {
+ for ( Quad quad : quadPattern.getList() ) {
+ addVarsFromQuad(acc, quad) ;
+ }
+ }
+
+
}
[07/10] jena git commit: Remove debug output.
Posted by an...@apache.org.
Remove debug output.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/f4e017a8
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/f4e017a8
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/f4e017a8
Branch: refs/heads/master
Commit: f4e017a8fb15f6171325754dcfc1c9278a74e382
Parents: 6993061
Author: Andy Seaborne <an...@apache.org>
Authored: Sat Sep 5 21:51:32 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Sat Sep 5 21:51:32 2015 +0100
----------------------------------------------------------------------
.../test/java/org/apache/jena/sparql/algebra/TestClassify.java | 3 ---
1 file changed, 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/f4e017a8/jena-arq/src/test/java/org/apache/jena/sparql/algebra/TestClassify.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/org/apache/jena/sparql/algebra/TestClassify.java b/jena-arq/src/test/java/org/apache/jena/sparql/algebra/TestClassify.java
index ac9f6cc..d3d4b14 100644
--- a/jena-arq/src/test/java/org/apache/jena/sparql/algebra/TestClassify.java
+++ b/jena-arq/src/test/java/org/apache/jena/sparql/algebra/TestClassify.java
@@ -128,9 +128,6 @@ public class TestClassify extends BaseTest
String qs = qs1+"SELECT * "+pattern;
Query query = QueryFactory.create(qs, Syntax.syntaxARQ) ;
Op op = Algebra.compile(query.getQueryPattern()) ;
-
- System.out.println(op) ;
-
if ( ! ( op instanceof OpJoin ) )
fail("Not a join: "+pattern) ;
[10/10] jena git commit: Merge commit 'refs/pull/92/head' of
github.com:apache/jena
Posted by an...@apache.org.
Merge commit 'refs/pull/92/head' of github.com:apache/jena
This closes #92.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/0cc6b6bc
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/0cc6b6bc
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/0cc6b6bc
Branch: refs/heads/master
Commit: 0cc6b6bc64bfd496fc15a2636a7d5b090b7b6d9d
Parents: e82509b d0f9daa
Author: Andy Seaborne <an...@apache.org>
Authored: Sun Sep 6 16:51:36 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Sun Sep 6 16:51:36 2015 +0100
----------------------------------------------------------------------
jena-core/src/main/java/org/apache/jena/vocabulary/DCTerms.java | 2 +-
jena-core/src/main/java/org/apache/jena/vocabulary/DCTypes.java | 2 +-
jena-core/src/main/java/org/apache/jena/vocabulary/DC_11.java | 2 +-
jena-core/src/main/java/org/apache/jena/vocabulary/OWL.java | 2 +-
jena-core/src/main/java/org/apache/jena/vocabulary/OWLResults.java | 2 +-
jena-core/src/main/java/org/apache/jena/vocabulary/OWLTest.java | 2 +-
.../main/java/org/apache/jena/vocabulary/OntDocManagerVocab.java | 2 +-
.../src/main/java/org/apache/jena/vocabulary/OntEventsVocab.java | 2 +-
jena-core/src/main/java/org/apache/jena/vocabulary/RDFTest.java | 2 +-
jena-core/src/main/java/org/apache/jena/vocabulary/SKOS.java | 2 +-
jena-core/src/main/java/org/apache/jena/vocabulary/SKOSXL.java | 2 +-
.../src/main/java/org/apache/jena/vocabulary/TestManifest.java | 2 +-
.../src/main/java/org/apache/jena/vocabulary/TestManifestX.java | 2 +-
jena-core/src/main/java/org/apache/jena/vocabulary/VCARD.java | 2 +-
14 files changed, 14 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
[09/10] jena git commit: Debug support - print outcome.
Posted by an...@apache.org.
Debug support - print outcome.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/e82509b6
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/e82509b6
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/e82509b6
Branch: refs/heads/master
Commit: e82509b6631e916155d331d4646234e83e8f7278
Parents: c9760df
Author: Andy Seaborne <an...@apache.org>
Authored: Sat Sep 5 21:53:17 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Sat Sep 5 21:53:17 2015 +0100
----------------------------------------------------------------------
.../org/apache/jena/sparql/engine/main/JoinClassifier.java | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/e82509b6/jena-arq/src/main/java/org/apache/jena/sparql/engine/main/JoinClassifier.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/engine/main/JoinClassifier.java b/jena-arq/src/main/java/org/apache/jena/sparql/engine/main/JoinClassifier.java
index d6115e9..f81eeaf 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/engine/main/JoinClassifier.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/engine/main/JoinClassifier.java
@@ -159,7 +159,12 @@ public class JoinClassifier
System.err.println("Case 3 = " + bad3) ;
// Linear if all conditions are false
- return !bad1 && !bad2 && !bad3 ;
+ boolean result = !bad1 && !bad2 && !bad3 ;
+
+ if ( print ) {
+ System.err.println("Result: "+result) ;
+ }
+ return result ;
}
/** Find the "effective op" - ie. the one that may be sensitive to linearization */
[04/10] jena git commit: Fix javadoc typos
Posted by an...@apache.org.
Fix javadoc typos
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/657593b8
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/657593b8
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/657593b8
Branch: refs/heads/master
Commit: 657593b84b0d1f7994bef6de1409fd80b305e917
Parents: 9210628
Author: Andy Seaborne <an...@apache.org>
Authored: Sat Sep 5 21:42:35 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Sat Sep 5 21:42:35 2015 +0100
----------------------------------------------------------------------
.../main/java/org/apache/jena/sparql/algebra/op/OpQuadBlock.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/657593b8/jena-arq/src/main/java/org/apache/jena/sparql/algebra/op/OpQuadBlock.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/algebra/op/OpQuadBlock.java b/jena-arq/src/main/java/org/apache/jena/sparql/algebra/op/OpQuadBlock.java
index f9567c6..9a4f815 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/algebra/op/OpQuadBlock.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/algebra/op/OpQuadBlock.java
@@ -34,7 +34,7 @@ import org.apache.jena.sparql.util.NodeIsomorphismMap ;
/** A list of quads.
*
- * <code>OpQuadBlock</code> is anny colelction of quads, whereas
+ * <code>OpQuadBlock</code> is any collection of quads, whereas
* {@link OpQuadPattern} is quads with the same graph node.
* The flip in naming is historical.
*/
[06/10] jena git commit: Cope with null pointers.
Posted by an...@apache.org.
Cope with null pointers.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/69930616
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/69930616
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/69930616
Branch: refs/heads/master
Commit: 699306160076a99fbf4d617f31e8a84cadc4077e
Parents: 964e10f
Author: Andy Seaborne <an...@apache.org>
Authored: Sat Sep 5 21:46:49 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Sat Sep 5 21:46:49 2015 +0100
----------------------------------------------------------------------
jena-arq/src/main/java/org/apache/jena/sparql/util/VarUtils.java | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/69930616/jena-arq/src/main/java/org/apache/jena/sparql/util/VarUtils.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/util/VarUtils.java b/jena-arq/src/main/java/org/apache/jena/sparql/util/VarUtils.java
index e2e73e6..166293d 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/util/VarUtils.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/util/VarUtils.java
@@ -61,6 +61,8 @@ public class VarUtils {
// Name to avoid erasure clash
public static void addVarNodes(Collection<Var> acc, Collection<Node> nodes) {
+ if ( nodes == null )
+ return ;
for ( Node n : nodes )
addVar(acc, n) ;
}