logic for visualizing imported relations

Author: NicolasRouquette

io.opencaesar.rosetta.sirius.viewpoint/src/io/opencaesar/rosetta/sirius/viewpoint/internal/OmlViewpoint.java

@@ -249,10 +249,15 @@ public static Set<SpecializableTerm> getVisualizedTerms(Vocabulary vocabulary) {
 				.map(s -> s.getSpecializedTerm())
 				.collect(Collectors.toSet()));
 		// related terms
-		terms.addAll(vocabulary.getOwnedStatements().stream()
-				.filter(e -> e instanceof RelationEntity)
+		terms.addAll(
+				OmlRead
+				.getAllImportedOntologies(vocabulary, true).stream()
+				.filter(o -> o instanceof Vocabulary)
+				.map(v -> (Vocabulary)v)
+				.flatMap(v -> v.getOwnedStatements().stream())
+				.filter(t -> t instanceof RelationEntity)
 				.map(e -> (RelationEntity)e)
-				.flatMap(r -> Stream.of(r.getSource(), r.getTarget()))
+				.flatMap(r -> Stream.of(r, r.getSource(), r.getTarget()))
 				.collect(Collectors.toSet()));
 		// range restricted entities
 		terms.addAll(vocabulary.getOwnedStatements().stream()
@@ -407,7 +412,7 @@ public static String getLabel(Ontology ontology, DifferentFromPredicate predicat
 	}
 
     public static String getLabel(RelationRangeRestrictionAxiom axiom) {
-    	String q = (axiom.getKind() == RangeRestrictionKind.ALL) ? "∀ " : "∃ ";
+    	String q = (axiom.getKind() == RangeRestrictionKind.ALL) ? "\u2200" : "\u2203";
     	return q + getLabel(axiom.getOntology(), axiom.getRelation());
     }