Skip to content

Commit 3f58c9a

Browse files
committed
ST6RI-872 Updated computation of error msg for distinguishibility check.
1 parent bbd480e commit 3f58c9a

1 file changed

Lines changed: 4 additions & 16 deletions

File tree

org.omg.kerml.xtext/src/org/omg/kerml/xtext/validation/KerMLValidator.xtend

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -419,9 +419,7 @@ class KerMLValidator extends AbstractKerMLValidator {
419419
for (mem: ownedMemberships) {
420420
checkDistinguishibility(namesp, mem, inheritedMembershipMap, INVALID_NAMESPACE_DISTINGUISHABILITY_MSG_2)
421421
}
422-
for (mem: inheritedMemberships) {
423-
checkDistinguishibility(namesp, inheritedMembershipMap, INVALID_NAMESPACE_DISTINGUISHABILITY_MSG_2)
424-
}
422+
checkDistinguishibility(namesp, inheritedMembershipMap, INVALID_NAMESPACE_DISTINGUISHABILITY_MSG_2)
425423
}
426424
}
427425
}
@@ -488,19 +486,9 @@ class KerMLValidator extends AbstractKerMLValidator {
488486
}
489487

490488
def identifyDuplicates(String msg, Namespace memNs, String name, Iterable<Membership> dups) {
491-
var nsNames = ""
492-
for (dup: dups) {
493-
val ns = dup.membershipOwningNamespace
494-
if (ns !== memNs) {
495-
val nsName = ns.name
496-
if (nsName !== null) {
497-
if (!nsNames.empty) {
498-
nsNames += ", "
499-
}
500-
nsNames += nsName
501-
}
502-
}
503-
}
489+
val nsNames = dups.map[membershipOwningNamespace].filter[ns | ns !== memNs].
490+
map[getName].map[n | if (n === null) "" else n].sort.
491+
map[n | ElementUtil.escapeName(n)].join(", ");
504492
if (nsNames.empty) msg
505493
else msg + " '" + ElementUtil.escapeString(name) + "' from " + nsNames;
506494
}

0 commit comments

Comments
 (0)