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 2014/06/27 15:20:03 UTC
svn commit: r1606090 [3/4] - in /jena/trunk/jena-core/src:
main/java/com/hp/hpl/jena/graph/ main/java/com/hp/hpl/jena/mem/
main/java/com/hp/hpl/jena/n3/ main/java/com/hp/hpl/jena/ontology/
main/java/com/hp/hpl/jena/ontology/impl/ main/java/com/hp/hpl/j...
Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/ontology/impl/OntClassImpl.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/ontology/impl/OntClassImpl.java?rev=1606090&r1=1606089&r2=1606090&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/ontology/impl/OntClassImpl.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/ontology/impl/OntClassImpl.java Fri Jun 27 13:20:01 2014
@@ -122,7 +122,7 @@ public class OntClassImpl
* <p>Assert that this class is sub-class of the given class. Any existing
* statements for <code>subClassOf</code> will be removed.</p>
* @param cls The class that this class is a sub-class of
- * @exception OntProfileException If the {@link Profile#SUB_CLASS_OF()} property is not supported in the current language profile.
+ * @exception ProfileException If the {@link Profile#SUB_CLASS_OF()} property is not supported in the current language profile.
*/
@Override
public void setSuperClass( Resource cls ) {
@@ -132,7 +132,7 @@ public class OntClassImpl
/**
* <p>Add a super-class of this class.</p>
* @param cls A class that is a super-class of this class.
- * @exception OntProfileException If the {@link Profile#SUB_CLASS_OF()} property is not supported in the current language profile.
+ * @exception ProfileException If the {@link Profile#SUB_CLASS_OF()} property is not supported in the current language profile.
*/
@Override
public void addSuperClass( Resource cls ) {
@@ -143,7 +143,7 @@ public class OntClassImpl
* <p>Answer a class that is the super-class of this class. If there is
* more than one such class, an arbitrary selection is made.</p>
* @return A super-class of this class
- * @exception OntProfileException If the {@link Profile#SUB_CLASS_OF()} property is not supported in the current language profile.
+ * @exception ProfileException If the {@link Profile#SUB_CLASS_OF()} property is not supported in the current language profile.
*/
@Override
public OntClass getSuperClass() {
@@ -154,7 +154,7 @@ public class OntClassImpl
* <p>Answer an iterator over all of the classes that are declared to be super-classes of
* this class. Each element of the iterator will be an {@link OntClass}.</p>
* @return An iterator over the super-classes of this class.
- * @exception OntProfileException If the {@link Profile#SUB_CLASS_OF()} property is not supported in the current language profile.
+ * @exception ProfileException If the {@link Profile#SUB_CLASS_OF()} property is not supported in the current language profile.
*/
@Override
public ExtendedIterator<OntClass> listSuperClasses() {
@@ -172,7 +172,7 @@ public class OntClassImpl
* super-class relation: i.e. eliminate any class for which there is a longer route
* to reach that child under the super-class relation.
* @return an iterator over the resources representing this class's sub-classes.
- * @exception OntProfileException If the {@link Profile#SUB_CLASS_OF()} property is not supported in the current language profile.
+ * @exception ProfileException If the {@link Profile#SUB_CLASS_OF()} property is not supported in the current language profile.
*/
@Override
public ExtendedIterator<OntClass> listSuperClasses( boolean direct ) {
@@ -184,7 +184,7 @@ public class OntClassImpl
* <p>Answer true if the given class is a super-class of this class.</p>
* @param cls A class to test.
* @return True if the given class is a super-class of this class.
- * @exception OntProfileException If the {@link Profile#SUB_CLASS_OF()} property is not supported in the current language profile.
+ * @exception ProfileException If the {@link Profile#SUB_CLASS_OF()} property is not supported in the current language profile.
*/
@Override
public boolean hasSuperClass( Resource cls ) {
@@ -195,7 +195,7 @@ public class OntClassImpl
* <p>Answer true if this class has any super-class in the model. Note that
* when using a reasoner, all OWL classes have owl:Thing as a super-class.</p>
* @return True if this class has any known super-class.
- * @exception OntProfileException If the {@link Profile#SUB_CLASS_OF()} property is not supported in the current language profile.
+ * @exception ProfileException If the {@link Profile#SUB_CLASS_OF()} property is not supported in the current language profile.
*/
@Override
public boolean hasSuperClass() {
@@ -211,7 +211,7 @@ public class OntClassImpl
* @param direct If true, only search the classes that are directly adjacent to this
* class in the class hierarchy.
* @return True if the given class is a super-class of this class.
- * @exception OntProfileException If the {@link Profile#SUB_CLASS_OF()} property is not supported in the current language profile.
+ * @exception ProfileException If the {@link Profile#SUB_CLASS_OF()} property is not supported in the current language profile.
*/
@Override
public boolean hasSuperClass( Resource cls, boolean direct ) {
@@ -248,7 +248,7 @@ public class OntClassImpl
* <p>Remove the given class from the super-classes of this class. If this statement
* is not true of the current model, nothing happens.</p>
* @param cls A class to be removed from the super-classes of this class
- * @exception OntProfileException If the {@link Profile#SUB_CLASS_OF()} class is not supported in the current language profile.
+ * @exception ProfileException If the {@link Profile#SUB_CLASS_OF()} class is not supported in the current language profile.
*/
@Override
public void removeSuperClass( Resource cls ) {
@@ -259,7 +259,7 @@ public class OntClassImpl
* <p>Assert that this class is super-class of the given class. Any existing
* statements for <code>subClassOf</code> on <code>prop</code> will be removed.</p>
* @param cls The class that is a sub-class of this class
- * @exception OntProfileException If the {@link Profile#SUB_CLASS_OF()} property is not supported in the current language profile.
+ * @exception ProfileException If the {@link Profile#SUB_CLASS_OF()} property is not supported in the current language profile.
*/
@Override
public void setSubClass( Resource cls ) {
@@ -275,7 +275,7 @@ public class OntClassImpl
/**
* <p>Add a sub-class of this class.</p>
* @param cls A class that is a sub-class of this class.
- * @exception OntProfileException If the {@link Profile#SUB_CLASS_OF()} property is not supported in the current language profile.
+ * @exception ProfileException If the {@link Profile#SUB_CLASS_OF()} property is not supported in the current language profile.
*/
@Override
public void addSubClass( Resource cls ) {
@@ -287,7 +287,7 @@ public class OntClassImpl
* more than one such class, an arbitrary selection is made. If
* there is no such class, return null.</p>
* @return A sub-class of this class or null
- * @exception OntProfileException If the {@link Profile#SUB_CLASS_OF()}
+ * @exception ProfileException If the {@link Profile#SUB_CLASS_OF()}
* property is not supported in the current language profile.
*/
@Override
@@ -313,7 +313,7 @@ public class OntClassImpl
* <p>Answer an iterator over all of the classes that are declared to be sub-classes of
* this class. Each element of the iterator will be an {@link OntClass}.</p>
* @return An iterator over the sub-classes of this class.
- * @exception OntProfileException If the {@link Profile#SUB_CLASS_OF()} property is not supported in the current language profile.
+ * @exception ProfileException If the {@link Profile#SUB_CLASS_OF()} property is not supported in the current language profile.
*/
@Override
public ExtendedIterator<OntClass> listSubClasses() {
@@ -362,7 +362,7 @@ public class OntClassImpl
* sub-class relation: i.e. eliminate any class for which there is a longer route
* to reach that child under the sub-class relation.
* @return an iterator over the resources representing this class's sub-classes
- * @exception OntProfileException If the {@link Profile#SUB_CLASS_OF()} property is not supported in the current language profile.
+ * @exception ProfileException If the {@link Profile#SUB_CLASS_OF()} property is not supported in the current language profile.
*/
@Override
public ExtendedIterator<OntClass> listSubClasses( boolean direct ) {
@@ -375,7 +375,7 @@ public class OntClassImpl
* <p>Answer true if the given class is a sub-class of this class.</p>
* @param cls A class to test.
* @return True if the given class is a sub-class of this class.
- * @exception OntProfileException If the {@link Profile#SUB_CLASS_OF()} property is not supported in the current language profile.
+ * @exception ProfileException If the {@link Profile#SUB_CLASS_OF()} property is not supported in the current language profile.
*/
@Override
public boolean hasSubClass( Resource cls ) {
@@ -386,7 +386,7 @@ public class OntClassImpl
* <p>Answer true if this class has any sub-class in the model. Note that
* when using a reasoner, all OWL classes have owl:Nothing as a sub-class.</p>
* @return True if this class has any known sub-class.
- * @exception OntProfileException If the {@link Profile#SUB_CLASS_OF()} property is not supported in the current language profile.
+ * @exception ProfileException If the {@link Profile#SUB_CLASS_OF()} property is not supported in the current language profile.
*/
@Override
public boolean hasSubClass() {
@@ -402,7 +402,7 @@ public class OntClassImpl
* @param direct If true, only search the classes that are directly adjacent to this
* class in the class hierarchy.
* @return True if the given class is a sub-class of this class.
- * @exception OntProfileException If the {@link Profile#SUB_CLASS_OF()} property is not supported in the current language profile.
+ * @exception ProfileException If the {@link Profile#SUB_CLASS_OF()} property is not supported in the current language profile.
*/
@Override
public boolean hasSubClass( Resource cls, boolean direct ) {
@@ -419,7 +419,7 @@ public class OntClassImpl
* <p>Remove the given class from the sub-classes of this class. If this statement
* is not true of the current model, nothing happens.</p>
* @param cls A class to be removed from the sub-classes of this class
- * @exception OntProfileException If the {@link Profile#SUB_CLASS_OF()} class is not supported in the current language profile.
+ * @exception ProfileException If the {@link Profile#SUB_CLASS_OF()} class is not supported in the current language profile.
*/
@Override
public void removeSubClass( Resource cls ) {
@@ -433,7 +433,7 @@ public class OntClassImpl
* <p>Assert that the given class is equivalent to this class. Any existing
* statements for <code>equivalentClass</code> will be removed.</p>
* @param cls The class that this class is a equivalent to.
- * @exception OntProfileException If the {@link Profile#EQUIVALENT_CLASS()} property is not supported in the current language profile.
+ * @exception ProfileException If the {@link Profile#EQUIVALENT_CLASS()} property is not supported in the current language profile.
*/
@Override
public void setEquivalentClass( Resource cls ) {
@@ -443,7 +443,7 @@ public class OntClassImpl
/**
* <p>Add a class that is equivalent to this class.</p>
* @param cls A class that is equivalent to this class.
- * @exception OntProfileException If the {@link Profile#EQUIVALENT_CLASS()} property is not supported in the current language profile.
+ * @exception ProfileException If the {@link Profile#EQUIVALENT_CLASS()} property is not supported in the current language profile.
*/
@Override
public void addEquivalentClass( Resource cls ) {
@@ -454,7 +454,7 @@ public class OntClassImpl
* <p>Answer a class that is equivalent to this class. If there is
* more than one such class, an arbitrary selection is made.</p>
* @return A class equivalent to this class
- * @exception OntProfileException If the {@link Profile#EQUIVALENT_CLASS()} property is not supported in the current language profile.
+ * @exception ProfileException If the {@link Profile#EQUIVALENT_CLASS()} property is not supported in the current language profile.
*/
@Override
public OntClass getEquivalentClass() {
@@ -465,7 +465,7 @@ public class OntClassImpl
* <p>Answer an iterator over all of the classes that are declared to be equivalent classes to
* this class. Each element of the iterator will be an {@link OntClass}.</p>
* @return An iterator over the classes equivalent to this class.
- * @exception OntProfileException If the {@link Profile#EQUIVALENT_CLASS()} property is not supported in the current language profile.
+ * @exception ProfileException If the {@link Profile#EQUIVALENT_CLASS()} property is not supported in the current language profile.
*/
@Override
public ExtendedIterator<OntClass> listEquivalentClasses() {
@@ -476,7 +476,7 @@ public class OntClassImpl
* <p>Answer true if the given class is equivalent to this class.</p>
* @param cls A class to test for
* @return True if the given property is equivalent to this class.
- * @exception OntProfileException If the {@link Profile#EQUIVALENT_CLASS()} property is not supported in the current language profile.
+ * @exception ProfileException If the {@link Profile#EQUIVALENT_CLASS()} property is not supported in the current language profile.
*/
@Override
public boolean hasEquivalentClass( Resource cls ) {
@@ -488,7 +488,7 @@ public class OntClassImpl
* equivalent. If this statement
* is not true of the current model, nothing happens.</p>
* @param cls A class that may be declared to be equivalent to this class, and which is no longer equivalent
- * @exception OntProfileException If the {@link Profile#EQUIVALENT_CLASS()()} property is not supported in the current language profile.
+ * @exception ProfileException If the {@link Profile#EQUIVALENT_CLASS()} property is not supported in the current language profile.
*/
@Override
public void removeEquivalentClass( Resource cls ) {
@@ -501,7 +501,7 @@ public class OntClassImpl
* <p>Assert that this class is disjoint with the given class. Any existing
* statements for <code>disjointWith</code> will be removed.</p>
* @param cls The property that this class is disjoint with.
- * @exception OntProfileException If the {@link Profile#DISJOINT_WITH()} property is not supported in the current language profile.
+ * @exception ProfileException If the {@link Profile#DISJOINT_WITH()} property is not supported in the current language profile.
*/
@Override
public void setDisjointWith( Resource cls ) {
@@ -511,7 +511,7 @@ public class OntClassImpl
/**
* <p>Add a class that this class is disjoint with.</p>
* @param cls A class that has no instances in common with this class.
- * @exception OntProfileException If the {@link Profile#DISJOINT_WITH()} property is not supported in the current language profile.
+ * @exception ProfileException If the {@link Profile#DISJOINT_WITH()} property is not supported in the current language profile.
*/
@Override
public void addDisjointWith( Resource cls ) {
@@ -522,7 +522,7 @@ public class OntClassImpl
* <p>Answer a class with which this class is disjoint. If there is
* more than one such class, an arbitrary selection is made.</p>
* @return A class disjoint with this class
- * @exception OntProfileException If the {@link Profile#DISJOINT_WITH()} property is not supported in the current language profile.
+ * @exception ProfileException If the {@link Profile#DISJOINT_WITH()} property is not supported in the current language profile.
*/
@Override
public OntClass getDisjointWith() {
@@ -533,7 +533,7 @@ public class OntClassImpl
* <p>Answer an iterator over all of the classes that this class is declared to be disjoint with.
* Each element of the iterator will be an {@link OntClass}.</p>
* @return An iterator over the classes disjoint with this class.
- * @exception OntProfileException If the {@link Profile#DISJOINT_WITH()} property is not supported in the current language profile.
+ * @exception ProfileException If the {@link Profile#DISJOINT_WITH()} property is not supported in the current language profile.
*/
@Override
public ExtendedIterator<OntClass> listDisjointWith() {
@@ -544,7 +544,7 @@ public class OntClassImpl
* <p>Answer true if this class is disjoint with the given class.</p>
* @param cls A class to test
* @return True if the this class is disjoint with the the given class.
- * @exception OntProfileException If the {@link Profile#DISJOINT_WITH()} property is not supported in the current language profile.
+ * @exception ProfileException If the {@link Profile#DISJOINT_WITH()} property is not supported in the current language profile.
*/
@Override
public boolean isDisjointWith( Resource cls ) {
@@ -556,7 +556,7 @@ public class OntClassImpl
* disjoint. If this statement
* is not true of the current model, nothing happens.</p>
* @param cls A class that may be declared to be disjoint with this class, and which is no longer disjoint
- * @exception OntProfileException If the {@link Profile#DISJOINT_WITH()()()} property is not supported in the current language profile.
+ * @exception ProfileException If the {@link Profile#DISJOINT_WITH()} property is not supported in the current language profile.
*/
@Override
public void removeDisjointWith( Resource cls ) {
Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/ontology/impl/OntPropertyImpl.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/ontology/impl/OntPropertyImpl.java?rev=1606090&r1=1606089&r2=1606090&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/ontology/impl/OntPropertyImpl.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/ontology/impl/OntPropertyImpl.java Fri Jun 27 13:20:01 2014
@@ -124,7 +124,7 @@ public class OntPropertyImpl
* <p>Assert that this property is sub-property of the given property. Any existing
* statements for <code>subPropertyOf</code> will be removed.</p>
* @param prop The property that this property is a sub-property of
- * @exception OntProfileException If the {@link Profile#SUB_PROPERTY_OF()} property is not supported in the current language profile.
+ * @exception ProfileException If the {@link Profile#SUB_PROPERTY_OF()} property is not supported in the current language profile.
*/
@Override
public void setSuperProperty( Property prop ) {
@@ -134,7 +134,7 @@ public class OntPropertyImpl
/**
* <p>Add a super-property of this property.</p>
* @param prop A property that is a super-property of this property.
- * @exception OntProfileException If the {@link Profile#SUB_PROPERTY_OF()} property is not supported in the current language profile.
+ * @exception ProfileException If the {@link Profile#SUB_PROPERTY_OF()} property is not supported in the current language profile.
*/
@Override
public void addSuperProperty( Property prop ) {
@@ -145,7 +145,7 @@ public class OntPropertyImpl
* <p>Answer a property that is the super-property of this property. If there is
* more than one such property, an arbitrary selection is made.</p>
* @return A super-property of this property
- * @exception OntProfileException If the {@link Profile#SUB_PROPERTY_OF()} property is not supported in the current language profile.
+ * @exception ProfileException If the {@link Profile#SUB_PROPERTY_OF()} property is not supported in the current language profile.
*/
@Override
public OntProperty getSuperProperty() {
@@ -156,7 +156,7 @@ public class OntPropertyImpl
* <p>Answer an iterator over all of the properties that are declared to be super-properties of
* this property. Each element of the iterator will be an {@link OntProperty}.</p>
* @return An iterator over the super-properties of this property.
- * @exception OntProfileException If the {@link Profile#SUB_PROPERTY_OF()} property is not supported in the current language profile.
+ * @exception ProfileException If the {@link Profile#SUB_PROPERTY_OF()} property is not supported in the current language profile.
*/
@Override
public ExtendedIterator<OntProperty> listSuperProperties() {
@@ -170,7 +170,7 @@ public class OntPropertyImpl
* property hierarchy: i.e. eliminate any property for which there is a longer route
* to reach that child under the super-property relation.
* @return An iterator over the super-properties of this property.
- * @exception OntProfileException If the {@link Profile#SUB_PROPERTY_OF()} property is not supported in the current language profile.
+ * @exception ProfileException If the {@link Profile#SUB_PROPERTY_OF()} property is not supported in the current language profile.
*/
@Override
public ExtendedIterator<OntProperty> listSuperProperties( boolean direct ) {
@@ -194,7 +194,7 @@ public class OntPropertyImpl
* <p>Remove the given property from the super-properties of this property. If this statement
* is not true of the current model, nothing happens.</p>
* @param prop A property to be removed from the super-properties of this property
- * @exception OntProfileException If the {@link Profile#SUB_PROPERTY_OF()} property is not supported in the current language profile.
+ * @exception ProfileException If the {@link Profile#SUB_PROPERTY_OF()} property is not supported in the current language profile.
*/
@Override
public void removeSuperProperty( Property prop ) {
@@ -206,7 +206,7 @@ public class OntPropertyImpl
* <p>Assert that this property is super-property of the given property. Any existing
* statements for <code>subPropertyOf</code> on <code>prop</code> will be removed.</p>
* @param prop The property that is a sub-property of this property
- * @exception OntProfileException If the {@link Profile#SUB_PROPERTY_OF()} property is not supported in the current language profile.
+ * @exception ProfileException If the {@link Profile#SUB_PROPERTY_OF()} property is not supported in the current language profile.
*/
@Override
public void setSubProperty( Property prop ) {
@@ -222,7 +222,7 @@ public class OntPropertyImpl
/**
* <p>Add a sub-property of this property.</p>
* @param prop A property that is a sub-property of this property.
- * @exception OntProfileException If the {@link Profile#SUB_PROPERTY_OF()} property is not supported in the current language profile.
+ * @exception ProfileException If the {@link Profile#SUB_PROPERTY_OF()} property is not supported in the current language profile.
*/
@Override
public void addSubProperty( Property prop ) {
@@ -233,7 +233,7 @@ public class OntPropertyImpl
* <p>Answer a property that is the sub-property of this property. If there is
* more than one such property, an arbitrary selection is made.</p>
* @return A sub-property of this property
- * @exception OntProfileException If the {@link Profile#SUB_PROPERTY_OF()} property is not supported in the current language profile.
+ * @exception ProfileException If the {@link Profile#SUB_PROPERTY_OF()} property is not supported in the current language profile.
*/
@Override
public OntProperty getSubProperty() {
@@ -248,7 +248,7 @@ public class OntPropertyImpl
* <p>Answer an iterator over all of the properties that are declared to be sub-properties of
* this property. Each element of the iterator will be an {@link OntProperty}.</p>
* @return An iterator over the sub-properties of this property.
- * @exception OntProfileException If the {@link Profile#SUB_PROPERTY_OF()} property is not supported in the current language profile.
+ * @exception ProfileException If the {@link Profile#SUB_PROPERTY_OF()} property is not supported in the current language profile.
*/
@Override
public ExtendedIterator<OntProperty> listSubProperties() {
@@ -262,7 +262,7 @@ public class OntPropertyImpl
* property hierarchy: i.e. eliminate any property for which there is a longer route
* to reach that child under the sub-property relation.
* @return An iterator over the sub-properties of this property.
- * @exception OntProfileException If the {@link Profile#SUB_PROPERTY_OF()} property is not supported in the current language profile.
+ * @exception ProfileException If the {@link Profile#SUB_PROPERTY_OF()} property is not supported in the current language profile.
*/
@Override
public ExtendedIterator<OntProperty> listSubProperties( boolean direct ) {
@@ -285,7 +285,7 @@ public class OntPropertyImpl
* <p>Remove the given property from the sub-properties of this property. If this statement
* is not true of the current model, nothing happens.</p>
* @param prop A property to be removed from the sub-properties of this property
- * @exception OntProfileException If the {@link Profile#SUB_PROPERTY_OF()} property is not supported in the current language profile.
+ * @exception ProfileException If the {@link Profile#SUB_PROPERTY_OF()} property is not supported in the current language profile.
*/
@Override
public void removeSubProperty( Property prop ) {
@@ -298,7 +298,7 @@ public class OntPropertyImpl
* <p>Assert that the given resource represents the class of individuals that form the
* domain of this property. Any existing <code>domain</code> statements for this property are removed.</p>
* @param res The resource that represents the domain class for this property.
- * @exception OntProfileException If the {@link Profile#DOMAIN()} property is not supported in the current language profile.
+ * @exception ProfileException If the {@link Profile#DOMAIN()} property is not supported in the current language profile.
*/
@Override
public void setDomain( Resource res ) {
@@ -308,7 +308,7 @@ public class OntPropertyImpl
/**
* <p>Add a resource representing the domain of this property.</p>
* @param res A resource that represents a domain class for this property.
- * @exception OntProfileException If the {@link Profile#DOMAIN()} property is not supported in the current language profile.
+ * @exception ProfileException If the {@link Profile#DOMAIN()} property is not supported in the current language profile.
*/
@Override
public void addDomain( Resource res ) {
@@ -319,7 +319,7 @@ public class OntPropertyImpl
* <p>Answer a resource that represents the domain class of this property. If there is
* more than one such resource, an arbitrary selection is made.</p>
* @return An resource representing the class that forms the domain of this property
- * @exception OntProfileException If the {@link Profile#DOMAIN()} property is not supported in the current language profile.
+ * @exception ProfileException If the {@link Profile#DOMAIN()} property is not supported in the current language profile.
*/
@Override
public OntResource getDomain() {
@@ -330,7 +330,7 @@ public class OntPropertyImpl
* <p>Answer an iterator over all of the declared domain classes of this property.
* Each element of the iterator will be an {@link OntResource}.</p>
* @return An iterator over the classes that form the domain of this property.
- * @exception OntProfileException If the {@link Profile#DOMAIN()} property is not supported in the current language profile.
+ * @exception ProfileException If the {@link Profile#DOMAIN()} property is not supported in the current language profile.
*/
@Override
public ExtendedIterator<OntClass> listDomain() {
@@ -351,7 +351,7 @@ public class OntPropertyImpl
* <p>Remove the given class from the stated domain(s) of this property. If this statement
* is not true of the current model, nothing happens.</p>
* @param cls A class to be removed from the declared domain(s) of this property
- * @exception OntProfileException If the {@link Profile#DOMAIN()} property is not supported in the current language profile.
+ * @exception ProfileException If the {@link Profile#DOMAIN()} property is not supported in the current language profile.
*/
@Override
public void removeDomain( Resource cls ) {
@@ -365,7 +365,7 @@ public class OntPropertyImpl
* <p>Assert that the given resource represents the class of individuals that form the
* range of this property. Any existing <code>range</code> statements for this property are removed.</p>
* @param res The resource that represents the range class for this property.
- * @exception OntProfileException If the {@link Profile#RANGE()} property is not supported in the current language profile.
+ * @exception ProfileException If the {@link Profile#RANGE()} property is not supported in the current language profile.
*/
@Override
public void setRange( Resource res ) {
@@ -375,7 +375,7 @@ public class OntPropertyImpl
/**
* <p>Add a resource representing the range of this property.</p>
* @param res A resource that represents a range class for this property.
- * @exception OntProfileException If the {@link Profile#RANGE()} property is not supported in the current language profile.
+ * @exception ProfileException If the {@link Profile#RANGE()} property is not supported in the current language profile.
*/
@Override
public void addRange( Resource res ) {
@@ -386,7 +386,7 @@ public class OntPropertyImpl
* <p>Answer a resource that represents the range class of this property. If there is
* more than one such resource, an arbitrary selection is made.</p>
* @return An resource representing the class that forms the range of this property
- * @exception OntProfileException If the {@link Profile#RANGE()} property is not supported in the current language profile.
+ * @exception ProfileException If the {@link Profile#RANGE()} property is not supported in the current language profile.
*/
@Override
public OntResource getRange() {
@@ -397,7 +397,7 @@ public class OntPropertyImpl
* <p>Answer an iterator over all of the declared range classes of this property.
* Each element of the iterator will be an {@link OntResource}.</p>
* @return An iterator over the classes that form the range of this property.
- * @exception OntProfileException If the {@link Profile#RANGE()} property is not supported in the current language profile.
+ * @exception ProfileException If the {@link Profile#RANGE()} property is not supported in the current language profile.
*/
@Override
public ExtendedIterator<OntClass> listRange() {
@@ -418,7 +418,7 @@ public class OntPropertyImpl
* <p>Remove the given class from the stated range(s) of this property. If this statement
* is not true of the current model, nothing happens.</p>
* @param cls A class to be removed from the declared range(s) of this property
- * @exception OntProfileException If the {@link Profile#RANGE()} property is not supported in the current language profile.
+ * @exception ProfileException If the {@link Profile#RANGE()} property is not supported in the current language profile.
*/
@Override
public void removeRange( Resource cls ) {
@@ -434,7 +434,7 @@ public class OntPropertyImpl
* <p>Assert that the given property is equivalent to this property. Any existing
* statements for <code>equivalentProperty</code> will be removed.</p>
* @param prop The property that this property is a equivalent to.
- * @exception OntProfileException If the {@link Profile#EQUIVALENT_PROPERTY()} property is not supported in the current language profile.
+ * @exception ProfileException If the {@link Profile#EQUIVALENT_PROPERTY()} property is not supported in the current language profile.
*/
@Override
public void setEquivalentProperty( Property prop ) {
@@ -444,7 +444,7 @@ public class OntPropertyImpl
/**
* <p>Add a property that is equivalent to this property.</p>
* @param prop A property that is equivalent to this property.
- * @exception OntProfileException If the {@link Profile#EQUIVALENT_PROPERTY()} property is not supported in the current language profile.
+ * @exception ProfileException If the {@link Profile#EQUIVALENT_PROPERTY()} property is not supported in the current language profile.
*/
@Override
public void addEquivalentProperty( Property prop ) {
@@ -455,7 +455,7 @@ public class OntPropertyImpl
* <p>Answer a property that is equivalent to this property. If there is
* more than one such property, an arbitrary selection is made.</p>
* @return A property equivalent to this property
- * @exception OntProfileException If the {@link Profile#EQUIVALENT_PROPERTY()} property is not supported in the current language profile.
+ * @exception ProfileException If the {@link Profile#EQUIVALENT_PROPERTY()} property is not supported in the current language profile.
*/
@Override
public OntProperty getEquivalentProperty() {
@@ -466,7 +466,7 @@ public class OntPropertyImpl
* <p>Answer an iterator over all of the properties that are declared to be equivalent properties to
* this property. Each element of the iterator will be an {@link OntProperty}.</p>
* @return An iterator over the properties equivalent to this property.
- * @exception OntProfileException If the {@link Profile#EQUIVALENT_PROPERTY()} property is not supported in the current language profile.
+ * @exception ProfileException If the {@link Profile#EQUIVALENT_PROPERTY()} property is not supported in the current language profile.
*/
@Override
public ExtendedIterator<OntProperty> listEquivalentProperties() {
@@ -488,7 +488,7 @@ public class OntPropertyImpl
* equivalent. If this statement
* is not true of the current model, nothing happens.</p>
* @param prop A property that may be declared to be equivalent to this property
- * @exception OntProfileException If the {@link Profile#EQUIVALENT_PROPERTY()} property is not supported in the current language profile.
+ * @exception ProfileException If the {@link Profile#EQUIVALENT_PROPERTY()} property is not supported in the current language profile.
*/
@Override
public void removeEquivalentProperty( Property prop ) {
@@ -501,7 +501,7 @@ public class OntPropertyImpl
* <p>Assert that the given property is the inverse of this property. Any existing
* statements for <code>inverseOf</code> will be removed.</p>
* @param prop The property that this property is a inverse to.
- * @exception OntProfileException If the {@link Profile#INVERSE_OF()} property is not supported in the current language profile.
+ * @exception ProfileException If the {@link Profile#INVERSE_OF()} property is not supported in the current language profile.
*/
@Override
public void setInverseOf( Property prop ) {
@@ -511,7 +511,7 @@ public class OntPropertyImpl
/**
* <p>Add a property that is the inverse of this property.</p>
* @param prop A property that is the inverse of this property.
- * @exception OntProfileException If the {@link Profile#INVERSE_OF()} property is not supported in the current language profile.
+ * @exception ProfileException If the {@link Profile#INVERSE_OF()} property is not supported in the current language profile.
*/
@Override
public void addInverseOf( Property prop ) {
@@ -522,7 +522,7 @@ public class OntPropertyImpl
* <p>Answer a property that is an inverse of this property. If there is
* more than one such property, an arbitrary selection is made.</p>
* @return A property inverse to this property
- * @exception OntProfileException If the {@link Profile#INVERSE_OF()} property is not supported in the current language profile.
+ * @exception ProfileException If the {@link Profile#INVERSE_OF()} property is not supported in the current language profile.
*/
@Override
public OntProperty getInverseOf() {
@@ -533,7 +533,7 @@ public class OntPropertyImpl
* <p>Answer an iterator over all of the properties that are declared to be inverse properties of
* this property. Each element of the iterator will be an {@link OntProperty}.</p>
* @return An iterator over the properties inverse to this property.
- * @exception OntProfileException If the {@link Profile#INVERSE_OF()} property is not supported in the current language profile.
+ * @exception ProfileException If the {@link Profile#INVERSE_OF()} property is not supported in the current language profile.
*/
@Override
public ExtendedIterator<? extends OntProperty> listInverseOf() {
@@ -554,7 +554,7 @@ public class OntPropertyImpl
* <p>Remove the statement that this property is the inverse of the given property. If this statement
* is not true of the current model, nothing happens.</p>
* @param prop A property that may be declared to be inverse to this property
- * @exception OntProfileException If the {@link Profile#INVERSE_OF()} property is not supported in the current language profile.
+ * @exception ProfileException If the {@link Profile#INVERSE_OF()} property is not supported in the current language profile.
*/
@Override
public void removeInverseProperty( Property prop ) {
Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/ontology/impl/OntResourceImpl.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/ontology/impl/OntResourceImpl.java?rev=1606090&r1=1606089&r2=1606090&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/ontology/impl/OntResourceImpl.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/ontology/impl/OntResourceImpl.java Fri Jun 27 13:20:01 2014
@@ -172,7 +172,7 @@ public class OntResourceImpl
* <p>Assert equivalence between the given resource and this resource. Any existing
* statements for <code>sameAs</code> will be removed.</p>
* @param res The resource that is declared to be the same as this resource
- * @exception OntProfileException If the {@link Profile#SAME_AS()} property is not supported in the current language profile.
+ * @exception ProfileException If the {@link Profile#SAME_AS()} property is not supported in the current language profile.
*/
@Override
public void setSameAs( Resource res ) {
@@ -182,7 +182,7 @@ public class OntResourceImpl
/**
* <p>Add a resource that is declared to be equivalent to this resource.</p>
* @param res A resource that declared to be the same as this resource
- * @exception OntProfileException If the {@link Profile#SAME_AS()} property is not supported in the current language profile.
+ * @exception ProfileException If the {@link Profile#SAME_AS()} property is not supported in the current language profile.
*/
@Override
public void addSameAs( Resource res ) {
@@ -193,7 +193,7 @@ public class OntResourceImpl
* <p>Answer a resource that is declared to be the same as this resource. If there is
* more than one such resource, an arbitrary selection is made.</p>
* @return res An ont resource that declared to be the same as this resource
- * @exception OntProfileException If the {@link Profile#SAME_AS()} property is not supported in the current language profile.
+ * @exception ProfileException If the {@link Profile#SAME_AS()} property is not supported in the current language profile.
*/
@Override
public OntResource getSameAs() {
@@ -204,7 +204,7 @@ public class OntResourceImpl
* <p>Answer an iterator over all of the resources that are declared to be the same as
* this resource. Each element of the iterator will be an {@link OntResource}.</p>
* @return An iterator over the resources equivalent to this resource.
- * @exception OntProfileException If the {@link Profile#SAME_AS()} property is not supported in the current language profile.
+ * @exception ProfileException If the {@link Profile#SAME_AS()} property is not supported in the current language profile.
*/
@Override
public ExtendedIterator<OntResource> listSameAs() {
@@ -237,7 +237,7 @@ public class OntResourceImpl
* <p>Assert that the given resource and this resource are distinct. Any existing
* statements for <code>differentFrom</code> will be removed.</p>
* @param res The resource that is declared to be distinct from this resource
- * @exception OntProfileException If the {@link Profile#DIFFERENT_FROM()} property is not supported in the current language profile.
+ * @exception ProfileException If the {@link Profile#DIFFERENT_FROM()} property is not supported in the current language profile.
*/
@Override
public void setDifferentFrom( Resource res ) {
@@ -247,7 +247,7 @@ public class OntResourceImpl
/**
* <p>Add a statement declaring that this resource is distinct from the given resource.</p>
* @param res A resource that declared to be distinct from this resource
- * @exception OntProfileException If the {@link Profile#DIFFERENT_FROM()} property is not supported in the current language profile.
+ * @exception ProfileException If the {@link Profile#DIFFERENT_FROM()} property is not supported in the current language profile.
*/
@Override
public void addDifferentFrom( Resource res ) {
@@ -258,7 +258,7 @@ public class OntResourceImpl
* <p>Answer a resource that is declared to be distinct from this resource. If there is
* more than one such resource, an arbitrary selection is made.</p>
* @return res An ont resource that declared to be different from this resource
- * @exception OntProfileException If the {@link Profile#DIFFERENT_FROM()} property is not supported in the current language profile.
+ * @exception ProfileException If the {@link Profile#DIFFERENT_FROM()} property is not supported in the current language profile.
*/
@Override
public OntResource getDifferentFrom() {
@@ -269,7 +269,7 @@ public class OntResourceImpl
* <p>Answer an iterator over all of the resources that are declared to be different from
* this resource. Each element of the iterator will be an {@link OntResource}.</p>
* @return An iterator over the resources different from this resource.
- * @exception OntProfileException If the {@link Profile#DIFFERENT_FROM()} property is not supported in the current language profile.
+ * @exception ProfileException If the {@link Profile#DIFFERENT_FROM()} property is not supported in the current language profile.
*/
@Override
public ExtendedIterator<OntResource> listDifferentFrom() {
@@ -301,7 +301,7 @@ public class OntResourceImpl
/**
* <p>Assert that the given resource provides additional information about the definition of this resource</p>
* @param res A resource that can provide additional information about this resource
- * @exception OntProfileException If the {@link Profile#SEE_ALSO()} property is not supported in the current language profile.
+ * @exception ProfileException If the {@link Profile#SEE_ALSO()} property is not supported in the current language profile.
*/
@Override
public void setSeeAlso( Resource res ) {
@@ -311,7 +311,7 @@ public class OntResourceImpl
/**
* <p>Add a resource that is declared to provided additional information about the definition of this resource</p>
* @param res A resource that provides extra information on this resource
- * @exception OntProfileException If the {@link Profile#SEE_ALSO()} property is not supported in the current language profile.
+ * @exception ProfileException If the {@link Profile#SEE_ALSO()} property is not supported in the current language profile.
*/
@Override
public void addSeeAlso( Resource res ) {
@@ -322,7 +322,7 @@ public class OntResourceImpl
* <p>Answer a resource that provides additional information about this resource. If more than one such resource
* is defined, make an arbitrary choice.</p>
* @return res A resource that provides additional information about this resource
- * @exception OntProfileException If the {@link Profile#SEE_ALSO()} property is not supported in the current language profile.
+ * @exception ProfileException If the {@link Profile#SEE_ALSO()} property is not supported in the current language profile.
*/
@Override
public Resource getSeeAlso() {
@@ -333,7 +333,7 @@ public class OntResourceImpl
* <p>Answer an iterator over all of the resources that are declared to provide addition
* information about this resource.</p>
* @return An iterator over the resources providing additional definition on this resource.
- * @exception OntProfileException If the {@link Profile#SEE_ALSO()} property is not supported in the current language profile.
+ * @exception ProfileException If the {@link Profile#SEE_ALSO()} property is not supported in the current language profile.
*/
@Override
public ExtendedIterator<RDFNode> listSeeAlso() {
@@ -369,7 +369,7 @@ public class OntResourceImpl
* <p>Assert that the given resource provides a source of definitions about this resource. Any existing
* statements for <code>isDefinedBy</code> will be removed.</p>
* @param res The resource that is declared to be a definition of this resource.
- * @exception OntProfileException If the {@link Profile#IS_DEFINED_BY()} property is not supported in the current language profile.
+ * @exception ProfileException If the {@link Profile#IS_DEFINED_BY()} property is not supported in the current language profile.
*/
@Override
public void setIsDefinedBy( Resource res ) {
@@ -379,7 +379,7 @@ public class OntResourceImpl
/**
* <p>Add a resource that is declared to provide a definition of this resource.</p>
* @param res A defining resource
- * @exception OntProfileException If the {@link Profile#IS_DEFINED_BY()} property is not supported in the current language profile.
+ * @exception ProfileException If the {@link Profile#IS_DEFINED_BY()} property is not supported in the current language profile.
*/
@Override
public void addIsDefinedBy( Resource res ) {
@@ -390,7 +390,7 @@ public class OntResourceImpl
* <p>Answer a resource that is declared to provide a definition of this resource. If there is
* more than one such resource, an arbitrary selection is made.</p>
* @return res An ont resource that is declared to provide a definition of this resource
- * @exception OntProfileException If the {@link Profile#IS_DEFINED_BY()} property is not supported in the current language profile.
+ * @exception ProfileException If the {@link Profile#IS_DEFINED_BY()} property is not supported in the current language profile.
*/
@Override
public Resource getIsDefinedBy() {
@@ -401,7 +401,7 @@ public class OntResourceImpl
* <p>Answer an iterator over all of the resources that are declared to define
* this resource. </p>
* @return An iterator over the resources defining this resource.
- * @exception OntProfileException If the {@link Profile#IS_DEFINED_BY()} property is not supported in the current language profile.
+ * @exception ProfileException If the {@link Profile#IS_DEFINED_BY()} property is not supported in the current language profile.
*/
@Override
public ExtendedIterator<RDFNode> listIsDefinedBy() {
@@ -437,7 +437,7 @@ public class OntResourceImpl
* <p>Assert that the given string is the value of the version info for this resource. Any existing
* statements for <code>versionInfo</code> will be removed.</p>
* @param info The version information for this resource
- * @exception OntProfileException If the {@link Profile#VERSION_INFO()} property is not supported in the current language profile.
+ * @exception ProfileException If the {@link Profile#VERSION_INFO()} property is not supported in the current language profile.
*/
@Override
public void setVersionInfo( String info ) {
@@ -449,7 +449,7 @@ public class OntResourceImpl
/**
* <p>Add the given version information to this resource.</p>
* @param info A version information string for this resource
- * @exception OntProfileException If the {@link Profile#VERSION_INFO()} property is not supported in the current language profile.
+ * @exception ProfileException If the {@link Profile#VERSION_INFO()} property is not supported in the current language profile.
*/
@Override
public void addVersionInfo( String info ) {
@@ -461,7 +461,7 @@ public class OntResourceImpl
* <p>Answer the version information string for this object. If there is
* more than one such resource, an arbitrary selection is made.</p>
* @return A version info string
- * @exception OntProfileException If the {@link Profile#VERSION_INFO()} property is not supported in the current language profile.
+ * @exception ProfileException If the {@link Profile#VERSION_INFO()} property is not supported in the current language profile.
*/
@Override
public String getVersionInfo() {
@@ -477,7 +477,7 @@ public class OntResourceImpl
/**
* <p>Answer an iterator over all of the version info strings for this resource.</p>
* @return An iterator over the version info strings for this resource.
- * @exception OntProfileException If the {@link Profile#VERSION_INFO()} property is not supported in the current language profile.
+ * @exception ProfileException If the {@link Profile#VERSION_INFO()} property is not supported in the current language profile.
*/
@Override
public ExtendedIterator<String> listVersionInfo() {
@@ -517,7 +517,7 @@ public class OntResourceImpl
* statements for <code>label</code> will be removed.</p>
* @param label The label for this resource
* @param lang The language attribute for this label (EN, FR, etc) or null if not specified.
- * @exception OntProfileException If the {@link Profile#LABEL()} property is not supported in the current language profile.
+ * @exception ProfileException If the {@link Profile#LABEL()} property is not supported in the current language profile.
*/
@Override
public void setLabel( String label, String lang ) {
@@ -530,7 +530,7 @@ public class OntResourceImpl
* <p>Add the given label to this resource.</p>
* @param label A label string for this resource
* @param lang The language attribute for this label (EN, FR, etc) or null if not specified.
- * @exception OntProfileException If the {@link Profile#LABEL()} property is not supported in the current language profile.
+ * @exception ProfileException If the {@link Profile#LABEL()} property is not supported in the current language profile.
*/
@Override
public void addLabel( String label, String lang ) {
@@ -540,7 +540,7 @@ public class OntResourceImpl
/**
* <p>Add the given label to this resource.</p>
* @param label The literal label
- * @exception OntProfileException If the {@link Profile#LABEL()} property is not supported in the current language profile.
+ * @exception ProfileException If the {@link Profile#LABEL()} property is not supported in the current language profile.
*/
@Override
public void addLabel( Literal label ) {
@@ -553,7 +553,7 @@ public class OntResourceImpl
* @param lang The language attribute for the desired label (EN, FR, etc) or null for don't care. Will
* attempt to retreive the most specific label matching the given language</p>
* @return A label string matching the given language, or null if there is no matching label.
- * @exception OntProfileException If the {@link Profile#LABEL()} property is not supported in the current language profile.
+ * @exception ProfileException If the {@link Profile#LABEL()} property is not supported in the current language profile.
*/
@Override
public String getLabel( String lang ) {
@@ -577,7 +577,7 @@ public class OntResourceImpl
* <p>Answer an iterator over all of the label literals for this resource.</p>
* @param lang The language to restrict any label values to, or null to select all languages
* @return An iterator over RDF {@link Literal}'s.
- * @exception OntProfileException If the {@link Profile#LABEL()} property is not supported in the current language profile.
+ * @exception ProfileException If the {@link Profile#LABEL()} property is not supported in the current language profile.
*/
@Override
public ExtendedIterator<RDFNode> listLabels( String lang ) {
@@ -646,7 +646,7 @@ public class OntResourceImpl
* statements for <code>comment</code> will be removed.</p>
* @param comment The comment for this resource
* @param lang The language attribute for this comment (EN, FR, etc) or null if not specified.
- * @exception OntProfileException If the {@link Profile#COMMENT()} property is not supported in the current language profile.
+ * @exception ProfileException If the {@link Profile#COMMENT()} property is not supported in the current language profile.
*/
@Override
public void setComment( String comment, String lang ) {
@@ -659,7 +659,7 @@ public class OntResourceImpl
* <p>Add the given comment to this resource.</p>
* @param comment A comment string for this resource
* @param lang The language attribute for this comment (EN, FR, etc) or null if not specified.
- * @exception OntProfileException If the {@link Profile#COMMENT()} property is not supported in the current language profile.
+ * @exception ProfileException If the {@link Profile#COMMENT()} property is not supported in the current language profile.
*/
@Override
public void addComment( String comment, String lang ) {
@@ -669,7 +669,7 @@ public class OntResourceImpl
/**
* <p>Add the given comment to this resource.</p>
* @param comment The literal comment
- * @exception OntProfileException If the {@link Profile#COMMENT()} property is not supported in the current language profile.
+ * @exception ProfileException If the {@link Profile#COMMENT()} property is not supported in the current language profile.
*/
@Override
public void addComment( Literal comment ) {
@@ -683,7 +683,7 @@ public class OntResourceImpl
* @param lang The language attribute for the desired comment (EN, FR, etc) or null for don't care. Will
* attempt to retreive the most specific comment matching the given language</p>
* @return A comment string matching the given language, or null if there is no matching comment.
- * @exception OntProfileException If the {@link Profile#COMMENT()} property is not supported in the current language profile.
+ * @exception ProfileException If the {@link Profile#COMMENT()} property is not supported in the current language profile.
*/
@Override
public String getComment( String lang ) {
@@ -707,7 +707,7 @@ public class OntResourceImpl
/**
* <p>Answer an iterator over all of the comment literals for this resource.</p>
* @return An iterator over RDF {@link Literal}'s.
- * @exception OntProfileException If the {@link Profile#COMMENT()} property is not supported in the current language profile.
+ * @exception ProfileException If the {@link Profile#COMMENT()} property is not supported in the current language profile.
*/
@Override
public ExtendedIterator<RDFNode> listComments( String lang ) {
@@ -1236,6 +1236,8 @@ public class OntResourceImpl
@Override
public boolean isIndividual() {
OntModel m = (getModel() instanceof OntModel) ? (OntModel) getModel() : null;
+ if ( m == null )
+ return false ;
// can we use the reasoner's native abilities to do the instance test?
boolean useInf = false;
@@ -1245,58 +1247,52 @@ public class OntResourceImpl
StmtIterator i = null, j = null;
try {
- if (m != null) {
- if (!useInf) {
- // either not using the OWL reasoner, or not using OWL
- // look for an rdf:type of this resource that is a class
- for (i = listProperties( RDF.type ); i.hasNext(); ) {
- Resource rType = i.nextStatement().getResource();
- if (rType.equals( m.getProfile().THING() )) {
- // the resource has rdf:type owl:Thing (or equivalent)
- return true;
- }
+ if (!useInf) {
+ // either not using the OWL reasoner, or not using OWL
+ // look for an rdf:type of this resource that is a class
+ for (i = listProperties( RDF.type ); i.hasNext(); ) {
+ Resource rType = i.nextStatement().getResource();
+ if (rType.equals( m.getProfile().THING() )) {
+ // the resource has rdf:type owl:Thing (or equivalent)
+ return true;
+ }
- // if the type itself is OWL.Class or similar, we should ignore it ... this may
- // arise in cases where the user has materialised results of inference and is then
- // accessing them from a plain model
- // JENA-3: we also ignore if the type is rdfs:Resource or similar, since it's not informative
- if (rType.equals( getProfile().CLASS() ) ||
- rType.equals( RDFS.Resource ) ||
- rType.equals( RDF.Property ) ||
- rType.equals( RDFS.Datatype ) ||
- rType.equals( RDF.List ))
- {
- continue;
- }
+ // if the type itself is OWL.Class or similar, we should ignore it ... this may
+ // arise in cases where the user has materialised results of inference and is then
+ // accessing them from a plain model
+ // JENA-3: we also ignore if the type is rdfs:Resource or similar, since it's not informative
+ if (rType.equals( getProfile().CLASS() ) ||
+ rType.equals( RDFS.Resource ) ||
+ rType.equals( RDF.Property ) ||
+ rType.equals( RDFS.Datatype ) ||
+ rType.equals( RDF.List ))
+ {
+ continue;
+ }
- // otherwise, we check to see if the given type is known to be a class
- for (j = rType.listProperties( RDF.type ); j.hasNext(); ) {
- if (j.nextStatement().getResource().equals( getProfile().CLASS() )) {
- // we have found an rdf:type of the subject that is an owl, rdfs or daml Class
- // therefore this is an individual
- return true;
- }
+ // otherwise, we check to see if the given type is known to be a class
+ for (j = rType.listProperties( RDF.type ); j.hasNext(); ) {
+ if (j.nextStatement().getResource().equals( getProfile().CLASS() )) {
+ // we have found an rdf:type of the subject that is an owl, rdfs or daml Class
+ // therefore this is an individual
+ return true;
}
}
-
- // apparently not an instance
- return false;
- }
- else {
- // using the rule reasoner on an OWL graph, so we can determine
- // individuals as those things that have rdf:type owl:Thing
- return hasProperty( RDF.type, getProfile().THING() );
}
+
+ // apparently not an instance
+ return false;
+ }
+ else {
+ // using the rule reasoner on an OWL graph, so we can determine
+ // individuals as those things that have rdf:type owl:Thing
+ return hasProperty( RDF.type, getProfile().THING() );
}
}
finally {
if (i != null) { i.close(); }
if (j != null) { j.close(); }
}
-
- // dead code, but the compiler whines if this statement is not present
- // and it whines (but less) if it is
- return canAs( Individual.class );
}
/**
Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/ontology/impl/OntologyImpl.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/ontology/impl/OntologyImpl.java?rev=1606090&r1=1606089&r2=1606090&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/ontology/impl/OntologyImpl.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/ontology/impl/OntologyImpl.java Fri Jun 27 13:20:01 2014
@@ -100,7 +100,7 @@ public class OntologyImpl
* <p>Assert that this ontology imports only the given ontology. Any existing
* statements for <code>sameAs</code> will be removed.</p>
* @param res Represents a resource that this ontology imports.
- * @exception OntProfileException If the {@link Profile#IMPORTS()()} property is not supported in the current language profile.
+ * @exception ProfileException If the {@link Profile#IMPORTS()} property is not supported in the current language profile.
*/
@Override
public void setImport( Resource res ) {
@@ -111,7 +111,7 @@ public class OntologyImpl
* <p>Add a resource representing an ontology that this ontology
* (strictly, the ontology reprsented by this node) imports.</p>
* @param res Represents a resource that this ontology imports.
- * @exception OntProfileException If the {@link Profile#IMPORTS()()} property is not supported in the current language profile.
+ * @exception ProfileException If the {@link Profile#IMPORTS()} property is not supported in the current language profile.
*/
@Override
public void addImport( Resource res ) {
@@ -122,7 +122,7 @@ public class OntologyImpl
* <p>Answer a resource that represents an ontology imported by this ontology. If there is
* more than one such resource, an arbitrary selection is made.</p>
* @return An ont resource representing a resource that this ontology imports
- * @exception OntProfileException If the {@link Profile#IMPORTS()()} property is not supported in the current language profile.
+ * @exception ProfileException If the {@link Profile#IMPORTS()} property is not supported in the current language profile.
*/
@Override
public OntResource getImport() {
@@ -133,7 +133,7 @@ public class OntologyImpl
* <p>Answer an iterator over all of the resources representing ontologies imported by this ontology.
* Each elemeent of the iterator will be an {@link OntResource}.</p>
* @return An iterator over the ontology import resources
- * @exception OntProfileException If the {@link Profile#IMPORTS()()} property is not supported in the current language profile.
+ * @exception ProfileException If the {@link Profile#IMPORTS()} property is not supported in the current language profile.
*/
@Override
public ExtendedIterator<OntResource> listImports() {
@@ -168,7 +168,7 @@ public class OntologyImpl
* <p>Assert that this ontology is backward compatible with the given ontology. Any existing
* statements for <code>sameAs</code> will be removed.</p>
* @param res Represents a resource that this ontology is compatible with.
- * @exception OntProfileException If the {@link Profile#BACKWARD_COMPATIBLE_WITH} property is not supported in the current language profile.
+ * @exception ProfileException If the {@link Profile#BACKWARD_COMPATIBLE_WITH} property is not supported in the current language profile.
*/
@Override
public void setBackwardCompatibleWith( Resource res ) {
@@ -179,7 +179,7 @@ public class OntologyImpl
* <p>Add a resource representing an ontology that this ontology
* (strictly, the ontology reprsented by this node) is backwards compatible with.</p>
* @param res Represents a resource that this ontology is compatible with.
- * @exception OntProfileException If the {@link Profile#BACKWARD_COMPATIBLE_WITH} property is not supported in the current language profile.
+ * @exception ProfileException If the {@link Profile#BACKWARD_COMPATIBLE_WITH} property is not supported in the current language profile.
*/
@Override
public void addBackwardCompatibleWith( Resource res ) {
@@ -190,7 +190,7 @@ public class OntologyImpl
* <p>Answer a resource that represents an ontology that is backwards compatible with this ontology. If there is
* more than one such resource, an arbitrary selection is made.</p>
* @return An ont resource representing an ontology that this ontology is compatible with
- * @exception OntProfileException If the {@link Profile#BACKWARD_COMPATIBLE_WITH} property is not supported in the current language profile.
+ * @exception ProfileException If the {@link Profile#BACKWARD_COMPATIBLE_WITH} property is not supported in the current language profile.
*/
@Override
public OntResource getBackwardCompatibleWith() {
@@ -202,7 +202,7 @@ public class OntologyImpl
* ontologies that this ontology is backwards compatible with.
* Each element of the iterator will be an {@link OntResource}.</p>
* @return An iterator over the ontology resources compatible with this ontology
- * @exception OntProfileException If the {@link Profile#BACKWARD_COMPATIBLE_WITH} property is not supported in the current language profile.
+ * @exception ProfileException If the {@link Profile#BACKWARD_COMPATIBLE_WITH} property is not supported in the current language profile.
*/
@Override
public ExtendedIterator<OntResource> listBackwardCompatibleWith() {
@@ -238,7 +238,7 @@ public class OntologyImpl
* <p>Assert that this ontology is a new version of the given ontology. Any existing
* statements for <code>priorVersion</code> will be removed.</p>
* @param res Represents a resource that this ontology supercedes.
- * @exception OntProfileException If the {@link Profile#PRIOR_VERSION} property is not supported in the current language profile.
+ * @exception ProfileException If the {@link Profile#PRIOR_VERSION} property is not supported in the current language profile.
*/
@Override
public void setPriorVersion( Resource res ) {
@@ -249,7 +249,7 @@ public class OntologyImpl
* <p>Add a resource representing an ontology that this ontology
* (strictly, the ontology reprsented by this node) supercedes.</p>
* @param res Represents a resource that this ontology supercedes.
- * @exception OntProfileException If the {@link Profile#PRIOR_VERSION} property is not supported in the current language profile.
+ * @exception ProfileException If the {@link Profile#PRIOR_VERSION} property is not supported in the current language profile.
*/
@Override
public void addPriorVersion( Resource res ) {
@@ -260,7 +260,7 @@ public class OntologyImpl
* <p>Answer a resource that represents an ontology that is superceded by this ontology. If there is
* more than one such resource, an arbitrary selection is made.</p>
* @return An ont resource representing an ontology that this ontology supercedes
- * @exception OntProfileException If the {@link Profile#PRIOR_VERSION} property is not supported in the current language profile.
+ * @exception ProfileException If the {@link Profile#PRIOR_VERSION} property is not supported in the current language profile.
*/
@Override
public OntResource getPriorVersion() {
@@ -272,7 +272,7 @@ public class OntologyImpl
* ontologies that this ontology supercedes.
* Each element of the iterator will be an {@link OntResource}.</p>
* @return An iterator over the ontology resources superceded by this ontology
- * @exception OntProfileException If the {@link Profile#PRIOR_VERSION} property is not supported in the current language profile.
+ * @exception ProfileException If the {@link Profile#PRIOR_VERSION} property is not supported in the current language profile.
*/
@Override
public ExtendedIterator<OntResource> listPriorVersion() {
@@ -307,7 +307,7 @@ public class OntologyImpl
* <p>Assert that this ontology is incompatible with the given ontology. Any existing
* statements for <code>incompatibleWith</code> will be removed.</p>
* @param res Represents a resource that this ontology is incompatible with.
- * @exception OntProfileException If the {@link Profile#INCOMPATIBLE_WITH} property is not supported in the current language profile.
+ * @exception ProfileException If the {@link Profile#INCOMPATIBLE_WITH} property is not supported in the current language profile.
*/
@Override
public void setIncompatibleWith( Resource res ) {
@@ -318,7 +318,7 @@ public class OntologyImpl
* <p>Add a resource representing an ontology that this ontology
* (strictly, the ontology reprsented by this node) is incompatible with.</p>
* @param res Represents a resource that this ontology is incompatible with.
- * @exception OntProfileException If the {@link Profile#INCOMPATIBLE_WITH} property is not supported in the current language profile.
+ * @exception ProfileException If the {@link Profile#INCOMPATIBLE_WITH} property is not supported in the current language profile.
*/
@Override
public void addIncompatibleWith( Resource res ) {
@@ -329,7 +329,7 @@ public class OntologyImpl
* <p>Answer a resource that represents an ontology that is is incompatible with this ontology. If there is
* more than one such resource, an arbitrary selection is made.</p>
* @return An ont resource representing an ontology that this ontology is incompatible with
- * @exception OntProfileException If the {@link Profile#INCOMPATIBLE_WITH} property is not supported in the current language profile.
+ * @exception ProfileException If the {@link Profile#INCOMPATIBLE_WITH} property is not supported in the current language profile.
*/
@Override
public OntResource getIncompatibleWith() {
@@ -341,7 +341,7 @@ public class OntologyImpl
* ontologies that this ontology is incompatible with.
* Each element of the iterator will be an {@link OntResource}.</p>
* @return An iterator over the ontology resources that this ontology is incompatible with
- * @exception OntProfileException If the {@link Profile#INCOMPATIBLE_WITH} property is not supported in the current language profile.
+ * @exception ProfileException If the {@link Profile#INCOMPATIBLE_WITH} property is not supported in the current language profile.
*/
@Override
public ExtendedIterator<OntResource> listIncompatibleWith() {
Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/ontology/impl/QualifiedRestrictionImpl.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/ontology/impl/QualifiedRestrictionImpl.java?rev=1606090&r1=1606089&r2=1606090&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/ontology/impl/QualifiedRestrictionImpl.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/ontology/impl/QualifiedRestrictionImpl.java Fri Jun 27 13:20:01 2014
@@ -105,7 +105,7 @@ public class QualifiedRestrictionImpl
* Any existing statements for <code>hasClassQ</code>
* will be removed.</p>
* @param cls The class to which all of the value of the restricted property must belong
- * @exception OntProfileException If the {@link Profile#HAS_CLASS_Q()} property is not supported in the current language profile.
+ * @exception ProfileException If the {@link Profile#HAS_CLASS_Q()} property is not supported in the current language profile.
*/
@Override
public void setHasClassQ( OntClass cls ) {
@@ -115,7 +115,7 @@ public class QualifiedRestrictionImpl
/**
* <p>Answer the class or datarnage to which all values of the restricted property belong.</p>
* @return The ontology class of the restricted property values
- * @exception OntProfileException If the {@link Profile#HAS_CLASS_Q()} property is not supported in the current language profile.
+ * @exception ProfileException If the {@link Profile#HAS_CLASS_Q()} property is not supported in the current language profile.
*/
@Override
public OntResource getHasClassQ() {
@@ -137,7 +137,7 @@ public class QualifiedRestrictionImpl
* the class to which all of the property values must belong.</p>
* @param cls The class to test against
* @return True if the given class is the class to which all members of this restriction must belong
- * @exception OntProfileException If the {@link Profile#HAS_CLASS_Q()} property is not supported in the current language profile.
+ * @exception ProfileException If the {@link Profile#HAS_CLASS_Q()} property is not supported in the current language profile.
*/
@Override
public boolean hasHasClassQ( OntClass cls ) {
@@ -149,7 +149,7 @@ public class QualifiedRestrictionImpl
* the class to which all of the property values must belong.</p>
* @param dr The datarange to test against
* @return True if the given class is the class to which all members of this restriction must belong
- * @exception OntProfileException If the {@link Profile#HAS_CLASS_Q()} property is not supported in the current language profile.
+ * @exception ProfileException If the {@link Profile#HAS_CLASS_Q()} property is not supported in the current language profile.
*/
@Override
public boolean hasHasClassQ( DataRange dr ) {
Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/ontology/impl/RestrictionImpl.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/ontology/impl/RestrictionImpl.java?rev=1606090&r1=1606089&r2=1606090&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/ontology/impl/RestrictionImpl.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/ontology/impl/RestrictionImpl.java Fri Jun 27 13:20:01 2014
@@ -99,7 +99,7 @@ public class RestrictionImpl
* <p>Assert that the property that this restriction applies to is the given property. Any existing
* statements for <code>onProperty</code> will be removed.</p>
* @param prop The property that this restriction applies to
- * @exception OntProfileException If the {@link Profile#ON_PROPERTY()} property is not supported in the current language profile.
+ * @exception ProfileException If the {@link Profile#ON_PROPERTY()} property is not supported in the current language profile.
*/
@Override
public void setOnProperty( Property prop ) {
@@ -111,7 +111,7 @@ public class RestrictionImpl
* more than one such resource, an arbitrary selection is made (though well-defined property restrictions
* should not have more than one <code>onProperty</code> statement.</p>
* @return The property that this property restriction applies to
- * @exception OntProfileException If the {@link Profile#ON_PROPERTY()} property is not supported in the current language profile.
+ * @exception ProfileException If the {@link Profile#ON_PROPERTY()} property is not supported in the current language profile.
*/
@Override
public OntProperty getOnProperty() {
@@ -122,7 +122,7 @@ public class RestrictionImpl
* <p>Answer true if this restriction is a property restriction on the given property.</p>
* @param prop A property to test against
* @return True if this restriction is a restriction on <code>prop</code>
- * @exception OntProfileException If the {@link Profile#ON_PROPERTY()} property is not supported in the current language profile.
+ * @exception ProfileException If the {@link Profile#ON_PROPERTY()} property is not supported in the current language profile.
*/
@Override
public boolean onProperty( Property prop ) {
Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/ontology/impl/SomeValuesFromRestrictionImpl.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/ontology/impl/SomeValuesFromRestrictionImpl.java?rev=1606090&r1=1606089&r2=1606090&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/ontology/impl/SomeValuesFromRestrictionImpl.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/ontology/impl/SomeValuesFromRestrictionImpl.java Fri Jun 27 13:20:01 2014
@@ -101,7 +101,7 @@ public class SomeValuesFromRestrictionIm
* that is a member of the given class. Any existing statements for <code>someValuesFrom</code>
* will be removed.</p>
* @param cls The class that at least one value of the property must belong to
- * @exception OntProfileException If the {@link Profile#SOME_VALUES_FROM()} property is not supported in the current language profile.
+ * @exception ProfileException If the {@link Profile#SOME_VALUES_FROM()} property is not supported in the current language profile.
*/
@Override
public void setSomeValuesFrom( Resource cls ) {
@@ -113,7 +113,7 @@ public class SomeValuesFromRestrictionIm
* a class, the URI of a concrete datatype, a DataRange object or the URI rdfs:Literal.</p>
* @return A resource, which will have been pre-converted to the appropriate Java value type
* ({@link OntClass} or {@link DataRange}) if appropriate.
- * @exception OntProfileException If the {@link Profile#SOME_VALUES_FROM()} property is not supported in the current language profile.
+ * @exception ProfileException If the {@link Profile#SOME_VALUES_FROM()} property is not supported in the current language profile.
*/
@Override
public Resource getSomeValuesFrom() {
@@ -147,7 +147,7 @@ public class SomeValuesFromRestrictionIm
* value of the restricted property must belong.</p>
* @param cls A class to test
* @return True if the given class is the class to which at least one value must belong
- * @exception OntProfileException If the {@link Profile#SOME_VALUES_FROM()} property is not supported in the current language profile.
+ * @exception ProfileException If the {@link Profile#SOME_VALUES_FROM()} property is not supported in the current language profile.
*/
@Override
public boolean hasSomeValuesFrom( Resource cls ) {
Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/arp/states/StartStateRDForDescription.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/arp/states/StartStateRDForDescription.java?rev=1606090&r1=1606089&r2=1606090&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/arp/states/StartStateRDForDescription.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/arp/states/StartStateRDForDescription.java Fri Jun 27 13:20:01 2014
@@ -28,8 +28,7 @@ public class StartStateRDForDescription
boolean sawRdfRDF;
- public StartStateRDForDescription(XMLHandler handler, AbsXMLContext x)
- throws SAXParseException {
+ public StartStateRDForDescription(XMLHandler handler, AbsXMLContext x) {
super(handler, x);
}
Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/ModelCon.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/ModelCon.java?rev=1606090&r1=1606089&r2=1606090&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/ModelCon.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/ModelCon.java Fri Jun 27 13:20:01 2014
@@ -20,6 +20,7 @@ package com.hp.hpl.jena.rdf.model;
import java.util.Calendar;
+import com.hp.hpl.jena.datatypes.DatatypeFormatException ;
import com.hp.hpl.jena.datatypes.RDFDatatype;
import com.hp.hpl.jena.graph.Node;
Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/ModelMaker.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/ModelMaker.java?rev=1606090&r1=1606089&r2=1606090&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/ModelMaker.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/ModelMaker.java Fri Jun 27 13:20:01 2014
@@ -19,6 +19,8 @@
package com.hp.hpl.jena.rdf.model;
import com.hp.hpl.jena.graph.*;
+import com.hp.hpl.jena.shared.AlreadyExistsException ;
+import com.hp.hpl.jena.shared.DoesNotExistException ;
import com.hp.hpl.jena.util.iterator.*;
/**
Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/NsIterator.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/NsIterator.java?rev=1606090&r1=1606089&r2=1606090&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/NsIterator.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/NsIterator.java Fri Jun 27 13:20:01 2014
@@ -18,6 +18,8 @@
package com.hp.hpl.jena.rdf.model;
+import java.util.NoSuchElementException ;
+
import com.hp.hpl.jena.util.iterator.*;
/** An iterator which returns namespace URI's.
Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/impl/ModelCom.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/impl/ModelCom.java?rev=1606090&r1=1606089&r2=1606090&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/impl/ModelCom.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/impl/ModelCom.java Fri Jun 27 13:20:01 2014
@@ -1041,7 +1041,7 @@ implements Model, PrefixMapping, Lock
If the prefix maps to multiple URIs, then we discard it completely.
- @param the Model who's namespace is to be updated
+ @param m Model who's namespace is to be updated
@param ns the namespace map to add to the Model
*/
public static void addNamespaces( Model m, Map<String, Set<String>> ns )
@@ -1556,7 +1556,7 @@ implements Model, PrefixMapping, Lock
Register the listener with this model by registering its GraphListener
adaption with the underlying Graph.
- @param a ModelChangedListener to register for model events
+ @param listener A ModelChangedListener to register for model events
@return this model, for cascading
*/
@Override
@@ -1569,7 +1569,7 @@ implements Model, PrefixMapping, Lock
/**
Unregister the listener from this model by unregistering its GraphListener
adaption from the underlying Graph.
- @param a ModelChangedListener to unregister from model events
+ @param listener A ModelChangedListener to unregister from model events
@return this model, for cascading
*/
@Override
Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/impl/NTripleWriter.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/impl/NTripleWriter.java?rev=1606090&r1=1606089&r2=1606090&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/impl/NTripleWriter.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/impl/NTripleWriter.java Fri Jun 27 13:20:01 2014
@@ -112,8 +112,7 @@ public class NTripleWriter extends Objec
return old;
}
- public static void write(Model model, PrintWriter writer)
- throws java.io.IOException {
+ public static void write(Model model, PrintWriter writer) {
StmtIterator iter = model.listStatements();
Statement stmt = null;
Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/impl/RDFListImpl.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/impl/RDFListImpl.java?rev=1606090&r1=1606089&r2=1606090&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/impl/RDFListImpl.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/impl/RDFListImpl.java Fri Jun 27 13:20:01 2014
@@ -993,7 +993,7 @@ public class RDFListImpl
* for rdf:type has therefore been removed.
* </p>
*
- * @return True if this list cell passes basic validity checks
+ * @returns True if this list cell passes basic validity checks
*/
protected void checkValid() {
if (!equals( listNil() )) {
Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/reasoner/rulesys/impl/BindingStack.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/reasoner/rulesys/impl/BindingStack.java?rev=1606090&r1=1606089&r2=1606090&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/reasoner/rulesys/impl/BindingStack.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/reasoner/rulesys/impl/BindingStack.java Fri Jun 27 13:20:01 2014
@@ -203,8 +203,7 @@ public class BindingStack implements Bin
/**
* Instantiate a triple pattern against the current environment.
* This version handles unbound varibles by turning them into bNodes.
- * @param clause the triple pattern to match
- * @param env the current binding environment
+ * @param pattern the triple pattern to match
* @return a new, instantiated triple
*/
@Override
Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/reasoner/rulesys/impl/BindingVector.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/reasoner/rulesys/impl/BindingVector.java?rev=1606090&r1=1606089&r2=1606090&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/reasoner/rulesys/impl/BindingVector.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/reasoner/rulesys/impl/BindingVector.java Fri Jun 27 13:20:01 2014
@@ -186,8 +186,7 @@ public class BindingVector implements Bi
/**
* Instantiate a triple pattern against the current environment.
* This version handles unbound varibles by turning them into bNodes.
- * @param clause the triple pattern to match
- * @param env the current binding environment
+ * @param pattern the triple pattern to match
* @return a new, instantiated triple
*/
@Override