ST6RI-795 Added caching of redefined features to inheritance calc.

Author: seidewitz

org.omg.sysml/src/org/omg/sysml/adapter/FeatureAdapter.java

@@ -63,8 +63,6 @@
 
 public class FeatureAdapter extends TypeAdapter {
 
-	EList<Type> types = null;
-	
 	public FeatureAdapter(Feature element) {
 		super(element);
 	}
@@ -89,9 +87,27 @@ public EList<Membership> getInheritedMembership(Collection<Namespace> excludedNa
 		}
 		return inheritedMemberships;
 	}
+	
+	public boolean redefinesAnyOf(Collection<Feature> features, Set<Feature> visited) {
+		Feature feature = getTarget();
+		if (features.contains(feature) || features.stream().anyMatch(redefinedFeatures::contains)) {
+			return true;
+		} else {			
+			visited.add(feature);
+			for (var redefined: getRedefinedFeaturesWithComputed(null)) {
+				if (!visited.contains(redefined) && FeatureUtil.redefinesAnyOf(redefined, features, visited)) {
+					redefinedFeatures.add(redefined);
+					return true;
+				}
+			}
+			return false;
+		}
+	}
 
 	// Caching
 
+	EList<Type> types = null;
+	
 	public EList<Type> getTypes() {
 		return types;
 	}
@@ -100,11 +116,14 @@ public EList<Type> setTypes(EList<Type> types) {
 		this.types = types;
 		return types;
 	}
+	
+	Collection<Feature> redefinedFeatures = new HashSet<>();
 
 	@Override
 	public void clearCaches() {
 		super.clearCaches();
 		types = null;
+		redefinedFeatures.clear();
 	}
 
 	// Implicit Elements

org.omg.sysml/src/org/omg/sysml/adapter/TypeAdapter.java

@@ -102,7 +102,7 @@ public EList<Membership> getInheritedMembership(Collection<Namespace> excludedNa
 			}
 		}
 		Collection<Feature> newRedefinedFeatures = new HashSet<>(redefinedFeatures);
-		newRedefinedFeatures.addAll(TypeUtil.getAllFeaturesRedefinedBy(target));
+		newRedefinedFeatures.addAll(getAllFeaturesRedefinedByType());
 		for (Type general: TypeUtil.getGeneralTypesOf(target)) {
 			if (general != null && !excludedTypes.contains(general)) {
 				inheritedMemberships.addAll(TypeUtil.getNonPrivateMembershipFor(general, excludedNamespaces, excludedTypes, includeProtected, excludeImplied, newRedefinedFeatures));
@@ -129,10 +129,18 @@ protected static void removeRedefinedFeatures(Collection<Membership> memberships
 				   FeatureUtil.redefinesAnyOf((Feature)memberElement, redefinedFeatures);
 		});	
 	}
+	
+	protected Collection<Feature> getAllFeaturesRedefinedByType() {
+		if (allRedefinedFeatures == null) {
+			allRedefinedFeatures = TypeUtil.getAllFeaturesRedefinedBy(getTarget());
+		}
+		return allRedefinedFeatures;
+	}
 
 	// Caching
 
 	private EList<Membership> inheritedMembership = null;
+	private Collection<Feature> allRedefinedFeatures = null;
 
 	public EList<Membership> getInheritedMembership() {
 		return inheritedMembership;
@@ -146,6 +154,7 @@ public EList<Membership> setInheritedMembership(EList<Membership> inheritedMembe
 	public void clearCaches() {
 		super.clearCaches();
 		inheritedMembership = null;
+		allRedefinedFeatures = null;
 	}
 
 	// Implicit Elements

org.omg.sysml/src/org/omg/sysml/util/FeatureUtil.java

@@ -243,20 +243,9 @@ public static boolean redefinesAnyOf(Feature feature, Collection<Feature> redefi
 		return redefinesAnyOf(feature, redefinedFeatures, new HashSet<>());
 	}
 
-	private static boolean redefinesAnyOf(Feature feature, Collection<Feature> redefinedFeatures, Set<Feature> visited) {		
-		if (feature == null) {
-			return false;
-		} else if (redefinedFeatures.contains(feature)) {
-			return true;
-		} else {			
-			visited.add(feature);
-			for (var redefined: FeatureUtil.getRedefinedFeaturesWithComputedOf(feature, null)) {
-				if (!visited.contains(redefined) && redefinesAnyOf(redefined, redefinedFeatures, visited)) {
-					return true;
-				}
-			}
-			return false;
-		}
+	public static boolean redefinesAnyOf(Feature feature, Collection<Feature> redefinedFeatures, Set<Feature> visited) {		
+		return feature != null && 
+			   getFeatureAdapter(feature).redefinesAnyOf(redefinedFeatures, visited);
 	}
 
 	// Feature values