Error propagation name sometimes disappears when editing in the GE

[lwrage]

Summary

During testing a got into a state where the name of an error propagation reproducibly disappeared when editing a model in the GE with the corresponding AADL file closed. At the time the reference to the feature was a proxy during serialization. The fix for #2483 assumes that the reference is not a proxy, so it failed.

Steps to Reproduce

1. Create package diagram for other
2. Add an abstract type to the package in the diagram editor
3. The name f disappears from the error propagation in other::B

package emv2_test
public

	annex EMV2 {**
		error types
			et: type;
		end types;
	**};

	abstract A
		features
			f: in feature;
	end A;
end emv2_test;

package other
public
	with emv2_test;

	abstract B extends emv2_test::A
		annex emv2 {**
			error propagations
				f: in propagation {emv2_test::et};
			end propagations;
		**};
	end B;

	annex EMV2 {**
		error types
			extends emv2_test with
		end types;
	**};

end other;

Environment

• OSATE Version: 2.9.1 nightly
• Operating System: Ubuntu 20.04

[lwrage]

Unfortunately this is not always reproducible, at least I haven't been able to get OSATE into that state again.

The fix is to get the feature name in getCrossReferenceNameFromScope. Before this method is called proxy resolution occurs.