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 2013/12/30 21:18:47 UTC
svn commit: r1554309 - in
/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/ontology/impl:
OWLDLProfile.java OWLLiteProfile.java OWLProfile.java
Author: andy
Date: Mon Dec 30 20:18:47 2013
New Revision: 1554309
URL: http://svn.apache.org/r1554309
Log:
Use node.is???() tests, not instanceof.
Modified:
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/ontology/impl/OWLDLProfile.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/ontology/impl/OWLLiteProfile.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/ontology/impl/OWLProfile.java
Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/ontology/impl/OWLDLProfile.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/ontology/impl/OWLDLProfile.java?rev=1554309&r1=1554308&r2=1554309&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/ontology/impl/OWLDLProfile.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/ontology/impl/OWLDLProfile.java Mon Dec 30 20:18:47 2013
@@ -250,7 +250,7 @@ public class OWLDLProfile
{ Individual.class, new SupportsCheck() {
@Override
public boolean doCheck( Node n, EnhGraph g ) {
- if (n instanceof Node_URI || n instanceof Node_Blank) {
+ if ( n.isURI() || n.isBlank() ) {
return !hasType( n, g, new Resource[] {RDFS.Class, RDF.Property, OWL.Class,
OWL.ObjectProperty, OWL.DatatypeProperty, OWL.TransitiveProperty,
OWL.FunctionalProperty, OWL.InverseFunctionalProperty} );
@@ -264,7 +264,7 @@ public class OWLDLProfile
{ DataRange.class, new SupportsCheck() {
@Override
public boolean doCheck( Node n, EnhGraph g ) {
- return n instanceof Node_Blank &&
+ return n.isBlank() &&
g.asGraph().contains( n, RDF.type.asNode(), OWL.DataRange.asNode() );
}
}
Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/ontology/impl/OWLLiteProfile.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/ontology/impl/OWLLiteProfile.java?rev=1554309&r1=1554308&r2=1554309&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/ontology/impl/OWLLiteProfile.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/ontology/impl/OWLLiteProfile.java Mon Dec 30 20:18:47 2013
@@ -266,7 +266,7 @@ public class OWLLiteProfile
{ Individual.class, new SupportsCheck() {
@Override
public boolean doCheck( Node n, EnhGraph g ) {
- if (n instanceof Node_URI || n instanceof Node_Blank) {
+ if (n.isURI() || n.isBlank() ) {
// OWL Lite individuals are disjoint from other language classes
return !hasType( n, g, new Resource[] {RDFS.Class, RDF.Property, OWL.Class,
OWL.ObjectProperty, OWL.DatatypeProperty, OWL.TransitiveProperty,
Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/ontology/impl/OWLProfile.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/ontology/impl/OWLProfile.java?rev=1554309&r1=1554308&r2=1554309&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/ontology/impl/OWLProfile.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/ontology/impl/OWLProfile.java Mon Dec 30 20:18:47 2013
@@ -534,14 +534,14 @@ public class OWLProfile
{ Individual.class, new SupportsCheck() {
@Override
public boolean doCheck( Node n, EnhGraph g ) {
- return n instanceof Node_URI || n instanceof Node_Blank;
+ return n.isURI() || n.isBlank() ;
}
}
},
{ DataRange.class, new SupportsCheck() {
@Override
public boolean doCheck( Node n, EnhGraph g ) {
- return n instanceof Node_Blank &&
+ return n.isBlank() &&
g.asGraph().contains( n, RDF.type.asNode(), OWL.DataRange.asNode() );
}
}