Commit f7d99781 authored by Philip Makedonski's avatar Philip Makedonski
Browse files

* prune members from supertypes

parent 34fa0973

plugins/org.etsi.mts.tdl.common/src/org/etsi/mts/tdl/transform/AbstractTranslator.java

+6 −1
Original line number Original line Diff line number Diff line
@@ -134,8 +134,13 @@ public abstract class AbstractTranslator { 
		e.setExtending(superType);

		e.setExtending(superType);

		if (type instanceof SimpleDataType)

		if (type instanceof SimpleDataType)

			((SimpleDataType) type).setExtension(e);

			((SimpleDataType) type).setExtension(e);

		if (type instanceof StructuredDataType)

		if (type instanceof StructuredDataType) {

			((StructuredDataType) type).getExtension().add(e);

			((StructuredDataType) type).getExtension().add(e);

			//prune members from supertype to avoid duplicates

			((StructuredDataType) type).getMember()

				.removeIf(m -> ((StructuredDataType)superType).allMembers().stream()

						.anyMatch(sm -> sm.getName().equals(m.getName())));

		}

	}

	}