diff --git a/elk-owlapi/src/main/java/org/semanticweb/elk/owlapi/wrapper/ElkAnnotationAssertionAxiomWrap.java b/elk-owlapi/src/main/java/org/semanticweb/elk/owlapi/wrapper/ElkAnnotationAssertionAxiomWrap.java index b197b749d..032fbc440 100644 --- a/elk-owlapi/src/main/java/org/semanticweb/elk/owlapi/wrapper/ElkAnnotationAssertionAxiomWrap.java +++ b/elk-owlapi/src/main/java/org/semanticweb/elk/owlapi/wrapper/ElkAnnotationAssertionAxiomWrap.java @@ -53,12 +53,12 @@ public ElkAnnotationAssertionAxiomWrap(T owlAxiom) { @Override public ElkAnnotationSubject getSubject() { - return converter.convert(owlObject.getSubject()); + return converter.convert(getSubject(owlObject)); } @Override public ElkAnnotationProperty getProperty() { - return converter.convert(owlObject.getProperty()); + return converter.convert(getProperty(owlObject)); } @Override diff --git a/elk-owlapi/src/main/java/org/semanticweb/elk/owlapi/wrapper/ElkAnnotationPropertyDomainAxiomWrap.java b/elk-owlapi/src/main/java/org/semanticweb/elk/owlapi/wrapper/ElkAnnotationPropertyDomainAxiomWrap.java index 45499e8da..b42582133 100644 --- a/elk-owlapi/src/main/java/org/semanticweb/elk/owlapi/wrapper/ElkAnnotationPropertyDomainAxiomWrap.java +++ b/elk-owlapi/src/main/java/org/semanticweb/elk/owlapi/wrapper/ElkAnnotationPropertyDomainAxiomWrap.java @@ -41,8 +41,8 @@ * the type of the wrapped object */ public class ElkAnnotationPropertyDomainAxiomWrap - extends ElkAnnotationAxiomWrap implements - ElkAnnotationPropertyDomainAxiom { + extends ElkAnnotationAxiomWrap + implements ElkAnnotationPropertyDomainAxiom { public ElkAnnotationPropertyDomainAxiomWrap( T owlAnnotationPropertyDomainAxiom) { @@ -51,12 +51,12 @@ public ElkAnnotationPropertyDomainAxiomWrap( @Override public ElkAnnotationProperty getProperty() { - return converter.convert(this.owlObject.getProperty()); + return converter.convert(getProperty(owlObject)); } @Override public ElkIri getDomain() { - return converter.convert(this.owlObject.getDomain()); + return converter.convert(getDomain(owlObject)); } @Override diff --git a/elk-owlapi/src/main/java/org/semanticweb/elk/owlapi/wrapper/ElkAnnotationPropertyRangeAxiomWrap.java b/elk-owlapi/src/main/java/org/semanticweb/elk/owlapi/wrapper/ElkAnnotationPropertyRangeAxiomWrap.java index 56be7ebe6..7d8a9f268 100644 --- a/elk-owlapi/src/main/java/org/semanticweb/elk/owlapi/wrapper/ElkAnnotationPropertyRangeAxiomWrap.java +++ b/elk-owlapi/src/main/java/org/semanticweb/elk/owlapi/wrapper/ElkAnnotationPropertyRangeAxiomWrap.java @@ -41,21 +41,22 @@ * the type of the wrapped object */ public class ElkAnnotationPropertyRangeAxiomWrap - extends ElkAnnotationAxiomWrap implements - ElkAnnotationPropertyRangeAxiom { + extends ElkAnnotationAxiomWrap + implements ElkAnnotationPropertyRangeAxiom { - public ElkAnnotationPropertyRangeAxiomWrap(T owlAnnotationPropertyRangeAxiom) { + public ElkAnnotationPropertyRangeAxiomWrap( + T owlAnnotationPropertyRangeAxiom) { super(owlAnnotationPropertyRangeAxiom); } @Override public ElkAnnotationProperty getProperty() { - return converter.convert(this.owlObject.getProperty()); + return converter.convert(getProperty(owlObject)); } @Override public ElkIri getRange() { - return converter.convert(this.owlObject.getRange()); + return converter.convert(getRange(owlObject)); } @Override diff --git a/elk-owlapi/src/main/java/org/semanticweb/elk/owlapi/wrapper/ElkAnnotationWrap.java b/elk-owlapi/src/main/java/org/semanticweb/elk/owlapi/wrapper/ElkAnnotationWrap.java index c5ec749f4..599568786 100644 --- a/elk-owlapi/src/main/java/org/semanticweb/elk/owlapi/wrapper/ElkAnnotationWrap.java +++ b/elk-owlapi/src/main/java/org/semanticweb/elk/owlapi/wrapper/ElkAnnotationWrap.java @@ -47,7 +47,7 @@ public ElkAnnotationWrap(T annotation) { @Override public ElkAnnotationProperty getProperty() { - return converter.convert(owlObject.getProperty()); + return converter.convert(getProperty(owlObject)); } @Override diff --git a/elk-owlapi/src/main/java/org/semanticweb/elk/owlapi/wrapper/ElkAsymmetricObjectPropertyAxiomWrap.java b/elk-owlapi/src/main/java/org/semanticweb/elk/owlapi/wrapper/ElkAsymmetricObjectPropertyAxiomWrap.java index aebb4345c..17ac35109 100644 --- a/elk-owlapi/src/main/java/org/semanticweb/elk/owlapi/wrapper/ElkAsymmetricObjectPropertyAxiomWrap.java +++ b/elk-owlapi/src/main/java/org/semanticweb/elk/owlapi/wrapper/ElkAsymmetricObjectPropertyAxiomWrap.java @@ -49,7 +49,7 @@ public ElkAsymmetricObjectPropertyAxiomWrap( @Override public ElkObjectPropertyExpression getProperty() { - return converter.convert(this.owlObject.getProperty()); + return converter.convert(getProperty(owlObject)); } @Override diff --git a/elk-owlapi/src/main/java/org/semanticweb/elk/owlapi/wrapper/ElkDataAllValuesFromWrap.java b/elk-owlapi/src/main/java/org/semanticweb/elk/owlapi/wrapper/ElkDataAllValuesFromWrap.java index faa1577c8..7696e4a11 100644 --- a/elk-owlapi/src/main/java/org/semanticweb/elk/owlapi/wrapper/ElkDataAllValuesFromWrap.java +++ b/elk-owlapi/src/main/java/org/semanticweb/elk/owlapi/wrapper/ElkDataAllValuesFromWrap.java @@ -42,8 +42,8 @@ * @param * the type of the wrapped object */ -public class ElkDataAllValuesFromWrap extends - ElkClassExpressionWrap implements ElkDataAllValuesFrom { +public class ElkDataAllValuesFromWrap + extends ElkClassExpressionWrap implements ElkDataAllValuesFrom { public ElkDataAllValuesFromWrap(T owlDataAllValuesFrom) { super(owlDataAllValuesFrom); @@ -51,13 +51,13 @@ public ElkDataAllValuesFromWrap(T owlDataAllValuesFrom) { @Override public List getDataPropertyExpressions() { - return Collections.singletonList(converter.convert(owlObject - .getProperty())); + return Collections + .singletonList(converter.convert(getProperty(owlObject))); } @Override public ElkDataRange getDataRange() { - return converter.convert(owlObject.getFiller()); + return converter.convert(getFiller(owlObject)); } @Override diff --git a/elk-owlapi/src/main/java/org/semanticweb/elk/owlapi/wrapper/ElkDataExactCardinalityQualifiedWrap.java b/elk-owlapi/src/main/java/org/semanticweb/elk/owlapi/wrapper/ElkDataExactCardinalityQualifiedWrap.java index 6447d9359..75213efe4 100644 --- a/elk-owlapi/src/main/java/org/semanticweb/elk/owlapi/wrapper/ElkDataExactCardinalityQualifiedWrap.java +++ b/elk-owlapi/src/main/java/org/semanticweb/elk/owlapi/wrapper/ElkDataExactCardinalityQualifiedWrap.java @@ -48,7 +48,7 @@ public ElkDataExactCardinalityQualifiedWrap(T owlDataExactCardinality) { @Override public ElkDataRange getFiller() { - return converter.convert(this.owlObject.getFiller()); + return converter.convert(getFiller(owlObject)); } @Override diff --git a/elk-owlapi/src/main/java/org/semanticweb/elk/owlapi/wrapper/ElkDataExactCardinalityUnqualifiedWrap.java b/elk-owlapi/src/main/java/org/semanticweb/elk/owlapi/wrapper/ElkDataExactCardinalityUnqualifiedWrap.java index 274abaf5f..cb9629249 100644 --- a/elk-owlapi/src/main/java/org/semanticweb/elk/owlapi/wrapper/ElkDataExactCardinalityUnqualifiedWrap.java +++ b/elk-owlapi/src/main/java/org/semanticweb/elk/owlapi/wrapper/ElkDataExactCardinalityUnqualifiedWrap.java @@ -41,8 +41,8 @@ * the type of the wrapped object */ public class ElkDataExactCardinalityUnqualifiedWrap - extends ElkClassExpressionWrap implements - ElkDataExactCardinalityUnqualified { + extends ElkClassExpressionWrap + implements ElkDataExactCardinalityUnqualified { public ElkDataExactCardinalityUnqualifiedWrap(T owlDataExactCardinality) { super(owlDataExactCardinality); @@ -50,12 +50,12 @@ public ElkDataExactCardinalityUnqualifiedWrap(T owlDataExactCardinality) { @Override public int getCardinality() { - return this.owlObject.getCardinality(); + return getCardinality(owlObject); } @Override public ElkDataPropertyExpression getProperty() { - return converter.convert(this.owlObject.getProperty()); + return converter.convert(getProperty(owlObject)); } @Override diff --git a/elk-owlapi/src/main/java/org/semanticweb/elk/owlapi/wrapper/ElkDataHasValueWrap.java b/elk-owlapi/src/main/java/org/semanticweb/elk/owlapi/wrapper/ElkDataHasValueWrap.java index b6ddfb8e3..423d7d5f2 100644 --- a/elk-owlapi/src/main/java/org/semanticweb/elk/owlapi/wrapper/ElkDataHasValueWrap.java +++ b/elk-owlapi/src/main/java/org/semanticweb/elk/owlapi/wrapper/ElkDataHasValueWrap.java @@ -40,8 +40,8 @@ * @param * the type of the wrapped object */ -public class ElkDataHasValueWrap extends - ElkClassExpressionWrap implements ElkDataHasValue { +public class ElkDataHasValueWrap + extends ElkClassExpressionWrap implements ElkDataHasValue { public ElkDataHasValueWrap(T owlDataHasValue) { super(owlDataHasValue); @@ -49,12 +49,12 @@ public ElkDataHasValueWrap(T owlDataHasValue) { @Override public ElkDataPropertyExpression getProperty() { - return converter.convert(this.owlObject.getProperty()); + return converter.convert(getProperty(owlObject)); } @Override public ElkLiteral getFiller() { - return converter.convert(this.owlObject.getFiller()); + return converter.convert(getFiller(owlObject)); } @Override diff --git a/elk-owlapi/src/main/java/org/semanticweb/elk/owlapi/wrapper/ElkDataMaxCardinalityQualifiedWrap.java b/elk-owlapi/src/main/java/org/semanticweb/elk/owlapi/wrapper/ElkDataMaxCardinalityQualifiedWrap.java index 7e69d3ac3..e30ba71f9 100644 --- a/elk-owlapi/src/main/java/org/semanticweb/elk/owlapi/wrapper/ElkDataMaxCardinalityQualifiedWrap.java +++ b/elk-owlapi/src/main/java/org/semanticweb/elk/owlapi/wrapper/ElkDataMaxCardinalityQualifiedWrap.java @@ -48,7 +48,7 @@ public ElkDataMaxCardinalityQualifiedWrap(T owlDataMaxCardinality) { @Override public ElkDataRange getFiller() { - return converter.convert(this.owlObject.getFiller()); + return converter.convert(getFiller(owlObject)); } @Override diff --git a/elk-owlapi/src/main/java/org/semanticweb/elk/owlapi/wrapper/ElkDataMaxCardinalityUnqualifiedWrap.java b/elk-owlapi/src/main/java/org/semanticweb/elk/owlapi/wrapper/ElkDataMaxCardinalityUnqualifiedWrap.java index 18b3285e7..82adc47bb 100644 --- a/elk-owlapi/src/main/java/org/semanticweb/elk/owlapi/wrapper/ElkDataMaxCardinalityUnqualifiedWrap.java +++ b/elk-owlapi/src/main/java/org/semanticweb/elk/owlapi/wrapper/ElkDataMaxCardinalityUnqualifiedWrap.java @@ -50,12 +50,12 @@ public ElkDataMaxCardinalityUnqualifiedWrap(T owlDataMaxCardinality) { @Override public int getCardinality() { - return this.owlObject.getCardinality(); + return getCardinality(owlObject); } @Override public ElkDataPropertyExpression getProperty() { - return converter.convert(this.owlObject.getProperty()); + return converter.convert(getProperty(owlObject)); } @Override diff --git a/elk-owlapi/src/main/java/org/semanticweb/elk/owlapi/wrapper/ElkDataMinCardinalityQualifiedWrap.java b/elk-owlapi/src/main/java/org/semanticweb/elk/owlapi/wrapper/ElkDataMinCardinalityQualifiedWrap.java index 09dc15796..c28e45089 100644 --- a/elk-owlapi/src/main/java/org/semanticweb/elk/owlapi/wrapper/ElkDataMinCardinalityQualifiedWrap.java +++ b/elk-owlapi/src/main/java/org/semanticweb/elk/owlapi/wrapper/ElkDataMinCardinalityQualifiedWrap.java @@ -48,7 +48,7 @@ public ElkDataMinCardinalityQualifiedWrap(T owlDataMinCardinality) { @Override public ElkDataRange getFiller() { - return converter.convert(this.owlObject.getFiller()); + return converter.convert(getFiller(owlObject)); } @Override diff --git a/elk-owlapi/src/main/java/org/semanticweb/elk/owlapi/wrapper/ElkDataMinCardinalityUnqualifiedWrap.java b/elk-owlapi/src/main/java/org/semanticweb/elk/owlapi/wrapper/ElkDataMinCardinalityUnqualifiedWrap.java index 5dcad2b90..0a1193ff0 100644 --- a/elk-owlapi/src/main/java/org/semanticweb/elk/owlapi/wrapper/ElkDataMinCardinalityUnqualifiedWrap.java +++ b/elk-owlapi/src/main/java/org/semanticweb/elk/owlapi/wrapper/ElkDataMinCardinalityUnqualifiedWrap.java @@ -50,12 +50,12 @@ public ElkDataMinCardinalityUnqualifiedWrap(T owlDataMinCardinality) { @Override public int getCardinality() { - return this.owlObject.getCardinality(); + return getCardinality(owlObject); } @Override public ElkDataPropertyExpression getProperty() { - return converter.convert(this.owlObject.getProperty()); + return converter.convert(getProperty(owlObject)); } @Override diff --git a/elk-owlapi/src/main/java/org/semanticweb/elk/owlapi/wrapper/ElkDataPropertyAssertionAxiomWrap.java b/elk-owlapi/src/main/java/org/semanticweb/elk/owlapi/wrapper/ElkDataPropertyAssertionAxiomWrap.java index 1ed2e2d3d..f91744002 100644 --- a/elk-owlapi/src/main/java/org/semanticweb/elk/owlapi/wrapper/ElkDataPropertyAssertionAxiomWrap.java +++ b/elk-owlapi/src/main/java/org/semanticweb/elk/owlapi/wrapper/ElkDataPropertyAssertionAxiomWrap.java @@ -51,17 +51,17 @@ public ElkDataPropertyAssertionAxiomWrap(T owlObjectPropertyAssertionAxiom) { @Override public ElkIndividual getSubject() { - return converter.convert(this.owlObject.getSubject()); + return converter.convert(getSubject(owlObject)); } @Override public ElkLiteral getObject() { - return converter.convert(this.owlObject.getObject()); + return converter.convert(getObject(owlObject)); } @Override public ElkDataPropertyExpression getProperty() { - return converter.convert(this.owlObject.getProperty()); + return converter.convert(getProperty(owlObject)); } @Override diff --git a/elk-owlapi/src/main/java/org/semanticweb/elk/owlapi/wrapper/ElkDataPropertyDomainAxiomWrap.java b/elk-owlapi/src/main/java/org/semanticweb/elk/owlapi/wrapper/ElkDataPropertyDomainAxiomWrap.java index 5619ae67d..708855e25 100644 --- a/elk-owlapi/src/main/java/org/semanticweb/elk/owlapi/wrapper/ElkDataPropertyDomainAxiomWrap.java +++ b/elk-owlapi/src/main/java/org/semanticweb/elk/owlapi/wrapper/ElkDataPropertyDomainAxiomWrap.java @@ -50,12 +50,12 @@ public ElkDataPropertyDomainAxiomWrap(T owlDataPropertyDomainAxiom) { @Override public ElkDataPropertyExpression getProperty() { - return converter.convert(this.owlObject.getProperty()); + return converter.convert(getProperty(owlObject)); } @Override public ElkClassExpression getDomain() { - return converter.convert(this.owlObject.getDomain()); + return converter.convert(getDomain(owlObject)); } @Override diff --git a/elk-owlapi/src/main/java/org/semanticweb/elk/owlapi/wrapper/ElkDataPropertyRangeAxiomWrap.java b/elk-owlapi/src/main/java/org/semanticweb/elk/owlapi/wrapper/ElkDataPropertyRangeAxiomWrap.java index 562175638..4a5f3946b 100644 --- a/elk-owlapi/src/main/java/org/semanticweb/elk/owlapi/wrapper/ElkDataPropertyRangeAxiomWrap.java +++ b/elk-owlapi/src/main/java/org/semanticweb/elk/owlapi/wrapper/ElkDataPropertyRangeAxiomWrap.java @@ -50,12 +50,12 @@ public ElkDataPropertyRangeAxiomWrap(T owlDataPropertyRangeAxiom) { @Override public ElkDataPropertyExpression getProperty() { - return converter.convert(this.owlObject.getProperty()); + return converter.convert(getProperty(owlObject)); } @Override public ElkDataRange getRange() { - return converter.convert(this.owlObject.getRange()); + return converter.convert(getRange(owlObject)); } @Override diff --git a/elk-owlapi/src/main/java/org/semanticweb/elk/owlapi/wrapper/ElkDataSomeValuesFromWrap.java b/elk-owlapi/src/main/java/org/semanticweb/elk/owlapi/wrapper/ElkDataSomeValuesFromWrap.java index 8e8c1b9f8..3ea773d83 100644 --- a/elk-owlapi/src/main/java/org/semanticweb/elk/owlapi/wrapper/ElkDataSomeValuesFromWrap.java +++ b/elk-owlapi/src/main/java/org/semanticweb/elk/owlapi/wrapper/ElkDataSomeValuesFromWrap.java @@ -51,13 +51,12 @@ public ElkDataSomeValuesFromWrap(T owlDataSomeValuesFrom) { @Override public List getDataPropertyExpressions() { - return Collections.singletonList(converter.convert(owlObject - .getProperty())); + return Collections.singletonList(converter.convert(getProperty(owlObject))); } @Override public ElkDataRange getDataRange() { - return converter.convert(owlObject.getFiller()); + return converter.convert(getFiller(owlObject)); } @Override diff --git a/elk-owlapi/src/main/java/org/semanticweb/elk/owlapi/wrapper/ElkFunctionalDataPropertyAxiomWrap.java b/elk-owlapi/src/main/java/org/semanticweb/elk/owlapi/wrapper/ElkFunctionalDataPropertyAxiomWrap.java index 00822c89e..758fb2cbe 100644 --- a/elk-owlapi/src/main/java/org/semanticweb/elk/owlapi/wrapper/ElkFunctionalDataPropertyAxiomWrap.java +++ b/elk-owlapi/src/main/java/org/semanticweb/elk/owlapi/wrapper/ElkFunctionalDataPropertyAxiomWrap.java @@ -39,16 +39,17 @@ * the type of the wrapped object */ public class ElkFunctionalDataPropertyAxiomWrap - extends ElkDataPropertyAxiomWrap implements - ElkFunctionalDataPropertyAxiom { + extends ElkDataPropertyAxiomWrap + implements ElkFunctionalDataPropertyAxiom { - public ElkFunctionalDataPropertyAxiomWrap(T owlFunctionalDataPropertyAxiom) { + public ElkFunctionalDataPropertyAxiomWrap( + T owlFunctionalDataPropertyAxiom) { super(owlFunctionalDataPropertyAxiom); } @Override public ElkDataPropertyExpression getProperty() { - return converter.convert(this.owlObject.getProperty()); + return converter.convert(getProperty(owlObject)); } @Override diff --git a/elk-owlapi/src/main/java/org/semanticweb/elk/owlapi/wrapper/ElkFunctionalObjectPropertyAxiomWrap.java b/elk-owlapi/src/main/java/org/semanticweb/elk/owlapi/wrapper/ElkFunctionalObjectPropertyAxiomWrap.java index 2cd4eb29e..750479424 100644 --- a/elk-owlapi/src/main/java/org/semanticweb/elk/owlapi/wrapper/ElkFunctionalObjectPropertyAxiomWrap.java +++ b/elk-owlapi/src/main/java/org/semanticweb/elk/owlapi/wrapper/ElkFunctionalObjectPropertyAxiomWrap.java @@ -39,8 +39,8 @@ * the type of the wrapped object */ public class ElkFunctionalObjectPropertyAxiomWrap - extends ElkObjectPropertyAxiomWrap implements - ElkFunctionalObjectPropertyAxiom { + extends ElkObjectPropertyAxiomWrap + implements ElkFunctionalObjectPropertyAxiom { public ElkFunctionalObjectPropertyAxiomWrap( T owlFunctionalObjectPropertyAxiom) { @@ -49,7 +49,7 @@ public ElkFunctionalObjectPropertyAxiomWrap( @Override public ElkObjectPropertyExpression getProperty() { - return converter.convert(this.owlObject.getProperty()); + return converter.convert(getProperty(owlObject)); } @Override diff --git a/elk-owlapi/src/main/java/org/semanticweb/elk/owlapi/wrapper/ElkInverseFunctionalObjectPropertyAxiomWrap.java b/elk-owlapi/src/main/java/org/semanticweb/elk/owlapi/wrapper/ElkInverseFunctionalObjectPropertyAxiomWrap.java index fa1cb562b..b8c932d24 100644 --- a/elk-owlapi/src/main/java/org/semanticweb/elk/owlapi/wrapper/ElkInverseFunctionalObjectPropertyAxiomWrap.java +++ b/elk-owlapi/src/main/java/org/semanticweb/elk/owlapi/wrapper/ElkInverseFunctionalObjectPropertyAxiomWrap.java @@ -39,8 +39,8 @@ * the type of the wrapped object */ public class ElkInverseFunctionalObjectPropertyAxiomWrap - extends ElkObjectPropertyAxiomWrap implements - ElkInverseFunctionalObjectPropertyAxiom { + extends ElkObjectPropertyAxiomWrap + implements ElkInverseFunctionalObjectPropertyAxiom { public ElkInverseFunctionalObjectPropertyAxiomWrap( T owlInverseFunctionalObjectPropertyAxiom) { @@ -49,7 +49,7 @@ public ElkInverseFunctionalObjectPropertyAxiomWrap( @Override public ElkObjectPropertyExpression getProperty() { - return converter.convert(this.owlObject.getProperty()); + return converter.convert(getProperty(owlObject)); } @Override @@ -59,7 +59,8 @@ public O accept(ElkObjectPropertyAxiomVisitor visitor) { @Override public O accept(ElkPropertyAxiomVisitor visitor) { - return accept((ElkInverseFunctionalObjectPropertyAxiomVisitor) visitor); + return accept( + (ElkInverseFunctionalObjectPropertyAxiomVisitor) visitor); } @Override diff --git a/elk-owlapi/src/main/java/org/semanticweb/elk/owlapi/wrapper/ElkIrreflexiveObjectPropertyAxiomWrap.java b/elk-owlapi/src/main/java/org/semanticweb/elk/owlapi/wrapper/ElkIrreflexiveObjectPropertyAxiomWrap.java index fb7cc8cda..6629cc404 100644 --- a/elk-owlapi/src/main/java/org/semanticweb/elk/owlapi/wrapper/ElkIrreflexiveObjectPropertyAxiomWrap.java +++ b/elk-owlapi/src/main/java/org/semanticweb/elk/owlapi/wrapper/ElkIrreflexiveObjectPropertyAxiomWrap.java @@ -49,7 +49,7 @@ public ElkIrreflexiveObjectPropertyAxiomWrap( @Override public ElkObjectPropertyExpression getProperty() { - return converter.convert(this.owlObject.getProperty()); + return converter.convert(getProperty(owlObject)); } @Override diff --git a/elk-owlapi/src/main/java/org/semanticweb/elk/owlapi/wrapper/ElkNegativeDataPropertyAssertionAxiomWrap.java b/elk-owlapi/src/main/java/org/semanticweb/elk/owlapi/wrapper/ElkNegativeDataPropertyAssertionAxiomWrap.java index 4dc8f44a9..c49f36ce5 100644 --- a/elk-owlapi/src/main/java/org/semanticweb/elk/owlapi/wrapper/ElkNegativeDataPropertyAssertionAxiomWrap.java +++ b/elk-owlapi/src/main/java/org/semanticweb/elk/owlapi/wrapper/ElkNegativeDataPropertyAssertionAxiomWrap.java @@ -52,17 +52,17 @@ public ElkNegativeDataPropertyAssertionAxiomWrap( @Override public ElkIndividual getSubject() { - return converter.convert(this.owlObject.getSubject()); + return converter.convert(getSubject(owlObject)); } @Override public ElkLiteral getObject() { - return converter.convert(this.owlObject.getObject()); + return converter.convert(getObject(owlObject)); } @Override public ElkDataPropertyExpression getProperty() { - return converter.convert(this.owlObject.getProperty()); + return converter.convert(getProperty(owlObject)); } @Override diff --git a/elk-owlapi/src/main/java/org/semanticweb/elk/owlapi/wrapper/ElkNegativeObjectPropertyAssertionAxiomWrap.java b/elk-owlapi/src/main/java/org/semanticweb/elk/owlapi/wrapper/ElkNegativeObjectPropertyAssertionAxiomWrap.java index 14d1b190c..9b1857afb 100644 --- a/elk-owlapi/src/main/java/org/semanticweb/elk/owlapi/wrapper/ElkNegativeObjectPropertyAssertionAxiomWrap.java +++ b/elk-owlapi/src/main/java/org/semanticweb/elk/owlapi/wrapper/ElkNegativeObjectPropertyAssertionAxiomWrap.java @@ -51,17 +51,17 @@ public ElkNegativeObjectPropertyAssertionAxiomWrap( @Override public ElkIndividual getObject() { - return converter.convert(this.owlObject.getSubject()); + return converter.convert(getSubject(owlObject)); } @Override public ElkIndividual getSubject() { - return converter.convert(this.owlObject.getObject()); + return converter.convert(getObject(owlObject)); } @Override public ElkObjectPropertyExpression getProperty() { - return converter.convert(this.owlObject.getProperty()); + return converter.convert(getProperty(owlObject)); } @Override diff --git a/elk-owlapi/src/main/java/org/semanticweb/elk/owlapi/wrapper/ElkObjectAllValuesFromWrap.java b/elk-owlapi/src/main/java/org/semanticweb/elk/owlapi/wrapper/ElkObjectAllValuesFromWrap.java index 7d52c1b27..16d177a7a 100644 --- a/elk-owlapi/src/main/java/org/semanticweb/elk/owlapi/wrapper/ElkObjectAllValuesFromWrap.java +++ b/elk-owlapi/src/main/java/org/semanticweb/elk/owlapi/wrapper/ElkObjectAllValuesFromWrap.java @@ -49,12 +49,12 @@ public class ElkObjectAllValuesFromWrap @Override public ElkObjectPropertyExpression getProperty() { - return converter.convert(this.owlObject.getProperty()); + return converter.convert(getProperty(owlObject)); } @Override public ElkClassExpression getFiller() { - return converter.convert(this.owlObject.getFiller()); + return converter.convert(getFiller(owlObject)); } @Override diff --git a/elk-owlapi/src/main/java/org/semanticweb/elk/owlapi/wrapper/ElkObjectExactCardinalityQualifiedWrap.java b/elk-owlapi/src/main/java/org/semanticweb/elk/owlapi/wrapper/ElkObjectExactCardinalityQualifiedWrap.java index d2eda7459..fa844b3d9 100644 --- a/elk-owlapi/src/main/java/org/semanticweb/elk/owlapi/wrapper/ElkObjectExactCardinalityQualifiedWrap.java +++ b/elk-owlapi/src/main/java/org/semanticweb/elk/owlapi/wrapper/ElkObjectExactCardinalityQualifiedWrap.java @@ -48,7 +48,7 @@ public class ElkObjectExactCardinalityQualifiedWrap extends @Override public ElkObjectPropertyExpression getProperty() { - return converter.convert(this.owlObject.getProperty()); + return converter.convert(getProperty(owlObject)); } @Override diff --git a/elk-owlapi/src/main/java/org/semanticweb/elk/owlapi/wrapper/ElkObjectHasValueWrap.java b/elk-owlapi/src/main/java/org/semanticweb/elk/owlapi/wrapper/ElkObjectHasValueWrap.java index a2a84bffb..266856c48 100644 --- a/elk-owlapi/src/main/java/org/semanticweb/elk/owlapi/wrapper/ElkObjectHasValueWrap.java +++ b/elk-owlapi/src/main/java/org/semanticweb/elk/owlapi/wrapper/ElkObjectHasValueWrap.java @@ -49,12 +49,12 @@ public class ElkObjectHasValueWrap extends @Override public ElkObjectPropertyExpression getProperty() { - return converter.convert(this.owlObject.getProperty()); + return converter.convert(getProperty(owlObject)); } @Override public ElkIndividual getFiller() { - return converter.convert(this.owlObject.getFiller()); + return converter.convert(getFiller(owlObject)); } @Override diff --git a/elk-owlapi/src/main/java/org/semanticweb/elk/owlapi/wrapper/ElkObjectInverseOfWrap.java b/elk-owlapi/src/main/java/org/semanticweb/elk/owlapi/wrapper/ElkObjectInverseOfWrap.java index e97ee87bf..8920075e9 100644 --- a/elk-owlapi/src/main/java/org/semanticweb/elk/owlapi/wrapper/ElkObjectInverseOfWrap.java +++ b/elk-owlapi/src/main/java/org/semanticweb/elk/owlapi/wrapper/ElkObjectInverseOfWrap.java @@ -52,7 +52,7 @@ public ElkObjectInverseOfWrap(T owlObjectInverseOf) { @Override public ElkObjectProperty getObjectProperty() { - return new ElkObjectPropertyWrap(this.owlObject); + return new ElkObjectPropertyWrap(owlObject); } @Override diff --git a/elk-owlapi/src/main/java/org/semanticweb/elk/owlapi/wrapper/ElkObjectMaxCardinalityQualifiedWrap.java b/elk-owlapi/src/main/java/org/semanticweb/elk/owlapi/wrapper/ElkObjectMaxCardinalityQualifiedWrap.java index 39b1e681e..931a1acf3 100644 --- a/elk-owlapi/src/main/java/org/semanticweb/elk/owlapi/wrapper/ElkObjectMaxCardinalityQualifiedWrap.java +++ b/elk-owlapi/src/main/java/org/semanticweb/elk/owlapi/wrapper/ElkObjectMaxCardinalityQualifiedWrap.java @@ -48,7 +48,7 @@ public class ElkObjectMaxCardinalityQualifiedWrap - extends ElkObjectPropertyAxiomWrap implements - ElkObjectPropertyRangeAxiom { + extends ElkObjectPropertyAxiomWrap + implements ElkObjectPropertyRangeAxiom { public ElkObjectPropertyRangeAxiomWrap(T owlObjectPropertyRangeAxiom) { super(owlObjectPropertyRangeAxiom); @@ -50,12 +50,12 @@ public ElkObjectPropertyRangeAxiomWrap(T owlObjectPropertyRangeAxiom) { @Override public ElkObjectPropertyExpression getProperty() { - return converter.convert(this.owlObject.getProperty()); + return converter.convert(getProperty(owlObject)); } @Override public ElkClassExpression getRange() { - return converter.convert(this.owlObject.getRange()); + return converter.convert(getRange(owlObject)); } @Override diff --git a/elk-owlapi/src/main/java/org/semanticweb/elk/owlapi/wrapper/ElkObjectSomeValuesFromWrap.java b/elk-owlapi/src/main/java/org/semanticweb/elk/owlapi/wrapper/ElkObjectSomeValuesFromWrap.java index 7cc0455b3..134193eed 100644 --- a/elk-owlapi/src/main/java/org/semanticweb/elk/owlapi/wrapper/ElkObjectSomeValuesFromWrap.java +++ b/elk-owlapi/src/main/java/org/semanticweb/elk/owlapi/wrapper/ElkObjectSomeValuesFromWrap.java @@ -50,12 +50,12 @@ public class ElkObjectSomeValuesFromWrap @Override public ElkObjectPropertyExpression getProperty() { - return converter.convert(this.owlObject.getProperty()); + return converter.convert(getProperty(owlObject)); } @Override public ElkClassExpression getFiller() { - return converter.convert(this.owlObject.getFiller()); + return converter.convert(getFiller(owlObject)); } @Override diff --git a/elk-owlapi/src/main/java/org/semanticweb/elk/owlapi/wrapper/ElkObjectWrap.java b/elk-owlapi/src/main/java/org/semanticweb/elk/owlapi/wrapper/ElkObjectWrap.java index aebb0918c..28e89e3f3 100644 --- a/elk-owlapi/src/main/java/org/semanticweb/elk/owlapi/wrapper/ElkObjectWrap.java +++ b/elk-owlapi/src/main/java/org/semanticweb/elk/owlapi/wrapper/ElkObjectWrap.java @@ -27,6 +27,13 @@ import org.semanticweb.elk.owl.interfaces.ElkObject; import org.semanticweb.elk.owl.predefined.AbstractElkObject; +import org.semanticweb.owlapi.model.HasCardinality; +import org.semanticweb.owlapi.model.HasDomain; +import org.semanticweb.owlapi.model.HasFiller; +import org.semanticweb.owlapi.model.HasObject; +import org.semanticweb.owlapi.model.HasProperty; +import org.semanticweb.owlapi.model.HasRange; +import org.semanticweb.owlapi.model.HasSubject; import org.semanticweb.owlapi.model.OWLObject; /** @@ -38,7 +45,8 @@ * @param * the type of the wrapped object */ -public abstract class ElkObjectWrap extends AbstractElkObject implements ElkObject { +public abstract class ElkObjectWrap extends AbstractElkObject + implements ElkObject { /** * The converter for converting sub-objects. @@ -54,9 +62,37 @@ public abstract class ElkObjectWrap extends AbstractElkObject implements ElkO public ElkObjectWrap(T owlObject) { this.owlObject = owlObject; } - + public T getOwlObject() { return owlObject; } + static

P getProperty(HasProperty

owlObject) { + return owlObject.getProperty(); + } + + static T getFiller(HasFiller owlObject) { + return owlObject.getFiller(); + } + + static D getDomain(HasDomain owlObject) { + return owlObject.getDomain(); + } + + static R getRange(HasRange owlObject) { + return owlObject.getRange(); + } + + static int getCardinality(HasCardinality owlObject) { + return owlObject.getCardinality(); + } + + static O getObject(HasObject owlObject) { + return owlObject.getObject(); + } + + static T getSubject(HasSubject owlObject) { + return owlObject.getSubject(); + } + } diff --git a/elk-owlapi/src/main/java/org/semanticweb/elk/owlapi/wrapper/ElkReflexiveObjectPropertyAxiomWrap.java b/elk-owlapi/src/main/java/org/semanticweb/elk/owlapi/wrapper/ElkReflexiveObjectPropertyAxiomWrap.java index 286b213e2..d486a03b3 100644 --- a/elk-owlapi/src/main/java/org/semanticweb/elk/owlapi/wrapper/ElkReflexiveObjectPropertyAxiomWrap.java +++ b/elk-owlapi/src/main/java/org/semanticweb/elk/owlapi/wrapper/ElkReflexiveObjectPropertyAxiomWrap.java @@ -48,7 +48,7 @@ public ElkReflexiveObjectPropertyAxiomWrap(T owlReflexiveObjectPropertyAxiom) { @Override public ElkObjectPropertyExpression getProperty() { - return converter.convert(this.owlObject.getProperty()); + return converter.convert(getProperty(owlObject)); } @Override diff --git a/elk-owlapi/src/main/java/org/semanticweb/elk/owlapi/wrapper/ElkSymmetricObjectPropertyAxiomWrap.java b/elk-owlapi/src/main/java/org/semanticweb/elk/owlapi/wrapper/ElkSymmetricObjectPropertyAxiomWrap.java index 5078e65c0..1831be3ef 100644 --- a/elk-owlapi/src/main/java/org/semanticweb/elk/owlapi/wrapper/ElkSymmetricObjectPropertyAxiomWrap.java +++ b/elk-owlapi/src/main/java/org/semanticweb/elk/owlapi/wrapper/ElkSymmetricObjectPropertyAxiomWrap.java @@ -48,7 +48,7 @@ public ElkSymmetricObjectPropertyAxiomWrap(T owlSymmetricObjectPropertyAxiom) { @Override public ElkObjectPropertyExpression getProperty() { - return converter.convert(this.owlObject.getProperty()); + return converter.convert(getProperty(owlObject)); } @Override diff --git a/elk-owlapi/src/main/java/org/semanticweb/elk/owlapi/wrapper/ElkTransitiveObjectPropertyAxiomWrap.java b/elk-owlapi/src/main/java/org/semanticweb/elk/owlapi/wrapper/ElkTransitiveObjectPropertyAxiomWrap.java index b3e74f9d5..f76fc3741 100644 --- a/elk-owlapi/src/main/java/org/semanticweb/elk/owlapi/wrapper/ElkTransitiveObjectPropertyAxiomWrap.java +++ b/elk-owlapi/src/main/java/org/semanticweb/elk/owlapi/wrapper/ElkTransitiveObjectPropertyAxiomWrap.java @@ -39,8 +39,8 @@ * the type of the wrapped object */ public class ElkTransitiveObjectPropertyAxiomWrap - extends ElkObjectPropertyAxiomWrap implements - ElkTransitiveObjectPropertyAxiom { + extends ElkObjectPropertyAxiomWrap + implements ElkTransitiveObjectPropertyAxiom { public ElkTransitiveObjectPropertyAxiomWrap( T owlTransitiveObjectPropertyAxiom) { @@ -49,7 +49,7 @@ public ElkTransitiveObjectPropertyAxiomWrap( @Override public ElkObjectPropertyExpression getProperty() { - return converter.convert(this.owlObject.getProperty()); + return converter.convert(getProperty(owlObject)); } @Override