Closes #75

protegeproject · Sep 24, 2014 · ed27bb9 · ed27bb9
1 parent 15aa674
commit ed27bb9
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 21 deletions.
diff --git a/.../main/java/org/protege/editor/owl/ui/frame/cls/InheritedAnonymousClassesFrameSection.java b/.../main/java/org/protege/editor/owl/ui/frame/cls/InheritedAnonymousClassesFrameSection.java
@@ -17,6 +17,7 @@
 import org.semanticweb.owlapi.model.OWLOntology;
 import org.semanticweb.owlapi.model.OWLOntologyChange;
 import org.semanticweb.owlapi.model.OWLSubClassOfAxiom;
+import org.semanticweb.owlapi.reasoner.OWLReasoner;
 
 
 /**
@@ -74,7 +75,11 @@ public void run() {
     }
 
     private void refillInferredDoIt() {
-        if (!getOWLModelManager().getReasoner().isConsistent()) {
+        OWLReasoner reasoner = getOWLModelManager().getReasoner();
+        if (!reasoner.isConsistent()) {
+            return;
+        }
+        if(!reasoner.isSatisfiable(getRootObject())) {
             return;
         }
         Set<OWLClass> clses = getReasoner().getSuperClasses(getRootObject(), true).getFlattened();

diff --git a/.../main/java/org/protege/editor/owl/ui/frame/cls/OWLEquivalentClassesAxiomFrameSection.java b/.../main/java/org/protege/editor/owl/ui/frame/cls/OWLEquivalentClassesAxiomFrameSection.java
@@ -20,6 +20,7 @@
 import org.semanticweb.owlapi.model.OWLObject;
 import org.semanticweb.owlapi.model.OWLOntology;
 import org.semanticweb.owlapi.model.OWLOntologyChange;
+import org.semanticweb.owlapi.reasoner.OWLReasoner;
 import org.semanticweb.owlapi.util.CollectionFactory;
 
 
@@ -85,20 +86,23 @@ protected void refillInferred() {
                                                                   new Runnable() {
 
             public void run() {
-            	if (!getOWLModelManager().getReasoner().isConsistent()) {
+                final OWLReasoner reasoner = getOWLModelManager().getReasoner();
+                if (!reasoner.isConsistent()) {
             		return;
             	}
-            	OWLClass nothing = getOWLModelManager().getOWLDataFactory().getOWLNothing();
-                if (!getOWLModelManager().getReasoner().isSatisfiable(getRootObject()) && !nothing.equals(getRootObject())) {
-                    addRow(new OWLEquivalentClassesAxiomFrameSectionRow(getOWLEditorKit(),
-                                                                        OWLEquivalentClassesAxiomFrameSection.this,
-                                                                        null,
-                                                                        getRootObject(),
-                                                                        getOWLDataFactory().getOWLEquivalentClassesAxiom(CollectionFactory.createSet(getRootObject(),
-                                                                                                                                                     nothing))));
+                if (!reasoner.isSatisfiable(getRootObject())) {
+                    if (!getRootObject().isOWLNothing()) {
+                        OWLClass nothing = getOWLModelManager().getOWLDataFactory().getOWLNothing();
+                        addRow(new OWLEquivalentClassesAxiomFrameSectionRow(getOWLEditorKit(),
+                                                                            OWLEquivalentClassesAxiomFrameSection.this,
+                                                                            null,
+                                                                            getRootObject(),
+                                                                            getOWLDataFactory().getOWLEquivalentClassesAxiom(CollectionFactory.createSet(getRootObject(),
+                                                                                                                                                         nothing))));
+                    }
                 }
                 else{
-                    for (OWLClassExpression cls : getOWLModelManager().getReasoner().getEquivalentClasses(getRootObject())) {
+                    for (OWLClassExpression cls : reasoner.getEquivalentClasses(getRootObject())) {
                         if (!added.contains(cls) && !cls.equals(getRootObject())) {
                             addRow(new OWLEquivalentClassesAxiomFrameSectionRow(getOWLEditorKit(),
                                                                                 OWLEquivalentClassesAxiomFrameSection.this,

diff --git a/...r.owl/src/main/java/org/protege/editor/owl/ui/frame/cls/OWLSubClassAxiomFrameSection.java b/...r.owl/src/main/java/org/protege/editor/owl/ui/frame/cls/OWLSubClassAxiomFrameSection.java
@@ -22,6 +22,7 @@
 import org.semanticweb.owlapi.model.OWLOntologyChange;
 import org.semanticweb.owlapi.model.OWLSubClassOfAxiom;
 import org.semanticweb.owlapi.reasoner.Node;
+import org.semanticweb.owlapi.reasoner.OWLReasoner;
 
 
 /**
@@ -70,25 +71,31 @@ protected Set<OWLSubClassOfAxiom> getClassAxioms(OWLClassExpression descr, OWLOn
 
 
     protected void refillInferred() {
-        getOWLModelManager().getReasonerPreferences().executeTask(OptionalInferenceTask.SHOW_INFERRED_SUPER_CLASSES, new Runnable() {
+        final OWLReasoner reasoner = getOWLModelManager().getReasoner();
+        if(!reasoner.isConsistent()) {
+            return;
+        }
+        if(!reasoner.isSatisfiable(getRootObject())) {
+            return;
+        }
+            getOWLModelManager().getReasonerPreferences().executeTask(OptionalInferenceTask.SHOW_INFERRED_SUPER_CLASSES, new Runnable() {
                 public void run() {
-                    if (getOWLModelManager().getReasoner().isConsistent()) {
-                        for (Node<OWLClass> inferredSuperClasses : getOWLModelManager().getReasoner().getSuperClasses(getRootObject(), true)) {
+                        for (Node<OWLClass> inferredSuperClasses : reasoner.getSuperClasses(getRootObject(), true)) {
                             for (OWLClassExpression inferredSuperClass : inferredSuperClasses) {
                                 if (!added.contains(inferredSuperClass)) {
                                     addInferredRowIfNontrivial(new OWLSubClassAxiomFrameSectionRow(getOWLEditorKit(),
-                                                                               OWLSubClassAxiomFrameSection.this,
-                                                                               null,
-                                                                               getRootObject(),
-                                                                               getOWLModelManager().getOWLDataFactory().getOWLSubClassOfAxiom(getRootObject(),
-                                                                                                                                              inferredSuperClass)));
+                                                                                                   OWLSubClassAxiomFrameSection.this,
+                                                                                                   null,
+                                                                                                   getRootObject(),
+                                                                                                   getOWLModelManager().getOWLDataFactory().getOWLSubClassOfAxiom(getRootObject(),
+                                                                                                                                                                  inferredSuperClass)));
                                     added.add(inferredSuperClass);
                                 }
                             }
                         }
-                    }
                 }
             });
+
     }
 
 
@@ -98,7 +105,7 @@ protected OWLSubClassOfAxiom createAxiom(OWLClassExpression object) {
 
 
     public OWLObjectEditor<OWLClassExpression> getObjectEditor() {
-        return getOWLEditorKit().getWorkspace().getOWLComponentFactory().getOWLClassDescriptionEditor(null, AxiomType.SUBCLASS_OF);        
+        return getOWLEditorKit().getWorkspace().getOWLComponentFactory().getOWLClassDescriptionEditor(null, AxiomType.SUBCLASS_OF);
     }