'and' and 'or' now automatically flatten intersections and unions. Fixes

 #3.

src/main/scala/org/phenoscape/scowl/OWL.scala

@@ -72,17 +72,17 @@ object OWL {
 
   def oneOf(individuals: OWLNamedIndividual*): OWLObjectOneOf = factory.getOWLObjectOneOf(individuals.toSet)
 
-  implicit class ScowlClassExpression(val classExpression: OWLClassExpression) extends AnyVal {
+  implicit class ScowlClassExpression(val self: OWLClassExpression) extends AnyVal {
 
-    def and(other: OWLClassExpression): OWLObjectIntersectionOf = factory.getOWLObjectIntersectionOf(classExpression, other)
+    def and(other: OWLClassExpression): OWLObjectIntersectionOf = factory.getOWLObjectIntersectionOf(self.asConjunctSet + other)
 
-    def or(other: OWLClassExpression): OWLObjectUnionOf = factory.getOWLObjectUnionOf(classExpression, other)
+    def or(other: OWLClassExpression): OWLObjectUnionOf = factory.getOWLObjectUnionOf(self.asDisjunctSet + other)
 
-    def SubClassOf(other: OWLClassExpression): OWLSubClassOfAxiom = factory.getOWLSubClassOfAxiom(classExpression, other)
+    def SubClassOf(other: OWLClassExpression): OWLSubClassOfAxiom = factory.getOWLSubClassOfAxiom(self, other)
 
-    def EquivalentTo(other: OWLClassExpression): OWLEquivalentClassesAxiom = factory.getOWLEquivalentClassesAxiom(classExpression, other)
+    def EquivalentTo(other: OWLClassExpression): OWLEquivalentClassesAxiom = factory.getOWLEquivalentClassesAxiom(self, other)
 
-    def DisjointFrom(other: OWLClassExpression): OWLDisjointClassesAxiom = factory.getOWLDisjointClassesAxiom(classExpression, other)
+    def DisjointFrom(other: OWLClassExpression): OWLDisjointClassesAxiom = factory.getOWLDisjointClassesAxiom(self, other)
 
   }
 

src/test/scala/org/phenoscape/scowltest/ScowlTest.scala

@@ -15,9 +15,13 @@ class ScowlTest {
   def testIntersectionOf(): Unit = {
     val class1 = Class("http://example.org/class1")
     val class2 = Class("http://example.org/class2")
+    val class3 = Class("http://example.org/class3")
     val oneAndTwo = class1 and class2
     val longOneAndTwo = factory.getOWLObjectIntersectionOf(class1, class2)
     Assert.assertEquals(longOneAndTwo, oneAndTwo)
+    val oneAndTwoAndThree = class1 and class2 and class3
+    val longOneAndTwoAndThree = factory.getOWLObjectIntersectionOf(class1, class2, class3)
+    Assert.assertEquals(longOneAndTwoAndThree, oneAndTwoAndThree)
   }
 
   @Test