diff --git a/src/main/scala/org/phenoscape/scowl/example/OWL2PrimerManchester.scala b/src/main/scala/org/phenoscape/scowl/example/OWL2PrimerManchester.scala index 6d93b42..4358343 100644 --- a/src/main/scala/org/phenoscape/scowl/example/OWL2PrimerManchester.scala +++ b/src/main/scala/org/phenoscape/scowl/example/OWL2PrimerManchester.scala @@ -1,6 +1,7 @@ package org.phenoscape.scowl.example import org.phenoscape.scowl._ + import scala.language.postfixOps object OWL2PrimerManchester { diff --git a/src/main/scala/org/phenoscape/scowl/example/ReadMeExamples.scala b/src/main/scala/org/phenoscape/scowl/example/ReadMeExamples.scala index c5e6b4f..182780f 100644 --- a/src/main/scala/org/phenoscape/scowl/example/ReadMeExamples.scala +++ b/src/main/scala/org/phenoscape/scowl/example/ReadMeExamples.scala @@ -1,11 +1,12 @@ package org.phenoscape.scowl.example import org.phenoscape.scowl._ -import org.semanticweb.owlapi.model.OWLClassExpression import org.semanticweb.owlapi.apibinding.OWLManager -import scala.collection.JavaConverters._ +import org.semanticweb.owlapi.model.OWLClassExpression import org.semanticweb.owlapi.model.parameters.Imports +import scala.jdk.CollectionConverters._ + object ReadMeExamples { val factory = OWLManager.getOWLDataFactory diff --git a/src/main/scala/org/phenoscape/scowl/ofn/AnnotationAxioms.scala b/src/main/scala/org/phenoscape/scowl/ofn/AnnotationAxioms.scala index 17437b5..0d3c69c 100644 --- a/src/main/scala/org/phenoscape/scowl/ofn/AnnotationAxioms.scala +++ b/src/main/scala/org/phenoscape/scowl/ofn/AnnotationAxioms.scala @@ -1,16 +1,10 @@ package org.phenoscape.scowl.ofn -import scala.collection.JavaConverters._ -import org.phenoscape.scowl.converters.Annotatable -import org.phenoscape.scowl.converters.AnnotationValuer -import org.semanticweb.owlapi.model.OWLAnnotation -import org.semanticweb.owlapi.model.OWLAnnotationAssertionAxiom -import org.semanticweb.owlapi.model.OWLAnnotationProperty -import org.semanticweb.owlapi.model.OWLAnnotationSubject -import org.semanticweb.owlapi.model.OWLAnnotationValue -import org.semanticweb.owlapi.model.OWLDeclarationAxiom -import org.semanticweb.owlapi.model.OWLEntity +import org.phenoscape.scowl.converters.{Annotatable, AnnotationValuer} import org.semanticweb.owlapi.apibinding.OWLManager +import org.semanticweb.owlapi.model._ + +import scala.jdk.CollectionConverters._ trait AnnotationAxioms { diff --git a/src/main/scala/org/phenoscape/scowl/ofn/ClassAxioms.scala b/src/main/scala/org/phenoscape/scowl/ofn/ClassAxioms.scala index 1ffe60d..9cc34a1 100644 --- a/src/main/scala/org/phenoscape/scowl/ofn/ClassAxioms.scala +++ b/src/main/scala/org/phenoscape/scowl/ofn/ClassAxioms.scala @@ -1,19 +1,9 @@ package org.phenoscape.scowl.ofn -import scala.collection.JavaConverters._ -import org.semanticweb.owlapi.model.OWLAnnotation -import org.semanticweb.owlapi.model.OWLClass -import org.semanticweb.owlapi.model.OWLClassExpression -import org.semanticweb.owlapi.model.OWLDataPropertyExpression -import org.semanticweb.owlapi.model.OWLDisjointClassesAxiom -import org.semanticweb.owlapi.model.OWLDisjointUnionAxiom -import org.semanticweb.owlapi.model.OWLEquivalentClassesAxiom -import org.semanticweb.owlapi.model.OWLHasKeyAxiom -import org.semanticweb.owlapi.model.OWLNaryClassAxiom -import org.semanticweb.owlapi.model.OWLObjectPropertyExpression -import org.semanticweb.owlapi.model.OWLPropertyExpression -import org.semanticweb.owlapi.model.OWLSubClassOfAxiom import org.semanticweb.owlapi.apibinding.OWLManager +import org.semanticweb.owlapi.model._ + +import scala.jdk.CollectionConverters._ trait ClassAxioms { diff --git a/src/main/scala/org/phenoscape/scowl/ofn/DataExpressions.scala b/src/main/scala/org/phenoscape/scowl/ofn/DataExpressions.scala index 1453f90..8eaaa85 100644 --- a/src/main/scala/org/phenoscape/scowl/ofn/DataExpressions.scala +++ b/src/main/scala/org/phenoscape/scowl/ofn/DataExpressions.scala @@ -1,22 +1,11 @@ package org.phenoscape.scowl.ofn -import scala.collection.JavaConverters._ -import org.semanticweb.owlapi.model.OWLDataOneOf -import org.semanticweb.owlapi.model.OWLDatatype -import org.semanticweb.owlapi.model.OWLLiteral -import org.semanticweb.owlapi.model.OWLDataRange -import org.semanticweb.owlapi.model.OWLAnnotation -import org.semanticweb.owlapi.model.OWLDatatypeDefinitionAxiom -import org.semanticweb.owlapi.model.OWLFacetRestriction -import org.semanticweb.owlapi.model.OWLDatatypeRestriction -import org.semanticweb.owlapi.vocab.OWLFacet -import org.semanticweb.owlapi.model.OWLDataIntersectionOf -import org.semanticweb.owlapi.model.OWLDataComplementOf -import org.semanticweb.owlapi.model.OWLDataSomeValuesFrom -import org.semanticweb.owlapi.model.OWLDataPropertyExpression -import org.semanticweb.owlapi.model.OWLDataAllValuesFrom import org.phenoscape.scowl.converters.Literalable import org.semanticweb.owlapi.apibinding.OWLManager +import org.semanticweb.owlapi.model._ +import org.semanticweb.owlapi.vocab.OWLFacet + +import scala.jdk.CollectionConverters._ trait DataExpressions { diff --git a/src/main/scala/org/phenoscape/scowl/ofn/Entities.scala b/src/main/scala/org/phenoscape/scowl/ofn/Entities.scala index c4019e4..b9b00ab 100644 --- a/src/main/scala/org/phenoscape/scowl/ofn/Entities.scala +++ b/src/main/scala/org/phenoscape/scowl/ofn/Entities.scala @@ -1,18 +1,9 @@ package org.phenoscape.scowl.ofn import org.semanticweb.owlapi.apibinding.OWLManager -import org.semanticweb.owlapi.model.OWLNamedObject -import org.semanticweb.owlapi.model.OWLAnonymousIndividual -import org.semanticweb.owlapi.model.OWLAnnotationProperty -import org.semanticweb.owlapi.model.IRI -import org.semanticweb.owlapi.model.OWLDataProperty -import org.semanticweb.owlapi.model.OWLNamedIndividual -import org.semanticweb.owlapi.model.OWLObjectProperty -import org.semanticweb.owlapi.model.OWLOntology -import org.semanticweb.owlapi.model.OWLClass -import org.semanticweb.owlapi.model.OWLAxiom -import scala.collection.JavaConverters._ -import org.semanticweb.owlapi.model.OWLDatatype +import org.semanticweb.owlapi.model._ + +import scala.jdk.CollectionConverters._ trait Entities { diff --git a/src/main/scala/org/phenoscape/scowl/ofn/IndividualAxioms.scala b/src/main/scala/org/phenoscape/scowl/ofn/IndividualAxioms.scala index d746bc9..4f7fd9b 100644 --- a/src/main/scala/org/phenoscape/scowl/ofn/IndividualAxioms.scala +++ b/src/main/scala/org/phenoscape/scowl/ofn/IndividualAxioms.scala @@ -1,23 +1,10 @@ package org.phenoscape.scowl.ofn -import scala.collection.JavaConverters._ import org.phenoscape.scowl.converters.Literalable -import org.semanticweb.owlapi.model.OWLAnnotation -import org.semanticweb.owlapi.model.OWLClassAssertionAxiom -import org.semanticweb.owlapi.model.OWLClassExpression -import org.semanticweb.owlapi.model.OWLDataPropertyAssertionAxiom -import org.semanticweb.owlapi.model.OWLDataPropertyExpression -import org.semanticweb.owlapi.model.OWLDifferentIndividualsAxiom -import org.semanticweb.owlapi.model.OWLIndividual -import org.semanticweb.owlapi.model.OWLLiteral -import org.semanticweb.owlapi.model.OWLNaryIndividualAxiom -import org.semanticweb.owlapi.model.OWLNegativeDataPropertyAssertionAxiom -import org.semanticweb.owlapi.model.OWLNegativeObjectPropertyAssertionAxiom -import org.semanticweb.owlapi.model.OWLObjectPropertyAssertionAxiom -import org.semanticweb.owlapi.model.OWLObjectPropertyExpression -import org.semanticweb.owlapi.model.OWLPropertyAssertionAxiom -import org.semanticweb.owlapi.model.OWLSameIndividualAxiom import org.semanticweb.owlapi.apibinding.OWLManager +import org.semanticweb.owlapi.model._ + +import scala.jdk.CollectionConverters._ trait IndividualAxioms { diff --git a/src/main/scala/org/phenoscape/scowl/ofn/ObjectExpressions.scala b/src/main/scala/org/phenoscape/scowl/ofn/ObjectExpressions.scala index 516a3ed..98f9980 100644 --- a/src/main/scala/org/phenoscape/scowl/ofn/ObjectExpressions.scala +++ b/src/main/scala/org/phenoscape/scowl/ofn/ObjectExpressions.scala @@ -1,23 +1,10 @@ package org.phenoscape.scowl.ofn -import scala.collection.JavaConverters._ import org.phenoscape.scowl.Vocab -import org.semanticweb.owlapi.model.OWLClassExpression -import org.semanticweb.owlapi.model.OWLIndividual -import org.semanticweb.owlapi.model.OWLObjectAllValuesFrom -import org.semanticweb.owlapi.model.OWLObjectComplementOf -import org.semanticweb.owlapi.model.OWLObjectExactCardinality -import org.semanticweb.owlapi.model.OWLObjectHasSelf -import org.semanticweb.owlapi.model.OWLObjectHasValue -import org.semanticweb.owlapi.model.OWLObjectIntersectionOf -import org.semanticweb.owlapi.model.OWLObjectMaxCardinality -import org.semanticweb.owlapi.model.OWLObjectMinCardinality -import org.semanticweb.owlapi.model.OWLObjectOneOf -import org.semanticweb.owlapi.model.OWLObjectPropertyExpression -import org.semanticweb.owlapi.model.OWLObjectSomeValuesFrom -import org.semanticweb.owlapi.model.OWLObjectUnionOf -import org.semanticweb.owlapi.model.OWLObjectInverseOf import org.semanticweb.owlapi.apibinding.OWLManager +import org.semanticweb.owlapi.model._ + +import scala.jdk.CollectionConverters._ trait ObjectExpressions extends Vocab { diff --git a/src/main/scala/org/phenoscape/scowl/ofn/PropertyAxioms.scala b/src/main/scala/org/phenoscape/scowl/ofn/PropertyAxioms.scala index d173093..f29deba 100644 --- a/src/main/scala/org/phenoscape/scowl/ofn/PropertyAxioms.scala +++ b/src/main/scala/org/phenoscape/scowl/ofn/PropertyAxioms.scala @@ -1,35 +1,9 @@ package org.phenoscape.scowl.ofn -import scala.collection.JavaConverters._ - import org.semanticweb.owlapi.apibinding.OWLManager -import org.semanticweb.owlapi.model.OWLAnnotation -import org.semanticweb.owlapi.model.OWLAsymmetricObjectPropertyAxiom -import org.semanticweb.owlapi.model.OWLClassExpression -import org.semanticweb.owlapi.model.OWLDataPropertyDomainAxiom -import org.semanticweb.owlapi.model.OWLDataPropertyExpression -import org.semanticweb.owlapi.model.OWLDataPropertyRangeAxiom -import org.semanticweb.owlapi.model.OWLDataRange -import org.semanticweb.owlapi.model.OWLDisjointDataPropertiesAxiom -import org.semanticweb.owlapi.model.OWLDisjointObjectPropertiesAxiom -import org.semanticweb.owlapi.model.OWLEquivalentDataPropertiesAxiom -import org.semanticweb.owlapi.model.OWLEquivalentObjectPropertiesAxiom -import org.semanticweb.owlapi.model.OWLFunctionalDataPropertyAxiom -import org.semanticweb.owlapi.model.OWLFunctionalObjectPropertyAxiom -import org.semanticweb.owlapi.model.OWLInverseFunctionalObjectPropertyAxiom -import org.semanticweb.owlapi.model.OWLInverseObjectPropertiesAxiom -import org.semanticweb.owlapi.model.OWLIrreflexiveObjectPropertyAxiom -import org.semanticweb.owlapi.model.OWLObjectPropertyDomainAxiom -import org.semanticweb.owlapi.model.OWLObjectPropertyExpression -import org.semanticweb.owlapi.model.OWLObjectPropertyRangeAxiom -import org.semanticweb.owlapi.model.OWLPropertyExpression -import org.semanticweb.owlapi.model.OWLReflexiveObjectPropertyAxiom -import org.semanticweb.owlapi.model.OWLSubDataPropertyOfAxiom -import org.semanticweb.owlapi.model.OWLSubObjectPropertyOfAxiom -import org.semanticweb.owlapi.model.OWLSubPropertyChainOfAxiom -import org.semanticweb.owlapi.model.OWLSymmetricObjectPropertyAxiom -import org.semanticweb.owlapi.model.OWLTransitiveObjectPropertyAxiom -import org.semanticweb.owlapi.model.OWLUnaryPropertyAxiom +import org.semanticweb.owlapi.model._ + +import scala.jdk.CollectionConverters._ trait PropertyAxioms { diff --git a/src/main/scala/org/phenoscape/scowl/ofn/SWRL.scala b/src/main/scala/org/phenoscape/scowl/ofn/SWRL.scala index 075335a..2b4879b 100644 --- a/src/main/scala/org/phenoscape/scowl/ofn/SWRL.scala +++ b/src/main/scala/org/phenoscape/scowl/ofn/SWRL.scala @@ -1,30 +1,10 @@ package org.phenoscape.scowl.ofn -import scala.collection.JavaConverters._ -import org.phenoscape.scowl.converters.SWRLArgs -import org.phenoscape.scowl.converters.SWRLDArgish -import org.phenoscape.scowl.converters.SWRLIArgish +import org.phenoscape.scowl.converters.{SWRLArgs, SWRLDArgish, SWRLIArgish} import org.semanticweb.owlapi.apibinding.OWLManager -import org.semanticweb.owlapi.model.IRI -import org.semanticweb.owlapi.model.OWLAnnotation -import org.semanticweb.owlapi.model.OWLClassExpression -import org.semanticweb.owlapi.model.OWLDataRange -import org.semanticweb.owlapi.model.OWLObjectPropertyExpression -import org.semanticweb.owlapi.model.SWRLAtom -import org.semanticweb.owlapi.model.SWRLClassAtom -import org.semanticweb.owlapi.model.SWRLDArgument -import org.semanticweb.owlapi.model.SWRLDataRangeAtom -import org.semanticweb.owlapi.model.SWRLIArgument -import org.semanticweb.owlapi.model.SWRLObjectPropertyAtom -import org.semanticweb.owlapi.model.SWRLRule -import org.semanticweb.owlapi.model.SWRLVariable -import org.semanticweb.owlapi.model.OWLDataPropertyExpression -import org.semanticweb.owlapi.model.SWRLDataPropertyAtom -import org.phenoscape.scowl.converters.SWRLDArgish -import org.semanticweb.owlapi.model.SWRLBuiltInAtom -import org.phenoscape.scowl.converters.SWRLIArgish -import org.semanticweb.owlapi.model.SWRLSameIndividualAtom -import org.semanticweb.owlapi.model.SWRLDifferentIndividualsAtom +import org.semanticweb.owlapi.model._ + +import scala.jdk.CollectionConverters._ trait SWRL { diff --git a/src/main/scala/org/phenoscape/scowl/omn/ClassExpressions.scala b/src/main/scala/org/phenoscape/scowl/omn/ClassExpressions.scala index 0ae54d1..d4e9226 100644 --- a/src/main/scala/org/phenoscape/scowl/omn/ClassExpressions.scala +++ b/src/main/scala/org/phenoscape/scowl/omn/ClassExpressions.scala @@ -1,20 +1,10 @@ package org.phenoscape.scowl.omn -import scala.collection.JavaConverters._ import org.phenoscape.scowl.converters.Literalable -import org.semanticweb.owlapi.model.OWLClassExpression -import org.semanticweb.owlapi.model.OWLDataComplementOf -import org.semanticweb.owlapi.model.OWLDataOneOf -import org.semanticweb.owlapi.model.OWLDataPropertyExpression -import org.semanticweb.owlapi.model.OWLDataRange -import org.semanticweb.owlapi.model.OWLIndividual -import org.semanticweb.owlapi.model.OWLLiteral -import org.semanticweb.owlapi.model.OWLNamedIndividual -import org.semanticweb.owlapi.model.OWLObjectComplementOf -import org.semanticweb.owlapi.model.OWLObjectInverseOf -import org.semanticweb.owlapi.model.OWLObjectOneOf -import org.semanticweb.owlapi.model.OWLObjectPropertyExpression import org.semanticweb.owlapi.apibinding.OWLManager +import org.semanticweb.owlapi.model._ + +import scala.jdk.CollectionConverters._ trait ClassExpressions { diff --git a/src/main/scala/org/phenoscape/scowl/omn/Facets.scala b/src/main/scala/org/phenoscape/scowl/omn/Facets.scala index d5e4484..274cfaa 100644 --- a/src/main/scala/org/phenoscape/scowl/omn/Facets.scala +++ b/src/main/scala/org/phenoscape/scowl/omn/Facets.scala @@ -1,8 +1,8 @@ package org.phenoscape.scowl.omn import org.phenoscape.scowl.converters.Literalable -import org.semanticweb.owlapi.vocab.OWLFacet import org.semanticweb.owlapi.apibinding.OWLManager +import org.semanticweb.owlapi.vocab.OWLFacet trait Facets { diff --git a/src/main/scala/org/phenoscape/scowl/omn/PropertyCharacteristics.scala b/src/main/scala/org/phenoscape/scowl/omn/PropertyCharacteristics.scala index b25394f..82d7b44 100644 --- a/src/main/scala/org/phenoscape/scowl/omn/PropertyCharacteristics.scala +++ b/src/main/scala/org/phenoscape/scowl/omn/PropertyCharacteristics.scala @@ -1,23 +1,7 @@ package org.phenoscape.scowl.omn -import org.semanticweb.owlapi.model.OWLAsymmetricObjectPropertyAxiom -import org.semanticweb.owlapi.model.OWLClassExpression -import org.semanticweb.owlapi.model.OWLFunctionalObjectPropertyAxiom -import org.semanticweb.owlapi.model.OWLInverseFunctionalObjectPropertyAxiom -import org.semanticweb.owlapi.model.OWLIrreflexiveObjectPropertyAxiom -import org.semanticweb.owlapi.model.OWLObjectPropertyCharacteristicAxiom -import org.semanticweb.owlapi.model.OWLObjectPropertyExpression -import org.semanticweb.owlapi.model.OWLPropertyAxiom -import org.semanticweb.owlapi.model.OWLPropertyExpression -import org.semanticweb.owlapi.model.OWLPropertyRange -import org.semanticweb.owlapi.model.OWLReflexiveObjectPropertyAxiom -import org.semanticweb.owlapi.model.OWLSymmetricObjectPropertyAxiom -import org.semanticweb.owlapi.model.OWLTransitiveObjectPropertyAxiom -import org.semanticweb.owlapi.model.OWLProperty -import org.semanticweb.owlapi.model.OWLFunctionalDataPropertyAxiom -import org.semanticweb.owlapi.model.OWLDataPropertyCharacteristicAxiom -import org.semanticweb.owlapi.model.OWLDataPropertyExpression import org.semanticweb.owlapi.apibinding.OWLManager +import org.semanticweb.owlapi.model._ sealed trait PropertyCharacteristic[T <: OWLObjectPropertyCharacteristicAxiom, U <: OWLDataPropertyCharacteristicAxiom] { diff --git a/src/main/scala/org/phenoscape/scowl/omn/SWRLAtoms.scala b/src/main/scala/org/phenoscape/scowl/omn/SWRLAtoms.scala index f2819fb..2c57ddc 100644 --- a/src/main/scala/org/phenoscape/scowl/omn/SWRLAtoms.scala +++ b/src/main/scala/org/phenoscape/scowl/omn/SWRLAtoms.scala @@ -1,15 +1,11 @@ package org.phenoscape.scowl.omn -import scala.collection.JavaConverters._ -import org.phenoscape.scowl.converters.SWRLDArgish -import org.phenoscape.scowl.converters.SWRLIArgish +import org.phenoscape.scowl.converters.{SWRLDArgish, SWRLIArgish} import org.semanticweb.owlapi.apibinding.OWLManager -import org.semanticweb.owlapi.model.IRI -import org.semanticweb.owlapi.model.SWRLBuiltInAtom -import org.semanticweb.owlapi.model.SWRLDifferentIndividualsAtom -import org.semanticweb.owlapi.model.SWRLSameIndividualAtom -import org.semanticweb.owlapi.vocab.SWRLVocabulary -import org.semanticweb.owlapi.vocab.SWRLBuiltInsVocabulary +import org.semanticweb.owlapi.model.{IRI, SWRLBuiltInAtom, SWRLDifferentIndividualsAtom, SWRLSameIndividualAtom} +import org.semanticweb.owlapi.vocab.{SWRLBuiltInsVocabulary, SWRLVocabulary} + +import scala.jdk.CollectionConverters._ trait SWRLAtoms { diff --git a/src/main/scala/org/phenoscape/scowl/omn/ScowlNegativeDataPropertyValue.scala b/src/main/scala/org/phenoscape/scowl/omn/ScowlNegativeDataPropertyValue.scala index 54dd350..7ebcef3 100644 --- a/src/main/scala/org/phenoscape/scowl/omn/ScowlNegativeDataPropertyValue.scala +++ b/src/main/scala/org/phenoscape/scowl/omn/ScowlNegativeDataPropertyValue.scala @@ -1,9 +1,7 @@ package org.phenoscape.scowl.omn import org.phenoscape.scowl.converters.Literalable - -import org.semanticweb.owlapi.model.OWLDataPropertyExpression -import org.semanticweb.owlapi.model.OWLLiteral +import org.semanticweb.owlapi.model.{OWLDataPropertyExpression, OWLLiteral} case class ScowlNegativeDataPropertyValue[T: Literalable](property: OWLDataPropertyExpression, value: T) { diff --git a/src/main/scala/org/phenoscape/scowl/omn/ScowlNegativeObjectPropertyValue.scala b/src/main/scala/org/phenoscape/scowl/omn/ScowlNegativeObjectPropertyValue.scala index 8e8692e..ad16f42 100644 --- a/src/main/scala/org/phenoscape/scowl/omn/ScowlNegativeObjectPropertyValue.scala +++ b/src/main/scala/org/phenoscape/scowl/omn/ScowlNegativeObjectPropertyValue.scala @@ -1,6 +1,5 @@ package org.phenoscape.scowl.omn -import org.semanticweb.owlapi.model.OWLObjectPropertyExpression -import org.semanticweb.owlapi.model.OWLIndividual +import org.semanticweb.owlapi.model.{OWLIndividual, OWLObjectPropertyExpression} case class ScowlNegativeObjectPropertyValue(property: OWLObjectPropertyExpression, value: OWLIndividual) \ No newline at end of file diff --git a/src/main/scala/org/phenoscape/scowl/omn/ScowlSWRLConjunction.scala b/src/main/scala/org/phenoscape/scowl/omn/ScowlSWRLConjunction.scala index c1434ba..c9f27c8 100644 --- a/src/main/scala/org/phenoscape/scowl/omn/ScowlSWRLConjunction.scala +++ b/src/main/scala/org/phenoscape/scowl/omn/ScowlSWRLConjunction.scala @@ -1,9 +1,9 @@ package org.phenoscape.scowl.omn -import org.semanticweb.owlapi.model.SWRLAtom -import org.semanticweb.owlapi.model.SWRLRule import org.semanticweb.owlapi.apibinding.OWLManager -import scala.collection.JavaConverters._ +import org.semanticweb.owlapi.model.{SWRLAtom, SWRLRule} + +import scala.jdk.CollectionConverters._ case class ScowlSWRLConjunction(atoms: Set[SWRLAtom]) { diff --git a/src/main/scala/org/phenoscape/scowl/package.scala b/src/main/scala/org/phenoscape/scowl/package.scala index f1e6bda..0c9fd5c 100644 --- a/src/main/scala/org/phenoscape/scowl/package.scala +++ b/src/main/scala/org/phenoscape/scowl/package.scala @@ -1,17 +1,11 @@ package org.phenoscape -import scala.collection.JavaConverters._ -import org.phenoscape.scowl.converters.AnnotationValuer -import org.phenoscape.scowl.converters.Literalable -import org.phenoscape.scowl.converters.SWRLDArgish -import org.phenoscape.scowl.converters.SWRLIArgish -import org.phenoscape.scowl.omn.PropertyCharacteristic -import org.phenoscape.scowl.omn.ScowlNegativeDataPropertyValue -import org.phenoscape.scowl.omn.ScowlNegativeObjectPropertyValue -import org.phenoscape.scowl.omn.ScowlPropertyChain -import org.phenoscape.scowl.omn.ScowlSWRLConjunction +import org.phenoscape.scowl.converters.{AnnotationValuer, Literalable, SWRLDArgish, SWRLIArgish} +import org.phenoscape.scowl.omn._ import org.semanticweb.owlapi.apibinding.OWLManager -import org.semanticweb.owlapi.model.{IRI, OWLAnnotation, OWLAnnotationAssertionAxiom, OWLAnnotationProperty, OWLAnnotationSubject, OWLAnnotationValue, OWLAxiom, OWLClassAssertionAxiom, OWLClassExpression, OWLDataAllValuesFrom, OWLDataExactCardinality, OWLDataHasValue, OWLDataIntersectionOf, OWLDataMaxCardinality, OWLDataMinCardinality, OWLDataOneOf, OWLDataPropertyAssertionAxiom, OWLDataPropertyCharacteristicAxiom, OWLDataPropertyDomainAxiom, OWLDataPropertyExpression, OWLDataPropertyRangeAxiom, OWLDataRange, OWLDataSomeValuesFrom, OWLDataUnionOf, OWLDatatype, OWLDatatypeDefinitionAxiom, OWLDatatypeRestriction, OWLDifferentIndividualsAxiom, OWLDisjointClassesAxiom, OWLDisjointDataPropertiesAxiom, OWLDisjointObjectPropertiesAxiom, OWLEquivalentClassesAxiom, OWLEquivalentDataPropertiesAxiom, OWLEquivalentObjectPropertiesAxiom, OWLFacetRestriction, OWLHasKeyAxiom, OWLIndividual, OWLInverseObjectPropertiesAxiom, OWLLiteral, OWLNamedObject, OWLNegativeDataPropertyAssertionAxiom, OWLNegativeObjectPropertyAssertionAxiom, OWLObjectAllValuesFrom, OWLObjectExactCardinality, OWLObjectHasSelf, OWLObjectHasValue, OWLObjectIntersectionOf, OWLObjectMaxCardinality, OWLObjectMinCardinality, OWLObjectOneOf, OWLObjectPropertyAssertionAxiom, OWLObjectPropertyCharacteristicAxiom, OWLObjectPropertyDomainAxiom, OWLObjectPropertyExpression, OWLObjectPropertyRangeAxiom, OWLObjectSomeValuesFrom, OWLObjectUnionOf, OWLPropertyExpression, OWLSameIndividualAxiom, OWLSubClassOfAxiom, OWLSubDataPropertyOfAxiom, OWLSubObjectPropertyOfAxiom, OWLSubPropertyChainOfAxiom, SWRLAtom, SWRLClassAtom, SWRLDataPropertyAtom, SWRLDataRangeAtom, SWRLObjectPropertyAtom, SWRLRule, SWRLVariable} +import org.semanticweb.owlapi.model._ + +import scala.jdk.CollectionConverters._ package object scowl extends Vocab with ofn.Entities diff --git a/src/test/scala/org/phenoscape/scowl/example/AnatomyOntology.scala b/src/test/scala/org/phenoscape/scowl/example/AnatomyOntology.scala index 67b8579..1682602 100644 --- a/src/test/scala/org/phenoscape/scowl/example/AnatomyOntology.scala +++ b/src/test/scala/org/phenoscape/scowl/example/AnatomyOntology.scala @@ -3,6 +3,7 @@ package org.phenoscape.scowl.example import org.phenoscape.scowl._ import org.semanticweb.owlapi.apibinding.OWLManager import org.semanticweb.owlapi.model.IRI + import java.io.File object AnatomyOntology extends App { diff --git a/src/test/scala/org/phenoscape/scowl/example/DataChecks.scala b/src/test/scala/org/phenoscape/scowl/example/DataChecks.scala index 69c3bd9..dda91fd 100644 --- a/src/test/scala/org/phenoscape/scowl/example/DataChecks.scala +++ b/src/test/scala/org/phenoscape/scowl/example/DataChecks.scala @@ -1,17 +1,15 @@ package org.phenoscape.scowl.example -import scalaz._ -import Scalaz._ -import org.semanticweb.owlapi.model.OWLOntology -import org.phenoscape.scowl._ -import org.phenoscape.scowl.^^ -import scala.collection.JavaConverters._ -import org.semanticweb.owlapi.model.AxiomType -import org.semanticweb.owlapi.model.parameters.Imports -import org.semanticweb.owlapi.apibinding.OWLManager -import org.semanticweb.owlapi.model.IRI +import org.phenoscape.scowl.{^^, _} import org.phenoscape.scowltest.UnitSpec import org.scalatest._ +import org.semanticweb.owlapi.apibinding.OWLManager +import org.semanticweb.owlapi.model.{AxiomType, IRI, OWLOntology} +import org.semanticweb.owlapi.model.parameters.Imports +import scalaz._ +import Scalaz._ + +import scala.jdk.CollectionConverters._ class DataChecks extends UnitSpec { // All tests are ignored so that the scowl build passes (this is an example ontology test). diff --git a/src/test/scala/org/phenoscape/scowltest/ScowlTest.scala b/src/test/scala/org/phenoscape/scowltest/ScowlTest.scala index 9194c9e..3591abe 100644 --- a/src/test/scala/org/phenoscape/scowltest/ScowlTest.scala +++ b/src/test/scala/org/phenoscape/scowltest/ScowlTest.scala @@ -1,18 +1,14 @@ package org.phenoscape.scowltest -import scala.collection.JavaConverters._ -import scala.language.postfixOps - import org.phenoscape.scowl._ import org.scalatest._ import org.semanticweb.owlapi.apibinding.OWLManager -import org.semanticweb.owlapi.model.IRI -import org.semanticweb.owlapi.model.OWLAxiom -import org.semanticweb.owlapi.vocab.OWLFacet -import org.semanticweb.owlapi.vocab.SWRLBuiltInsVocabulary -import org.semanticweb.owlapi.vocab.XSDVocabulary +import org.semanticweb.owlapi.model.{IRI, OWLAxiom, SWRLDArgument} import org.semanticweb.owlapi.search.EntitySearcher -import org.semanticweb.owlapi.model.SWRLDArgument +import org.semanticweb.owlapi.vocab.{OWLFacet, SWRLBuiltInsVocabulary, XSDVocabulary} + +import scala.jdk.CollectionConverters._ +import scala.language.postfixOps class ScowlTest extends UnitSpec {