Merge branch 'AATIM-2662-AWC' into development

SemanticApplicationDesignLanguage · May 31, 2018 · 6e84025 · 6e84025
2 parents 05e5185 + e03945c
commit 6e84025
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 0 deletions.
diff --git a/sadl3/com.ge.research.sadl.parent/com.ge.research.jena/lib/reasoner-api.jar b/sadl3/com.ge.research.sadl.parent/com.ge.research.jena/lib/reasoner-api.jar
diff --git a/sadl3/com.ge.research.sadl.parent/com.ge.research.jena/lib/reasoner-impl.jar b/sadl3/com.ge.research.sadl.parent/com.ge.research.jena/lib/reasoner-impl.jar
diff --git a/....sadl.parent/com.ge.research.sadl/src/com/ge/research/sadl/validation/SADLValidator.xtend b/....sadl.parent/com.ge.research.sadl/src/com/ge/research/sadl/validation/SADLValidator.xtend
@@ -265,6 +265,11 @@ class SADLValidator extends AbstractSADLValidator {
 				t.printStackTrace
 			}
 		}
+		else {
+			if (nm.contains(':')) {
+				error("Invalid declaration of new concept with a QName from another namespace", SADL_RESOURCE__NAME)
+			}
+		}
 	}
 
 	@Check
-Original file line number
+Diff line change
@@ Expand Up / @@ -265,6 +265,11 @@ class SADLValidator extends AbstractSADLValidator { @@
     				t.printStackTrace
     			}
     		}
+    		else {
+    			if (nm.contains(':')) {
+    				error("Invalid declaration of new concept with a QName from another namespace", SADL_RESOURCE__NAME)
+    			}
+    		}
     	}
     	@Check
@@ Expand Down @@