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/10/02 12:10:23 UTC
[1/5] jena git commit: Use NodeConst constant.
Repository: jena
Updated Branches:
refs/heads/master fa26eefe0 -> 859ca7257
Use NodeConst constant.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/390c3715
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/390c3715
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/390c3715
Branch: refs/heads/master
Commit: 390c3715723f86366ce69ea14abcf4fdd1f1e2d6
Parents: fa26eef
Author: Andy Seaborne <an...@apache.org>
Authored: Fri Oct 2 09:19:48 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Fri Oct 2 09:19:48 2015 +0100
----------------------------------------------------------------------
.../src/main/java/org/apache/jena/riot/lang/LangTurtleBase.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/390c3715/jena-arq/src/main/java/org/apache/jena/riot/lang/LangTurtleBase.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/lang/LangTurtleBase.java b/jena-arq/src/main/java/org/apache/jena/riot/lang/LangTurtleBase.java
index 90d1bc1..22a70d4 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/lang/LangTurtleBase.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/lang/LangTurtleBase.java
@@ -32,6 +32,7 @@ import static org.apache.jena.riot.tokens.TokenType.PREFIXED_NAME ;
import static org.apache.jena.riot.tokens.TokenType.RBRACKET ;
import static org.apache.jena.riot.tokens.TokenType.RPAREN ;
import static org.apache.jena.riot.tokens.TokenType.SEMICOLON ;
+
import org.apache.jena.graph.Node ;
import org.apache.jena.graph.NodeFactory ;
import org.apache.jena.iri.IRI ;
@@ -41,7 +42,6 @@ import org.apache.jena.riot.tokens.Token ;
import org.apache.jena.riot.tokens.TokenType ;
import org.apache.jena.riot.tokens.Tokenizer ;
import org.apache.jena.sparql.graph.NodeConst ;
-import org.apache.jena.vocabulary.OWL ;
/** The main engine for all things Turtle-ish (Turtle, TriG). */
public abstract class LangTurtleBase extends LangBase {
@@ -287,7 +287,7 @@ public abstract class LangTurtleBase extends LangBase {
objectList(subject, predicate) ;
}
- static protected final Node nodeSameAs = OWL.sameAs.asNode() ;
+ static protected final Node nodeSameAs = NodeConst.nodeOwlSameAs ;
static protected final Node nodeLogImplies = NodeFactory.createURI("http://www.w3.org/2000/10/swap/log#implies") ;
/** Get predicate - maybe null for "illegal" */
[2/5] jena git commit: JENA-1039: Ensure dependent OWL constants
initialized before proceeding
Posted by an...@apache.org.
JENA-1039: Ensure dependent OWL constants initialized before proceeding
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/873993cf
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/873993cf
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/873993cf
Branch: refs/heads/master
Commit: 873993cfb74b0a6728d8bb29532a0583e0912fb9
Parents: 390c371
Author: Andy Seaborne <an...@apache.org>
Authored: Fri Oct 2 09:20:48 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Fri Oct 2 09:20:48 2015 +0100
----------------------------------------------------------------------
jena-arq/src/main/java/org/apache/jena/sparql/ARQConstants.java | 3 +++
.../src/main/java/org/apache/jena/sparql/expr/NodeValue.java | 3 +++
.../src/main/java/org/apache/jena/sparql/graph/NodeConst.java | 5 ++++-
3 files changed, 10 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/873993cf/jena-arq/src/main/java/org/apache/jena/sparql/ARQConstants.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/ARQConstants.java b/jena-arq/src/main/java/org/apache/jena/sparql/ARQConstants.java
index ffa319e..4a46d21 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/ARQConstants.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/ARQConstants.java
@@ -22,6 +22,7 @@ import org.apache.jena.datatypes.xsd.XSDDatatype ;
import org.apache.jena.shared.PrefixMapping ;
import org.apache.jena.shared.impl.PrefixMappingImpl ;
import org.apache.jena.sparql.util.Symbol ;
+import org.apache.jena.system.JenaSystem ;
import org.apache.jena.vocabulary.OWL ;
import org.apache.jena.vocabulary.RDF ;
import org.apache.jena.vocabulary.RDFS ;
@@ -31,6 +32,8 @@ import org.apache.jena.vocabulary.RDFS ;
*/
public class ARQConstants
{
+ static { JenaSystem.init() ; }
+
/** The prefix of XQuery/Xpath functions and operator */
public static final String fnPrefix = "http://www.w3.org/2005/xpath-functions#" ;
http://git-wip-us.apache.org/repos/asf/jena/blob/873993cf/jena-arq/src/main/java/org/apache/jena/sparql/expr/NodeValue.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/expr/NodeValue.java b/jena-arq/src/main/java/org/apache/jena/sparql/expr/NodeValue.java
index 68ce1ff..b83e3ba 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/expr/NodeValue.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/expr/NodeValue.java
@@ -57,12 +57,15 @@ import org.apache.jena.sparql.graph.NodeConst ;
import org.apache.jena.sparql.graph.NodeTransform ;
import org.apache.jena.sparql.serializer.SerializationContext ;
import org.apache.jena.sparql.util.* ;
+import org.apache.jena.system.JenaSystem ;
import org.apache.jena.vocabulary.RDF ;
import org.slf4j.Logger ;
import org.slf4j.LoggerFactory ;
public abstract class NodeValue extends ExprNode
{
+ static { JenaSystem.init() ; }
+
// Maybe:: NodeValueStringLang - strings with language tag
/* Naming:
http://git-wip-us.apache.org/repos/asf/jena/blob/873993cf/jena-arq/src/main/java/org/apache/jena/sparql/graph/NodeConst.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/graph/NodeConst.java b/jena-arq/src/main/java/org/apache/jena/sparql/graph/NodeConst.java
index 28915c5..0638ed4 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/graph/NodeConst.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/graph/NodeConst.java
@@ -22,12 +22,14 @@ import org.apache.jena.datatypes.RDFDatatype ;
import org.apache.jena.datatypes.xsd.XSDDatatype ;
import org.apache.jena.graph.Node ;
import org.apache.jena.graph.NodeFactory ;
+import org.apache.jena.system.JenaSystem ;
import org.apache.jena.vocabulary.OWL ;
import org.apache.jena.vocabulary.RDF ;
/** Some node constants */
public class NodeConst
{
+ static { JenaSystem.init(); }
public static final Node nodeTrue = NodeFactory.createLiteral("true", XSDDatatype.XSDboolean) ;
public static final Node nodeFalse = NodeFactory.createLiteral("false",XSDDatatype.XSDboolean) ;
public static final Node nodeZero = NodeFactory.createLiteral("0", XSDDatatype.XSDinteger) ;
@@ -42,7 +44,8 @@ public class NodeConst
public static final Node nodeNil = RDF.Nodes.nil ;
public static final Node nodeANY = Node.ANY ;
- public static final Node nodeOwlSameAs = OWL.sameAs.asNode() ;
+ // Avoid OWL.sameAs.asNode() ;
+ public static final Node nodeOwlSameAs = OWL.sameAs.asNode() ; // NodeFactory.createURI("http://www.w3.org/2002/07/owl#sameAs") ;
public static final Node rdfLangString = RDF.Nodes.langString ;
public static final RDFDatatype dtLangString = RDF.dtLangString ;
}
[4/5] jena git commit: JENA-1039: Tidy up file - add notes about
initialization.
Posted by an...@apache.org.
JENA-1039: Tidy up file - add notes about initialization.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/1f9de037
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/1f9de037
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/1f9de037
Branch: refs/heads/master
Commit: 1f9de03793e8791b5a57e78cf94c595fc015b14c
Parents: bf549f3
Author: Andy Seaborne <an...@apache.org>
Authored: Fri Oct 2 10:51:55 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Fri Oct 2 10:51:55 2015 +0100
----------------------------------------------------------------------
.../org/apache/jena/sparql/graph/NodeConst.java | 35 ++++++++++++--------
1 file changed, 21 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/1f9de037/jena-arq/src/main/java/org/apache/jena/sparql/graph/NodeConst.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/graph/NodeConst.java b/jena-arq/src/main/java/org/apache/jena/sparql/graph/NodeConst.java
index 0638ed4..ea89816 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/graph/NodeConst.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/graph/NodeConst.java
@@ -22,30 +22,37 @@ import org.apache.jena.datatypes.RDFDatatype ;
import org.apache.jena.datatypes.xsd.XSDDatatype ;
import org.apache.jena.graph.Node ;
import org.apache.jena.graph.NodeFactory ;
-import org.apache.jena.system.JenaSystem ;
import org.apache.jena.vocabulary.OWL ;
import org.apache.jena.vocabulary.RDF ;
/** Some node constants */
public class NodeConst
{
- static { JenaSystem.init(); }
- public static final Node nodeTrue = NodeFactory.createLiteral("true", XSDDatatype.XSDboolean) ;
- public static final Node nodeFalse = NodeFactory.createLiteral("false",XSDDatatype.XSDboolean) ;
- public static final Node nodeZero = NodeFactory.createLiteral("0", XSDDatatype.XSDinteger) ;
- public static final Node nodeOne = NodeFactory.createLiteral("1", XSDDatatype.XSDinteger) ;
- public static final Node nodeTwo = NodeFactory.createLiteral("2", XSDDatatype.XSDinteger) ;
- public static final Node nodeMinusOne = NodeFactory.createLiteral("-1", XSDDatatype.XSDinteger) ;
+ private static Node literal(String lex, RDFDatatype dt) {
+ return NodeFactory.createLiteral(lex, dt) ;
+ }
+
+ private static Node uri(String uriStr) {
+ return NodeFactory.createURI(uriStr) ;
+ }
+
+ public static final Node nodeTrue = literal("true", XSDDatatype.XSDboolean) ;
+ public static final Node nodeFalse = literal("false", XSDDatatype.XSDboolean) ;
+ public static final Node nodeZero = literal("0", XSDDatatype.XSDinteger) ;
+ public static final Node nodeOne = literal("1", XSDDatatype.XSDinteger) ;
+ public static final Node nodeTwo = literal("2", XSDDatatype.XSDinteger) ;
+ public static final Node nodeMinusOne = literal("-1", XSDDatatype.XSDinteger) ;
public static final Node emptyString = NodeFactory.createLiteral("") ;
- public static final Node nodeRDFType = RDF.Nodes.type ;
- public static final Node nodeFirst = RDF.Nodes.first ;
- public static final Node nodeRest = RDF.Nodes.rest ;
- public static final Node nodeNil = RDF.Nodes.nil ;
+ // It should be safe to use RDF.Nodes.
+ // Falback code "just in case"
+ public static final Node nodeRDFType = RDF.Nodes.type ; //uri(RDF.uri+"type") ;
+ public static final Node nodeFirst = RDF.Nodes.first ; //uri(RDF.uri+"first") ;
+ public static final Node nodeRest = RDF.Nodes.rest ; //uri(RDF.uri+"rest") ;
+ public static final Node nodeNil = RDF.Nodes.nil; //uri(RDF.uri+"nil") ;
public static final Node nodeANY = Node.ANY ;
- // Avoid OWL.sameAs.asNode() ;
- public static final Node nodeOwlSameAs = OWL.sameAs.asNode() ; // NodeFactory.createURI("http://www.w3.org/2002/07/owl#sameAs") ;
+ public static final Node nodeOwlSameAs = OWL.sameAs.asNode() ; //NodeFactory.createURI("http://www.w3.org/2002/07/owl#sameAs") ;
public static final Node rdfLangString = RDF.Nodes.langString ;
public static final RDFDatatype dtLangString = RDF.dtLangString ;
}
[5/5] jena git commit: JENA-1039: Use ResourceFactory,
not a locally created Model.
Posted by an...@apache.org.
JENA-1039: Use ResourceFactory, not a locally created Model.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/859ca725
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/859ca725
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/859ca725
Branch: refs/heads/master
Commit: 859ca7257078a23f4215719749caf2204e48683d
Parents: 1f9de03
Author: Andy Seaborne <an...@apache.org>
Authored: Fri Oct 2 10:52:23 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Fri Oct 2 10:52:23 2015 +0100
----------------------------------------------------------------------
.../java/org/apache/jena/vocabulary/OWL.java | 126 ++++++++++---------
1 file changed, 70 insertions(+), 56 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/859ca725/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 984e942..52b3a1b 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
@@ -20,23 +20,40 @@
///////////////////////////////////////
package org.apache.jena.vocabulary;
-
// Imports
///////////////////////////////////////
import org.apache.jena.rdf.model.* ;
-//import org.apache.jena.system.JenaSystem ;
-
-
-
/**
* Vocabulary definitions from file:vocabularies/owl.owl
*/
public class OWL {
- // ModelFactory.createDefaultModel calls JenaSystem.init
- /** <p>The RDF model that holds the vocabulary terms</p> */
- private static final Model m_model = ModelFactory.createDefaultModel();
-
+ // Using ResourceFactory to avoid initialization circularity problems.
+ // OWL is a central place where other classes go to get their constants
+ // causing potential circularity of initialization.
+ // If OWL starts the Jena initialization process
+ // (ModelFactory.createDefaultModel calls JenaSystem.init)
+ // then classes can easily see uninitialized constants.
+
+ // Remove after Jena 3.0.1 or later.
+// // ModelFactory.createDefaultModel calls JenaSystem.init
+// /** <p>The RDF model that holds the vocabulary terms</p> */
+// private static final Model m_model = ModelFactory.createDefaultModel();
+//
+// protected static final Resource resource( String uri )
+// { return m_model.createResource( uri ); }
+//
+// protected static final Property property( String uri )
+// { return m_model.createProperty( uri ); }
+
+ // These will use ResourceFactory which creates Resource etc without a specific model.
+ // This is safer for complex initialization paths.
+ protected static final Resource resource( String uri )
+ { return ResourceFactory.createResource( uri ); }
+
+ protected static final Property property( String uri )
+ { return ResourceFactory.createProperty( uri ); }
+
/** <p>The namespace of the vocabulary as a string ({@value})</p> */
public static final String NS = "http://www.w3.org/2002/07/owl#";
@@ -45,106 +62,103 @@ public class OWL {
public static String getURI() {return NS;}
/** <p>The namespace of the vocabulary as a resource</p> */
- public static final Resource NAMESPACE = m_model.createResource( NS );
+ public static final Resource NAMESPACE = resource( NS );
/** A resource that denotes the OWL-full sublanguage of OWL */
- public static final Resource FULL_LANG = m_model.getResource( getURI() );
+ public static final Resource FULL_LANG = resource( getURI() );
/** A resource, not officially sanctioned by WebOnt, that denotes the OWL-DL sublanguage of OWL */
- public static final Resource DL_LANG = m_model.getResource( "http://www.w3.org/TR/owl-features/#term_OWLDL" );
+ public static final Resource DL_LANG = resource( "http://www.w3.org/TR/owl-features/#term_OWLDL" );
/** A resource, not officially sanctioned by WebOnt, that denotes the OWL-Lite sublanguage of OWL */
- public static final Resource LITE_LANG = m_model.getResource( "http://www.w3.org/TR/owl-features/#term_OWLLite" );
+ public static final Resource LITE_LANG = resource( "http://www.w3.org/TR/owl-features/#term_OWLLite" );
// Vocabulary properties
///////////////////////////
- public static final Property maxCardinality = m_model.createProperty( "http://www.w3.org/2002/07/owl#maxCardinality" );
+ public static final Property maxCardinality = property( "http://www.w3.org/2002/07/owl#maxCardinality" );
- public static final Property versionInfo = m_model.createProperty( "http://www.w3.org/2002/07/owl#versionInfo" );
+ public static final Property versionInfo = property( "http://www.w3.org/2002/07/owl#versionInfo" );
- public static final Property equivalentClass = m_model.createProperty( "http://www.w3.org/2002/07/owl#equivalentClass" );
+ public static final Property equivalentClass = property( "http://www.w3.org/2002/07/owl#equivalentClass" );
- public static final Property distinctMembers = m_model.createProperty( "http://www.w3.org/2002/07/owl#distinctMembers" );
+ public static final Property distinctMembers = property( "http://www.w3.org/2002/07/owl#distinctMembers" );
- public static final Property oneOf = m_model.createProperty( "http://www.w3.org/2002/07/owl#oneOf" );
+ public static final Property oneOf = property( "http://www.w3.org/2002/07/owl#oneOf" );
- public static final Property sameAs = m_model.createProperty( "http://www.w3.org/2002/07/owl#sameAs" );
+ public static final Property sameAs = property( "http://www.w3.org/2002/07/owl#sameAs" );
- public static final Property incompatibleWith = m_model.createProperty( "http://www.w3.org/2002/07/owl#incompatibleWith" );
+ public static final Property incompatibleWith = property( "http://www.w3.org/2002/07/owl#incompatibleWith" );
- public static final Property minCardinality = m_model.createProperty( "http://www.w3.org/2002/07/owl#minCardinality" );
+ public static final Property minCardinality = property( "http://www.w3.org/2002/07/owl#minCardinality" );
- public static final Property complementOf = m_model.createProperty( "http://www.w3.org/2002/07/owl#complementOf" );
+ public static final Property complementOf = property( "http://www.w3.org/2002/07/owl#complementOf" );
- public static final Property onProperty = m_model.createProperty( "http://www.w3.org/2002/07/owl#onProperty" );
+ public static final Property onProperty = property( "http://www.w3.org/2002/07/owl#onProperty" );
- public static final Property equivalentProperty = m_model.createProperty( "http://www.w3.org/2002/07/owl#equivalentProperty" );
+ public static final Property equivalentProperty = property( "http://www.w3.org/2002/07/owl#equivalentProperty" );
- public static final Property inverseOf = m_model.createProperty( "http://www.w3.org/2002/07/owl#inverseOf" );
+ public static final Property inverseOf = property( "http://www.w3.org/2002/07/owl#inverseOf" );
- public static final Property backwardCompatibleWith = m_model.createProperty( "http://www.w3.org/2002/07/owl#backwardCompatibleWith" );
+ public static final Property backwardCompatibleWith = property( "http://www.w3.org/2002/07/owl#backwardCompatibleWith" );
- public static final Property differentFrom = m_model.createProperty( "http://www.w3.org/2002/07/owl#differentFrom" );
+ public static final Property differentFrom = property( "http://www.w3.org/2002/07/owl#differentFrom" );
- public static final Property priorVersion = m_model.createProperty( "http://www.w3.org/2002/07/owl#priorVersion" );
+ public static final Property priorVersion = property( "http://www.w3.org/2002/07/owl#priorVersion" );
- public static final Property imports = m_model.createProperty( "http://www.w3.org/2002/07/owl#imports" );
+ public static final Property imports = property( "http://www.w3.org/2002/07/owl#imports" );
- public static final Property allValuesFrom = m_model.createProperty( "http://www.w3.org/2002/07/owl#allValuesFrom" );
+ public static final Property allValuesFrom = property( "http://www.w3.org/2002/07/owl#allValuesFrom" );
- public static final Property unionOf = m_model.createProperty( "http://www.w3.org/2002/07/owl#unionOf" );
+ public static final Property unionOf = property( "http://www.w3.org/2002/07/owl#unionOf" );
- public static final Property hasValue = m_model.createProperty( "http://www.w3.org/2002/07/owl#hasValue" );
+ public static final Property hasValue = property( "http://www.w3.org/2002/07/owl#hasValue" );
- public static final Property someValuesFrom = m_model.createProperty( "http://www.w3.org/2002/07/owl#someValuesFrom" );
+ public static final Property someValuesFrom = property( "http://www.w3.org/2002/07/owl#someValuesFrom" );
- public static final Property disjointWith = m_model.createProperty( "http://www.w3.org/2002/07/owl#disjointWith" );
+ public static final Property disjointWith = property( "http://www.w3.org/2002/07/owl#disjointWith" );
- public static final Property cardinality = m_model.createProperty( "http://www.w3.org/2002/07/owl#cardinality" );
-
- public static final Property intersectionOf = m_model.createProperty( "http://www.w3.org/2002/07/owl#intersectionOf" );
+ public static final Property cardinality = property( "http://www.w3.org/2002/07/owl#cardinality" );
+ public static final Property intersectionOf = property( "http://www.w3.org/2002/07/owl#intersectionOf" );
// Vocabulary classes
///////////////////////////
- public static final Resource Thing = m_model.createResource( "http://www.w3.org/2002/07/owl#Thing" );
-
- public static final Resource DataRange = m_model.createResource( "http://www.w3.org/2002/07/owl#DataRange" );
+ public static final Resource Thing = resource( "http://www.w3.org/2002/07/owl#Thing" );
- public static final Resource Ontology = m_model.createResource( "http://www.w3.org/2002/07/owl#Ontology" );
+ public static final Resource DataRange = resource( "http://www.w3.org/2002/07/owl#DataRange" );
- public static final Resource DeprecatedClass = m_model.createResource( "http://www.w3.org/2002/07/owl#DeprecatedClass" );
+ public static final Resource Ontology = resource( "http://www.w3.org/2002/07/owl#Ontology" );
- public static final Resource AllDifferent = m_model.createResource( "http://www.w3.org/2002/07/owl#AllDifferent" );
+ public static final Resource DeprecatedClass = resource( "http://www.w3.org/2002/07/owl#DeprecatedClass" );
- public static final Resource DatatypeProperty = m_model.createResource( "http://www.w3.org/2002/07/owl#DatatypeProperty" );
+ public static final Resource AllDifferent = resource( "http://www.w3.org/2002/07/owl#AllDifferent" );
- public static final Resource SymmetricProperty = m_model.createResource( "http://www.w3.org/2002/07/owl#SymmetricProperty" );
+ public static final Resource DatatypeProperty = resource( "http://www.w3.org/2002/07/owl#DatatypeProperty" );
- public static final Resource TransitiveProperty = m_model.createResource( "http://www.w3.org/2002/07/owl#TransitiveProperty" );
+ public static final Resource SymmetricProperty = resource( "http://www.w3.org/2002/07/owl#SymmetricProperty" );
- public static final Resource DeprecatedProperty = m_model.createResource( "http://www.w3.org/2002/07/owl#DeprecatedProperty" );
+ public static final Resource TransitiveProperty = resource( "http://www.w3.org/2002/07/owl#TransitiveProperty" );
- public static final Resource AnnotationProperty = m_model.createResource( "http://www.w3.org/2002/07/owl#AnnotationProperty" );
+ public static final Resource DeprecatedProperty = resource( "http://www.w3.org/2002/07/owl#DeprecatedProperty" );
- public static final Resource Restriction = m_model.createResource( "http://www.w3.org/2002/07/owl#Restriction" );
+ public static final Resource AnnotationProperty = resource( "http://www.w3.org/2002/07/owl#AnnotationProperty" );
- public static final Resource Class = m_model.createResource( "http://www.w3.org/2002/07/owl#Class" );
+ public static final Resource Restriction = resource( "http://www.w3.org/2002/07/owl#Restriction" );
- public static final Resource OntologyProperty = m_model.createResource( "http://www.w3.org/2002/07/owl#OntologyProperty" );
+ public static final Resource Class = resource( "http://www.w3.org/2002/07/owl#Class" );
- public static final Resource ObjectProperty = m_model.createResource( "http://www.w3.org/2002/07/owl#ObjectProperty" );
+ public static final Resource OntologyProperty = resource( "http://www.w3.org/2002/07/owl#OntologyProperty" );
- public static final Resource FunctionalProperty = m_model.createResource( "http://www.w3.org/2002/07/owl#FunctionalProperty" );
+ public static final Resource ObjectProperty = resource( "http://www.w3.org/2002/07/owl#ObjectProperty" );
- public static final Resource InverseFunctionalProperty = m_model.createResource( "http://www.w3.org/2002/07/owl#InverseFunctionalProperty" );
+ public static final Resource FunctionalProperty = resource( "http://www.w3.org/2002/07/owl#FunctionalProperty" );
- public static final Resource Nothing = m_model.createResource( "http://www.w3.org/2002/07/owl#Nothing" );
+ public static final Resource InverseFunctionalProperty = resource( "http://www.w3.org/2002/07/owl#InverseFunctionalProperty" );
+ public static final Resource Nothing = resource( "http://www.w3.org/2002/07/owl#Nothing" );
// Vocabulary individuals
///////////////////////////
-
}
[3/5] jena git commit: Note that Modelfactory calls JenaSystem.init.
Posted by an...@apache.org.
Note that Modelfactory calls JenaSystem.init.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/bf549f3e
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/bf549f3e
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/bf549f3e
Branch: refs/heads/master
Commit: bf549f3e1189e40baee6f5b0580ff4cafe1546cc
Parents: 873993c
Author: Andy Seaborne <an...@apache.org>
Authored: Fri Oct 2 09:30:09 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Fri Oct 2 09:30:09 2015 +0100
----------------------------------------------------------------------
jena-core/src/main/java/org/apache/jena/vocabulary/OWL.java | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/bf549f3e/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 4e2df46..984e942 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
@@ -24,6 +24,7 @@ package org.apache.jena.vocabulary;
// Imports
///////////////////////////////////////
import org.apache.jena.rdf.model.* ;
+//import org.apache.jena.system.JenaSystem ;
@@ -32,6 +33,7 @@ import org.apache.jena.rdf.model.* ;
* Vocabulary definitions from file:vocabularies/owl.owl
*/
public class OWL {
+ // ModelFactory.createDefaultModel calls JenaSystem.init
/** <p>The RDF model that holds the vocabulary terms</p> */
private static final Model m_model = ModelFactory.createDefaultModel();