|
@@ -77,11 +77,12 @@ Element function allOutgoingAssociationInstances(model : Element, source_name :
|
|
|
i = 0
|
|
|
while (i < all_out):
|
|
|
option = reverseKeyLookup(model["model"], read_out(source, i))
|
|
|
- if (assoc_name != ""):
|
|
|
- if (is_nominal_instance(model, option, assoc_name)):
|
|
|
+ if (option != ""):
|
|
|
+ if (assoc_name != ""):
|
|
|
+ if (is_nominal_instance(model, option, assoc_name)):
|
|
|
+ set_add(result, option)
|
|
|
+ else:
|
|
|
set_add(result, option)
|
|
|
- else:
|
|
|
- set_add(result, option)
|
|
|
i = i + 1
|
|
|
|
|
|
return result!
|
|
@@ -100,11 +101,12 @@ Element function allIncomingAssociationInstances(model : Element, target_name :
|
|
|
i = 0
|
|
|
while (i < all_out):
|
|
|
option = reverseKeyLookup(model["model"], read_in(source, i))
|
|
|
- if (assoc_name != ""):
|
|
|
- if (is_nominal_instance(model, option, assoc_name)):
|
|
|
+ if (option != ""):
|
|
|
+ if (assoc_name != ""):
|
|
|
+ if (is_nominal_instance(model, option, assoc_name)):
|
|
|
+ set_add(result, option)
|
|
|
+ else:
|
|
|
set_add(result, option)
|
|
|
- else:
|
|
|
- set_add(result, option)
|
|
|
i = i + 1
|
|
|
|
|
|
return result!
|