Issue #16 - Added nested profiles to computed set of applied profiles.

- Also corrected error in InternalElementReferenceImpl.getMembers.

Author: seidewitz

org.modeldriven.alf.eclipse/lib/alf-base.jar

@@ -24,7 +24,7 @@
 
 public abstract class AlfBase {
 
-    public static final String ALF_VERSION = "1.0.4/dev-01";
+    public static final String ALF_VERSION = "1.0.4/dev-02";
 
     protected boolean isVerbose = false;
 

org.modeldriven.alf/dist/alf-base.jar

@@ -367,7 +367,7 @@ public List<ElementReference> getOwnedMembers() {
     @Override
     public List<ElementReference> getMembers() {
         List<ElementReference> members = new ArrayList<ElementReference>();
-        if (this.isClassifier()) {
+        if (this.isNamespace()) {
             for (Member member: ((NamespaceDefinition)this.getSelf().getElement()).getMember()) {
                 members.add(member.getImpl().getReferent());
             }

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

@@ -1,4 +1,3 @@
-
 /*******************************************************************************
  * Copyright 2011-2016 Data Access Technologies, Inc. (Model Driven Solutions)
  * 
@@ -280,7 +279,7 @@ public ElementReference resolveStereotype(QualifiedName name) {
                 // If the stereotype name is qualified, then there must be an
                 // applied profile that is named by the qualification of
                 // the stereotype and that contains a stereotype of that name.
-                // NOTE: This means that if the stereotype not directly owned by
+                // NOTE: This means that if the stereotype is not directly owned by
                 // the profile, then the names of any subpackages in which it is
                 // nested are NOT to be included in the qualification when
                 // naming the stereotype.
@@ -319,6 +318,8 @@ private static ElementReference findStereotype(String name, ElementReference pac
         return null;
     }
 
+    // NOTE: This is overridden in PackageDefinitionImpl, since profiles can only be 
+    // applied to packages.
     public Collection<ElementReference> getAllAppliedProfiles() {
         NamespaceDefinition outerScope = this.getOuterScope();
         return outerScope == null? new ArrayList<ElementReference>(): 

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

@@ -1,4 +1,3 @@
-
 /*******************************************************************************
  * Copyright 2011-2016 Data Access Technologies, Inc. (Model Driven Solutions)
  * All rights reserved worldwide. This program and the accompanying materials
@@ -31,6 +30,8 @@ public class PackageDefinitionImpl extends NamespaceDefinitionImpl {
     // NOTE: A collection of element references is used here to allow
     // for the (non-standard) possibility of profiles defined using Alf.
 	private Collection<ElementReference> appliedProfile = null; // DERIVED
+	
+	private Collection<ElementReference> allAppliedProfiles = null;
 
 	public PackageDefinitionImpl(PackageDefinition self) {
 		super(self);
@@ -165,10 +166,31 @@ public List<Member> getPublicMembers(Collection<ElementReference> excluded) {
     }
 
     @Override
-    public Collection<ElementReference> getAllAppliedProfiles() {
-        Collection<ElementReference> appliedProfiles = super.getAllAppliedProfiles();
-        appliedProfiles.addAll(this.getAppliedProfileReference());
-        return appliedProfiles;
+    public Collection<ElementReference> getAllAppliedProfiles() {
+        if (this.allAppliedProfiles == null) {
+            this.allAppliedProfiles = super.getAllAppliedProfiles();
+            Collection<ElementReference> appliedProfiles = this.getAppliedProfileReference();
+            this.allAppliedProfiles.addAll(appliedProfiles);
+            
+            // NOTE: Nested profiles are added here, because, according to the UML spec,
+            // "Applying a Profile means recursively applying all its nested and imported Profiles."
+            for (ElementReference profile: appliedProfiles) {
+                this.allAppliedProfiles.addAll(getNestedProfiles(profile));
+            }
+        }        
+        return this.allAppliedProfiles;
+    }
+    
+    // NOTE: By searching members, not just owned members, this also returns any imported profiles.
+    public static Collection<ElementReference> getNestedProfiles(ElementReference profile) {
+        Collection<ElementReference> nestedProfiles = new ArrayList<ElementReference>();
+        for (ElementReference member: profile.getImpl().getMembers()) {
+            if (member.getImpl().isProfile()) {
+                nestedProfiles.add(member);
+                nestedProfiles.addAll(getNestedProfiles(member));
+            }
+        }
+        return nestedProfiles;
     }
 
     @Override

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

@@ -14,12 +14,29 @@ package Units_Profile {
 			public tag3: String[0..1];
 		}
 
+		@stereotype(Property)
+		public class S3 {
+		}
+		
+		@profile
+		public package NestedProfile {
+		
+			@stereotype(Property)
+			public class S3 {
+			}
+	
+			@stereotype(Property)
+			public class S4 {
+			}
+	
+		}
+		
 	}
 
 	@apply(Profile)
 	public package P {
 
-		@Profile::S1
+		@S1
 		public class A {
 
 			@StandardProfile::Create
@@ -31,6 +48,15 @@ package Units_Profile {
 			@Profile::S2(tag1=>-3, tag2=>true, tag3=>"blah")
 			private y: Boolean;
 
+			@Profile::S3
+			private z: Boolean;
+			
+			@Profile::NestedProfile::S3
+			private a: Integer;
+			
+			@S4
+			private b: Integer;
+			
 		}
 
 	}