ST6RI-899 Revised delegate for derivation of enumeratedValue.

Implemented an explicit filter on EnumerationUsage instead of using
DerivedEObjectEList.

Author: seidewitz

org.omg.sysml/src/org/omg/sysml/delegate/setting/EnumerationDefinition_enumeratedValue_SettingDelegate.java

@@ -1,6 +1,6 @@
 /*******************************************************************************
  * SysML 2 Pilot Implementation
- * Copyright (c) 2022 Siemens AG
+ * Copyright (c) 2022, 2025 Siemens AG
  *    
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -24,19 +24,23 @@
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.uml2.common.util.DerivedEObjectEList;
 import org.omg.sysml.lang.sysml.EnumerationUsage;
-import org.omg.sysml.lang.sysml.SysMLPackage;
+import org.omg.sysml.util.NonNotifyingEObjectEList;
 
-public class EnumerationDefinition_enumeratedValue_SettingDelegate extends BasicDerivedListSettingDelegate {
+public class EnumerationDefinition_enumeratedValue_SettingDelegate extends Definition_variant_SettingDelegate {
 
 	public EnumerationDefinition_enumeratedValue_SettingDelegate(EStructuralFeature eStructuralFeature) {
 		super(eStructuralFeature);
 	}
 
 	@Override
 	protected EList<?> basicGet(InternalEObject owner) {
-		return new DerivedEObjectEList<>(EnumerationUsage.class, owner, SysMLPackage.ENUMERATION_DEFINITION__ENUMERATED_VALUE, new int[] {SysMLPackage.DEFINITION__VARIANT});
+		EList<EnumerationUsage> enumeratedValues = new NonNotifyingEObjectEList<>(EnumerationUsage.class, owner, eStructuralFeature.getFeatureID());
+		super.basicGet(owner).stream().
+			filter(EnumerationUsage.class::isInstance).
+			map(EnumerationUsage.class::cast).
+			forEachOrdered(enumeratedValues::add);
+		return enumeratedValues;
 	}
 
 }