Issue FUML15-17 - Updated DestroyObjecActionActivation::destroyObject().

Author: seidewitz

org.modeldriven.fuml/pom.xml

@@ -5,7 +5,7 @@
 	<artifactId>fuml</artifactId>
 	<packaging>jar</packaging>
 	<name>FUML Reference Implementation</name>
-	<version>1.4.0</version>
+	<version>1.4.1-SNAPSHOT</version>
 	<description>This open source software is a reference implementation, consisting of software and related files, for the OMG specification called the Semantics of a Foundational Subset for Executable UML Models (fUML). The reference implementation is intended to implement the execution semantics of UML activity models, accepting an XMI file from a conformant UML model as its input and providing an execution trace of the selected activity model(s) as its output. The core execution engine, which is directly generated from the normative syntactic and semantic models for fUML, may also be used as a library implementation of fUML in other software.</description>
 	<url>http:/fuml.modeldriven.org</url>
 	<licenses>

org.modeldriven.fuml/src/main/java/fuml/semantics/actions/DestroyObjectActionActivation.java

@@ -30,12 +30,12 @@ public class DestroyObjectActionActivation extends
 
 	public void doAction() {
 		// Get the value on the target input pin.
-		// If the value is not a reference, then the action has no effect.
+		// If the value is not a reference, the action has no effect.
 		// Otherwise, do the following.
 		// If isDestroyLinks is true, destroy all links in which the referent
 		// participates.
 		// If isDestroyOwnedObjects is true, destroy all objects owned by the
-		// referent via composition links.
+		// referent via either composite attributes or composition links.
 		// Destroy the referent object.
 
 		DestroyObjectAction action = (DestroyObjectAction) (this.node);
@@ -51,13 +51,11 @@ public void destroyObject(fuml.semantics.values.Value value,
 		// If the given value is a reference, then destroy the referenced
 		// object, per the given destroy action attribute values.
 
-		// Debug.println("[destroyObject] object = " + value.objectId());
-
 		if (value instanceof Reference) {
 			Reference reference = (Reference) value;
+			Debug.println("[destroyObject] object = " + reference.referent.identifier);
 
 			if (isDestroyLinks | isDestroyOwnedObjects) {
-				Debug.println("[destroyObject] Destroying links...");
 				ExtensionalValueList extensionalValues = this
 						.getExecutionLocus().extensionalValues;
 				for (int i = 0; i < extensionalValues.size(); i++) {
@@ -66,10 +64,16 @@ public void destroyObject(fuml.semantics.values.Value value,
 					if (extensionalValue instanceof Link) {
 						Link link = (Link) extensionalValue;
 						if (this.valueParticipatesInLink(reference, link)) {
-							if (isDestroyLinks
-									| this.objectIsComposite(reference, link)) {
-								// Debug.println("[destroyObject] Destroying link "
-								// + link.objectId());
+							if (isDestroyOwnedObjects) {
+								Value compositeValue = 
+										this.getCompositeValue(reference, link);
+								if (compositeValue != null) {
+									Debug.println("[destroyObject] Destroying (linked) owned object ...");
+									this.destroyObject(compositeValue, isDestroyLinks, 
+											isDestroyOwnedObjects);
+								}
+							}
+							if (isDestroyLinks & !link.getTypes().isEmpty()) {
 								link.destroy();
 							}
 						}
@@ -78,12 +82,12 @@ public void destroyObject(fuml.semantics.values.Value value,
 			}
 
 			if (isDestroyOwnedObjects) {
-				Debug.println("[destroyObject] Destroying owned objects...");
 				FeatureValueList objectFeatureValues = reference
 						.getFeatureValues();
 				for (int i = 0; i < objectFeatureValues.size(); i++) {
 					FeatureValue featureValue = objectFeatureValues.getValue(i);
 					if (((Property) featureValue.feature).aggregation == AggregationKind.composite) {
+						Debug.println("[destroyObject] Destroying owned objects...");
 						ValueList values = featureValue.values;
 						for (int j = 0; j < values.size(); j++) {
 							Value ownedValue = values.getValue(j);
@@ -93,31 +97,32 @@ public void destroyObject(fuml.semantics.values.Value value,
 					}
 				}
 			}
-
+			
 			reference.destroy();
 		}
 	} // destroyObject
 
-	public boolean objectIsComposite(
+	public Value getCompositeValue(
 			fuml.semantics.structuredclassifiers.Reference reference,
 			fuml.semantics.structuredclassifiers.Link link) {
-		// Test whether the given reference participates in the given link as a
-		// composite.
+		// If the given reference participates in the given link as a composite,
+		// then return the opposite value. Otherwise return null.
 
 		FeatureValueList linkFeatureValues = link.getFeatureValues();
 
-		boolean isComposite = false;
+		Value compositeValue = null;
 		int i = 1;
-		while (!isComposite & i <= linkFeatureValues.size()) {
+		while (compositeValue == null & i <= linkFeatureValues.size()) {
 			FeatureValue featureValue = linkFeatureValues.getValue(i - 1);
-			if (!featureValue.values.getValue(0).equals(reference)
+			Value value = featureValue.values.getValue(0);
+			if (!value.equals(reference)
 					& ((Property) featureValue.feature).aggregation == AggregationKind.composite) {
-				isComposite = true;
+				compositeValue = value;
 			}
 			i = i + 1;
 		}
 
-		return isComposite;
+		return compositeValue;
 
 	} // objectIsComposite
 

org.modeldriven.fuml/src/test/java/org/modeldriven/fuml/test/model/ExecutionTestCase.java

@@ -154,6 +154,29 @@ public void testTestClassObjectDestroyer() throws Exception {
         Value value = output.get(0).values.get(0);
         assertTrue("value.getTypes().isEmpty()", value.getTypes().isEmpty());
     }
+    
+    public void testTestCompositeObjectDestroyer() throws Exception {
+        ParameterValueList output = execute("TestCompositeObjectDestroyer");
+        log.info("done");
+        
+        assertEquals("output.size()", 4, output.size());
+        
+        ValueList compositeOut = output.get(0).values;
+        assertEquals("compositeOut.size()", 1, compositeOut.size());
+        assertTrue("compositeOut.getTypes().isEmpty()", compositeOut.get(0).getTypes().isEmpty());
+        
+        ValueList object1Out = output.get(1).values;
+        assertEquals("object1Out.size()", 1, object1Out.size());
+        assertTrue("object1Out.getTypes().isEmpty()", object1Out.get(0).getTypes().isEmpty());
+        
+        ValueList object2Out = output.get(2).values;
+        assertEquals("object2Out.size()", 1, object2Out.size());
+        assertTrue("object2Out.getTypes().isEmpty()", object2Out.get(0).getTypes().isEmpty());
+        
+        ValueList assocOut = output.get(3).values;
+        assertEquals("assocOut.size()", 0, assocOut.size());
+    }
+    
     public void testTestClassWriterReader() throws Exception {
         ParameterValueList output = execute("TestClassWriterReader");
         log.info("done");