ST6RI-67 Fixed end feature redefinition.

Author: seidewitz

org.omg.sysml.ui/src/org/omg/sysml/ui/outline/AlfOutlineTreeProvider.xtend

@@ -11,7 +11,6 @@ import org.omg.sysml.lang.sysml.Generalization
 import org.omg.sysml.lang.sysml.Membership
 import org.omg.sysml.lang.sysml.Redefinition
 import org.omg.sysml.lang.sysml.Import
-import org.omg.sysml.lang.sysml.ConnectorEnd
 import org.omg.sysml.lang.sysml.Subsetting
 import org.omg.sysml.lang.sysml.OperatorExpression
 import org.omg.sysml.lang.sysml.Relationship
@@ -158,7 +157,7 @@ class AlfOutlineTreeProvider extends DefaultOutlineTreeProvider {
 
 	def boolean _isLeaf(Feature feature) {
 		// Ensure default redefinition/subsetting
-		feature.ownedRedefinition
+		feature.ownedSubsetting
 		// Ensure valuation connector
 		feature.feature
 		super._isLeaf(feature)
@@ -203,25 +202,6 @@ class AlfOutlineTreeProvider extends DefaultOutlineTreeProvider {
 		}
 	}
 
-	def boolean _isLeaf(ConnectorEnd connectorEnd) {
-		connectorEnd.end === null && connectorEnd.feature === null;
-	}
-	
-	def void _createChildren(IOutlineNode parentNode, ConnectorEnd connectorEnd) {
-		if (connectorEnd.end !== null) {
-			createEObjectNode(parentNode, connectorEnd.end, 
-				_image(connectorEnd.end), "end " + connectorEnd.end._text, 
-				true
-			)
-		}
-		if (connectorEnd.feature !== null) {
-			createEObjectNode(parentNode, connectorEnd.feature, 
-				_image(connectorEnd.feature), "feature " + connectorEnd.feature._text, 
-				true
-			)
-		}
-	}
-	
 	def boolean _isLeaf(Expression expression) {
 		// Ensure derivation of inputs and outputs
 		expression.input

org.omg.sysml/syntax-gen/org/omg/sysml/lang/sysml/ConnectorEnd.java

@@ -19,10 +19,8 @@
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.util.EObjectEList;
 import org.eclipse.emf.ecore.util.InternalEList;
-import org.omg.sysml.lang.sysml.Association;
 import org.omg.sysml.lang.sysml.BindingConnector;
 import org.omg.sysml.lang.sysml.Category;
-import org.omg.sysml.lang.sysml.Connector;
 import org.omg.sysml.lang.sysml.EndFeatureMembership;
 import org.omg.sysml.lang.sysml.Expression;
 import org.omg.sysml.lang.sysml.Feature;
@@ -328,14 +326,18 @@ public boolean hasValueType() {
 	}
 
 	public EList<Subsetting> getOwnedSubsettingWithComputedRedefinitions(String subsettingDefault) {
-		EList<Subsetting> redefinitions = getComputedRedefinitions();
-		return redefinitions.isEmpty()? getOwnedSubsettingWithDefault(subsettingDefault): redefinitions;
+		getComputedRedefinitions();
+		return getOwnedSubsettingWithDefault(subsettingDefault);
 	}
 
 	public EList<Subsetting> getOwnedSubsettingWithDefault(String subsettingDefault) {
 		return getOwnedGeneralizationWithDefault(Subsetting.class, SysMLPackage.FEATURE__OWNED_SUBSETTING, SysMLPackage.eINSTANCE.getSubsetting(), subsettingDefault);
 	}
 
+	public EList<Subsetting> getOwnedSubsettingWithoutDefault() {
+		return getOwnedGeneralizationWithoutDefault(Subsetting.class, SysMLPackage.FEATURE__OWNED_SUBSETTING);
+	}
+	
 	public EList<Redefinition> getOwnedRedefinitionsWithoutDefault() {
 		return getOwnedGeneralizationWithoutDefault(Redefinition.class, SysMLPackage.FEATURE__OWNED_REDEFINITION);
 	}
@@ -387,16 +389,13 @@ protected void addRedefinitions(EList<Subsetting> redefinitions, List<Redefiniti
 
 	/**
 	 * Get the relevant Features that may be redefined from the given Category.
-	 * (By default, these are the end Features if the Category is a Association or a Connector.)
+	 * (By default, these are the end Features of the Category.)
 	 */
 	protected List<? extends Feature> getRelevantFeatures(Category category) {
 		return getOwningFeatureMembership() instanceof EndFeatureMembership?
-				   category instanceof Association?
-						((Association)category).getOwnedEndFeatureMembership().stream().
-						map(m->m.getMemberFeature()).collect(Collectors.toList()):
-				   category instanceof Connector?
-						((Connector)category).getConnectorEnd():
-				   Collections.emptyList():
+					category.getFeature().stream().
+						filter(f->f.getOwningFeatureMembership() instanceof EndFeatureMembership).
+						collect(Collectors.toList()):
 
 			   // NOTE: This is a temporary measure until connecting to inherited features
 			   // is handled generally.

org.omg.sysml/syntax-gen/org/omg/sysml/lang/sysml/impl/FeatureImpl.java

@@ -58,8 +58,7 @@ public boolean isResultParameter() {
 	 * @generated NOT
 	 */
 	public EList<Subsetting> getOwnedSubsetting() {
-		EList<Subsetting> redefinitions = getComputedRedefinitions();
-		return redefinitions.isEmpty()? super.getOwnedSubsetting(): redefinitions;
+		return super.getOwnedSubsetting();
 	}
 
 	/**