Issue #48 - Corrected handling of template params as classifiers.

Author: seidewitz

org.modeldriven.alf/src/org/modeldriven/alf/execution/AlfBase.java

@@ -24,7 +24,7 @@
 
 public abstract class AlfBase {
 
-    public static final String ALF_VERSION = "1.1.0a/maint-3";
+    public static final String ALF_VERSION = "1.1.0a/maint-4";
 
     protected boolean isVerbose = false;
 

org.modeldriven.alf/src/org/modeldriven/alf/fuml/mapping/expressions/ExpressionMapping.java

@@ -50,6 +50,9 @@ public Classifier getType() throws MappingError {
         if (this.type == null) {
             ElementReference reference = this.getExpression().getType();
             if (reference != null) {
+                if (reference.getImpl().isClassifierTemplateParameter()) {
+                    reference = reference.getImpl().getParameteredElement();
+                }
                 this.type = (Classifier)reference.getImpl().getUml();
                 if (this.type == null) {
                     FumlMapping mapping = this.fumlMap(reference);

org.modeldriven.alf/src/org/modeldriven/alf/syntax/common/impl/ElementReferenceImpl.java

@@ -512,10 +512,11 @@ public static ElementReference makeElementReference(Element element) {
             reference = templateBindings.get(element);
 
             if (reference == null) {
-                ExternalElementReference externalReference = 
-                        new ExternalElementReference();
+                ExternalElementReference externalReference = new ExternalElementReference();
                 externalReference.setElement(element);
                 reference = externalReference;
+            } else if (reference.getImpl().isClassifierTemplateParameter()) {
+                return reference.getImpl().getParameteredElement();
             }
         }
 
@@ -557,6 +558,8 @@ public static ElementReference makeTypeReference(Element element) {
     public static ElementReference effectiveElementFor(ElementReference reference) {
         if (reference == null) {
             return null;
+        } else if (reference.getImpl().isClassifierTemplateParameter()) {
+            return reference.getImpl().getParameteredElement();
         } else {
             ElementReference boundElement = reference.getImpl().getEffectiveBoundElement();
             return boundElement == null? reference: boundElement;

org.modeldriven.alf/src/org/modeldriven/alf/syntax/common/impl/ExternalElementReferenceImpl.java

@@ -129,11 +129,19 @@ public boolean isClassifier() {
                // be a Classifier.
                element instanceof ClassifierTemplateParameter;
     }
+    
+    protected Classifier asClassifier() {
+        Element element = this.getSelf().getElement();
+        if (element instanceof ClassifierTemplateParameter) {
+            element = ((ClassifierTemplateParameter)element).getParameteredElement();
+        }
+        return (Classifier)element;
+    }
 
     @Override
     public boolean isAbstractClassifier() {
         return this.isClassifier() &&
-                ((Classifier)this.getSelf().getElement()).getIsAbstract();
+                this.asClassifier().getIsAbstract();
     }
 
     @Override
@@ -288,7 +296,7 @@ public boolean isClassifierTemplateParameter() {
     @Override
     public boolean isParameteredElement() {
         return this.isClassifier() && 
-                ((Classifier)this.getSelf().getElement()).getTemplateParameter() != null;
+                this.asClassifier().getTemplateParameter() != null;
     }
 
     @Override
@@ -360,7 +368,7 @@ public boolean hasReceptionFor(ElementReference signal) {
     @Override
     public Collection<ElementReference> parents() {
         if (this.isClassifier()) {
-            return setOf(((Classifier)this.getSelf().getElement()).parents());
+            return setOf(this.asClassifier().parents());
         } else {
             return new HashSet<ElementReference>();
         }
@@ -369,7 +377,7 @@ public Collection<ElementReference> parents() {
     @Override
     public Collection<ElementReference> allParents() {
         if (this.isClassifier()) {
-            return setOf(((Classifier)this.getSelf().getElement()).allParents());
+            return setOf(this.asClassifier().allParents());
         } else {
             return new HashSet<ElementReference>();
         }
@@ -451,7 +459,7 @@ public List<ElementReference> getAttributes() {
         List<ElementReference> attributes = new ArrayList<ElementReference>();
         if (this.isClassifier()) {
             for (Property attribute: 
-                ActivityGraph.getAllAttributes((Classifier)this.getSelf().getElement())) {
+                ActivityGraph.getAllAttributes(this.asClassifier())) {
                 attributes.add(ElementReferenceImpl.makeElementReference(attribute));
             }
         }
@@ -473,7 +481,7 @@ public List<ElementReference> getAssociationEnds() {
     public List<Member> getInheritableMembers() {
         List<Member> inheritableMembers = new ArrayList<Member>();
         if (this.isClassifier()) {
-            Classifier classifier = (Classifier)this.getSelf().getElement();
+            Classifier classifier = this.asClassifier();
             for (NamedElement element: classifier.inheritableMembers()) {
                 List<String> names = classifier.getNamesOfMember(element);
                 if (names.isEmpty()) {

org.modeldriven.alf/src/org/modeldriven/alf/syntax/units/impl/ExternalNamespaceImpl.java

@@ -551,8 +551,11 @@ private static ElementReference makeSubstitution(
        for (int i = 0; i < templateParameters.size(); i++) {
            if (reference.getImpl().equals(
                    templateParameters.get(i).getImpl().getParameteredElement())) {
-               return i >= templateArguments.size()? null: 
+               reference = i >= templateArguments.size()? null: 
                        templateArguments.get(i);
+               if (reference != null && reference.getImpl().isClassifierTemplateParameter()) {
+                   reference = reference.getImpl().getParameteredElement();
+               }
            }
        }
        return reference;