Correction of missing case in blocking chain.

Galigator · Jun 5, 2018 · 9c5928a · 9c5928a
1 parent 276c9c1
commit 9c5928a
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 3 deletions.
diff --git a/module-core/src/main/java/openllet/core/tableau/blocking/Blocking.java b/module-core/src/main/java/openllet/core/tableau/blocking/Blocking.java
@@ -151,8 +151,9 @@ protected boolean isDirectlyBlockedByDescendant(final BlockingContext cxt)
 
 			if (cxt.moveBlockerDown(child))
 			{
-				if (isDirectlyBlockedByDescendant(cxt))
+				if (isDirectlyBlockedByDescendant(cxt) || cxt._blocker.isRoot())
 					return true;
+
 				cxt.moveBlockerUp();
 			}
 		}

diff --git a/module-jena/.classpath b/module-jena/.classpath
@@ -28,5 +28,16 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
+	<classpathentry kind="src" output="target/classes" path="target/generated-sources/antlr3">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/module-jena/.settings/org.eclipse.wst.common.component b/module-jena/.settings/org.eclipse.wst.common.component
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
     <wb-module deploy-name="com.github.openllet.openllet-jena-2.5.1">
         <wb-resource deploy-path="/" source-path="/src/main/java"/>
+        <wb-resource deploy-path="/" source-path="/target/generated-sources/antlr3"/>
+        <wb-resource deploy-path="/" source-path="/src/main/resources"/>
     </wb-module>
 </project-modules>
diff --git a/module-modularity/.project b/module-modularity/.project
@@ -16,12 +16,12 @@
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<name>org.eclipse.wst.validation.validationbuilder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>org.eclipse.wst.validation.validationbuilder</name>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>