Merge pull request #595 from Systems-Modeling/ST6RI-796

ST6RI-796 Leftover caches in InvocationDelegates

Author: seidewitz

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

@@ -107,6 +107,24 @@ public boolean redefinesAnyOf(Collection<Feature> features, Set<Feature> visited
 	// Caching
 
 	EList<Type> types = null;
+	String storedEffectiveName = null;
+	String storedEffectiveShortName = null;
+	
+	public void storeEffectiveName(String effectiveName) {
+		storedEffectiveName = effectiveName;
+	}
+	
+	public String getEffectiveName() {
+		return storedEffectiveName;
+	}
+	
+	public void storeEffectiveShortName(String effectiveShortName) {
+		storedEffectiveShortName = effectiveShortName;
+	}
+	
+	public String getEffectiveShortName() {
+		return storedEffectiveShortName;
+	}
 
 	public EList<Type> getTypes() {
 		return types;
@@ -124,6 +142,8 @@ public void clearCaches() {
 		super.clearCaches();
 		types = null;
 		redefinedFeatures.clear();
+		storedEffectiveName = null;
+		storedEffectiveShortName = null;
 	}
 
 	// Implicit Elements

org.omg.sysml/src/org/omg/sysml/delegate/invocation/Feature_effectiveName_InvocationDelegate.java

@@ -22,58 +22,23 @@
 package org.omg.sysml.delegate.invocation;
 
 import java.lang.reflect.InvocationTargetException;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
 
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EOperation;
 import org.eclipse.emf.ecore.InternalEObject;
 import org.eclipse.emf.ecore.util.BasicInvocationDelegate;
 import org.omg.sysml.lang.sysml.Feature;
-import org.omg.sysml.lang.sysml.impl.FeatureImpl;
+import org.omg.sysml.util.FeatureUtil;
 
 public class Feature_effectiveName_InvocationDelegate extends BasicInvocationDelegate {
 
 	public Feature_effectiveName_InvocationDelegate(EOperation operation) {
 		super(operation);
 	}
 
-	private final Map<Feature, String> nameCache = new HashMap<>();
-	
 	@Override
 	public Object dynamicInvoke(InternalEObject target, EList<?> arguments) throws InvocationTargetException {
 		Feature self = (Feature) target;
-		
-		return computeEffectiveName(self, new HashSet<>());
-	}
-
-	private boolean isNameDefinite(Feature self) {
-		return self.getDeclaredName() != null || self.getDeclaredShortName() != null;
-	}
-	
-	
-	public String computeEffectiveName(Feature self, Set<Feature> visited) {		
-		if (isNameDefinite(self)) {
-			return self.getDeclaredName();
-		}
-		
-		String effectiveName = nameCache.get(self);
-		
-		if (effectiveName != null) {
-			return effectiveName;
-		}
-
-		visited.add(self);
-		FeatureImpl namingFeature = (FeatureImpl) self.namingFeature();
-		
-		if (namingFeature != null && !visited.contains(namingFeature)) {
-			effectiveName = computeEffectiveName(namingFeature, visited);
-			nameCache.put(self, effectiveName);
-		}
-		
-		return effectiveName;
+		return FeatureUtil.computeEffectiveName(self);
 	}
-
 }

org.omg.sysml/src/org/omg/sysml/delegate/invocation/Feature_effectiveShortName_InvocationDelegate.java

@@ -22,57 +22,23 @@
 package org.omg.sysml.delegate.invocation;
 
 import java.lang.reflect.InvocationTargetException;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
 
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EOperation;
 import org.eclipse.emf.ecore.InternalEObject;
 import org.eclipse.emf.ecore.util.BasicInvocationDelegate;
 import org.omg.sysml.lang.sysml.Feature;
-import org.omg.sysml.lang.sysml.impl.FeatureImpl;
+import org.omg.sysml.util.FeatureUtil;
 
 public class Feature_effectiveShortName_InvocationDelegate extends BasicInvocationDelegate {
 
 	public Feature_effectiveShortName_InvocationDelegate(EOperation operation) {
 		super(operation);
 	}
 
-	private final Map<Feature, String> nameCache = new HashMap<>();
-	
 	@Override
 	public Object dynamicInvoke(InternalEObject target, EList<?> arguments) throws InvocationTargetException {
 		Feature self = (Feature) target;
-		
-		return computeEffectiveShortName(self, new HashSet<>());
-	}
-	
-	private boolean isNameSet(Feature self) {
-		return self.getDeclaredName() != null || self.getDeclaredShortName() != null;
+		return FeatureUtil.computeEffectiveShortName(self);
 	}
-	
-	public String computeEffectiveShortName(Feature self, Set<Feature> visited) {
-		if (isNameSet(self)) {
-			return self.getDeclaredShortName();
-		}
-		
-		String effectiveShortName = nameCache.get(self);
-		
-		if (effectiveShortName != null) {
-			return effectiveShortName;
-		}
-
-		visited.add(self);
-		FeatureImpl namingFeature = (FeatureImpl) self.namingFeature();
-		
-		if (namingFeature != null && !visited.contains(namingFeature)) {
-			effectiveShortName = computeEffectiveShortName(namingFeature, visited);
-			nameCache.put(self, effectiveShortName);
-		}
-		
-		return effectiveShortName;
-	}
-
 }

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

@@ -439,4 +439,62 @@ public static Multiplicity getMultiplicityOf(Type type, Set<Type> visited) {
 		}
 		return multiplicity;
 	}
+	
+	//Naming
+	
+	public static String computeEffectiveName(Feature self) {
+		return computeEffectiveName(self, new HashSet<>());
+	}
+	
+	private static String computeEffectiveName(Feature self, Set<Feature> visited) {
+		if (isNameSet(self)) {
+			return self.getDeclaredName();
+		}
+		
+		String effectiveName = getFeatureAdapter(self).getEffectiveName();
+		
+		if (effectiveName != null) {
+			return effectiveName;
+		}
+
+		visited.add(self);
+		Feature namingFeature = self.namingFeature();
+		
+		if (namingFeature != null && !visited.contains(namingFeature)) {
+			effectiveName = computeEffectiveName(namingFeature, visited);
+			getFeatureAdapter(self).storeEffectiveName(effectiveName);
+		}
+		
+		return effectiveName;
+	}
+	
+	public static String computeEffectiveShortName(Feature self) {
+		return computeEffectiveShortName(self, new HashSet<>());
+	}
+	
+	private static String computeEffectiveShortName(Feature self, Set<Feature> visited) {
+		if (isNameSet(self)) {
+			return self.getDeclaredShortName();
+		}
+		
+		String effectiveShortName = getFeatureAdapter(self).getEffectiveShortName();
+		
+		if (effectiveShortName != null) {
+			return effectiveShortName;
+		}
+
+		visited.add(self);
+		Feature namingFeature = self.namingFeature();
+		
+		if (namingFeature != null && !visited.contains(namingFeature)) {
+			effectiveShortName = computeEffectiveShortName(namingFeature, visited);
+			getFeatureAdapter(self).storeEffectiveShortName(effectiveShortName);
+		}
+		
+		return effectiveShortName;
+	}
+	
+	private static boolean isNameSet(Feature self) {
+		return self.getDeclaredName() != null || self.getDeclaredShortName() != null;
+	}
 }