FUML15-13 Fixed unmarshalling logic for instances of signal subtypes.

- Updated fUML-Tests.mdxml with a test for this case.

Author: seidewitz

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

@@ -14,6 +14,8 @@
 
 import fuml.Debug;
 import fuml.semantics.activities.ActivityNodeActivationGroup;
+import fuml.semantics.activities.TokenList;
+import fuml.semantics.commonbehavior.EventOccurrence;
 import fuml.semantics.commonbehavior.ParameterValue;
 import fuml.semantics.commonbehavior.ParameterValueList;
 import fuml.semantics.commonbehavior.SignalEventOccurrence;
@@ -25,10 +27,9 @@
 import fuml.syntax.activities.ActivityNode;
 import fuml.syntax.commonbehavior.TriggerList;
 
-public class AcceptEventActionActivation extends
-		fuml.semantics.actions.ActionActivation {
+public class AcceptEventActionActivation extends ActionActivation {
 
-	public fuml.semantics.actions.AcceptEventActionEventAccepter eventAccepter = null;
+	public AcceptEventActionEventAccepter eventAccepter = null;
 	public Boolean waiting = false;
 
 	public void initialize(ActivityNode node, ActivityNodeActivationGroup group) {
@@ -49,8 +50,7 @@ public void run() {
 		this.waiting = false;
 	} // run
 
-	public void fire(
-			fuml.semantics.activities.TokenList incomingTokens) {
+	public void fire(TokenList incomingTokens) {
 		// Register the event accepter for this accept event action activation
 		// with the context object of the enclosing activity execution
 		// and wait for an event to be accepted.
@@ -84,8 +84,7 @@ public void doAction() {
 		return;
 	} // doAction
 
-	public void accept(
-			fuml.semantics.commonbehavior.EventOccurrence eventOccurrence) {
+	public void accept(EventOccurrence eventOccurrence) {
 		// Accept the given event occurrence.
 		// If the action does not unmarshall, then, if the event occurrence is
 		// a signal event occurrence, place the signal instance of the signal
@@ -115,7 +114,8 @@ public void accept(
 					}
 				}
 			} else {
-				ParameterValueList parameterValues = eventOccurrence.getParameterValues();
+				ParameterValueList parameterValues = 
+						eventOccurrence.getParameterValues(action.trigger.get(0).event);
 				for (int i = 0; i < parameterValues.size(); i++) {
 					ParameterValue parameterValue = parameterValues.getValue(i);
 					OutputPin resultPin = resultPins.getValue(i);
@@ -135,8 +135,7 @@ public void accept(
 
 	} // accept
 
-	public boolean match(
-			fuml.semantics.commonbehavior.EventOccurrence eventOccurrence) {
+	public boolean match(EventOccurrence eventOccurrence) {
 		// Return true if the given event occurrence matches a trigger of the
 		// accept event action of this activation.
 

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

@@ -15,18 +15,20 @@
 import fuml.syntax.actions.OutputPin;
 import fuml.syntax.actions.OutputPinList;
 import fuml.syntax.actions.UnmarshallAction;
+import fuml.syntax.classification.Classifier;
 
 public class UnmarshallActionActivation extends ActionActivation {
 
 	@Override
 	public void doAction() {
 		UnmarshallAction action = (UnmarshallAction) this.node;
+		Classifier unmarshallType = action.unmarshallType;
 		OutputPinList resultPins = action.result;
 
 		Value value = this.takeTokens(action.object).getValue(0);
 
 		if (value instanceof StructuredValue) {
-			FeatureValueList featureValues = ((StructuredValue)value).getFeatureValues();
+			FeatureValueList featureValues = ((StructuredValue)value).getMemberValues(unmarshallType);
 			for (int i=0; i < featureValues.size(); i++) {
 				FeatureValue featureValue = featureValues.getValue(i);
 				OutputPin resultPin = resultPins.getValue(i);

org.modeldriven.fuml/src/main/java/fuml/semantics/commonbehavior/CallEventOccurrence.java

@@ -11,6 +11,7 @@
 
 import fuml.syntax.classification.Operation;
 import fuml.syntax.commonbehavior.CallEvent;
+import fuml.syntax.commonbehavior.Event;
 import fuml.syntax.commonbehavior.Trigger;
 
 public class CallEventOccurrence extends EventOccurrence {
@@ -37,7 +38,7 @@ public boolean match(Trigger trigger) {
 	}
 
 	@Override
-	public ParameterValueList getParameterValues() {
+	public ParameterValueList getParameterValues(Event event) {
 		// Return the input parameter values from the call event execution for
 		// this call event occurrence, which correspond to the values of the
 		// operation input parameters for the call.

org.modeldriven.fuml/src/main/java/fuml/semantics/commonbehavior/EventOccurrence.java

@@ -11,6 +11,7 @@
 import org.modeldriven.fuml.FumlObject;
 
 import fuml.semantics.structuredclassifiers.Reference;
+import fuml.syntax.commonbehavior.Event;
 
 public abstract class EventOccurrence extends FumlObject {
 
@@ -48,7 +49,7 @@ public boolean matchAny(fuml.syntax.commonbehavior.TriggerList triggers) {
 
 	}
 
-	public abstract fuml.semantics.commonbehavior.ParameterValueList getParameterValues();
+	public abstract fuml.semantics.commonbehavior.ParameterValueList getParameterValues(Event event);
 
 	private EventOccurrence_SendingBehaviorExecution behavior = new EventOccurrence_SendingBehaviorExecution(this);
 

org.modeldriven.fuml/src/main/java/fuml/semantics/commonbehavior/InvocationEventOccurrence.java

@@ -8,6 +8,7 @@
 
 package fuml.semantics.commonbehavior;
 
+import fuml.syntax.commonbehavior.Event;
 import fuml.syntax.commonbehavior.Trigger;
 
 public class InvocationEventOccurrence extends EventOccurrence {
@@ -22,7 +23,7 @@ public boolean match(Trigger trigger) {
 	}
 
 	@Override
-	public ParameterValueList getParameterValues() {
+	public ParameterValueList getParameterValues(Event event) {
 		// An invocation event occurrence does not have any associated data.
 
 		return new ParameterValueList();

org.modeldriven.fuml/src/main/java/fuml/semantics/commonbehavior/SignalEventOccurrence.java

@@ -11,6 +11,7 @@
 import fuml.semantics.simpleclassifiers.FeatureValue;
 import fuml.semantics.simpleclassifiers.FeatureValueList;
 import fuml.semantics.simpleclassifiers.SignalInstance;
+import fuml.syntax.commonbehavior.Event;
 import fuml.syntax.commonbehavior.SignalEvent;
 
 public class SignalEventOccurrence extends EventOccurrence {
@@ -31,18 +32,25 @@ public boolean match(fuml.syntax.commonbehavior.Trigger trigger) {
 	}
 
 	@Override
-	public fuml.semantics.commonbehavior.ParameterValueList getParameterValues() {
-		// Return parameter values for feature of the signal instance, in order.
+	public fuml.semantics.commonbehavior.ParameterValueList getParameterValues(Event event) {
+		// Return parameter values for the features of the signal instance, in order,
+	    // corresponding to the attributes of the declared signal of the given event.
 		// These are intended to be treated as if they are the values of effective
 		// parameters of direction "in".
-		
-		ParameterValueList parameterValues = new ParameterValueList();
-		FeatureValueList memberValues = this.signalInstance.getMemberValues();
-		for(int i = 0; i < memberValues.size(); i++){
-			FeatureValue feature = memberValues.getValue(i);
-			ParameterValue parameterValue = new ParameterValue();
-			parameterValue.values = feature.values;
-			parameterValues.add(parameterValue);
+		// (Note that the given event must be a signal event, and the signal instance 
+		// of this signal event occurrence must be a direct or indirect instance of 
+		// the event signal.)
+
+		ParameterValueList parameterValues = new ParameterValueList();		
+		if (event instanceof SignalEvent) {
+			FeatureValueList memberValues = 
+					this.signalInstance.getMemberValues(((SignalEvent)event).signal);
+			for(int i = 0; i < memberValues.size(); i++){
+				FeatureValue feature = memberValues.getValue(i);
+				ParameterValue parameterValue = new ParameterValue();
+				parameterValue.values = feature.values;
+				parameterValues.add(parameterValue);
+			}
 		}
 		return parameterValues;
 	}

org.modeldriven.fuml/src/main/java/fuml/semantics/simpleclassifiers/StructuredValue.java

@@ -73,33 +73,29 @@ public abstract void setFeatureValue(
 
 	public abstract fuml.semantics.simpleclassifiers.FeatureValueList getFeatureValues();
 
-	public fuml.semantics.simpleclassifiers.FeatureValueList getMemberValues() {
+	public fuml.semantics.simpleclassifiers.FeatureValueList getMemberValues(Classifier type) {
 		// Return the feature values for this structured value that are for structural
-		// features that are members of one of the types of the structured value.
-		// (That is, they are owned are inherited, excluding private features of
-		// supertypes that are not inherited.)
+		// features that are members of the given type. (That is, they are owned or 
+		// inherited by the given type, excluding private features of supertypes that 
+		// are not inherited.)
 
 		FeatureValueList featureValues = this.getFeatureValues();
 		FeatureValueList memberValues = new FeatureValueList();
 
-		ClassifierList types = this.getTypes();
-		for (int i = 0; i < featureValues.size(); i++) {
-			FeatureValue featureValue = featureValues.getValue(i);
-			Boolean isMember = false;
-			int j = 1;
-			while (j <= types.size() & !isMember) {
-				Classifier type = types.getValue(j-1);
-				NamedElementList members = type.member;
+		if (type != null) {
+			NamedElementList members = type.member;
+			for (int i = 0; i < featureValues.size(); i++) {
+				FeatureValue featureValue = featureValues.getValue(i);
+				Boolean isMember = false;
 				int k = 1;
 				while (k <= members.size() & !isMember) {
 					NamedElement member = members.getValue(k-1);
 					isMember = featureValue.feature == member;
 					k = k + 1;
 				}
-				j = j + 1;
-			}
-			if (isMember) {
-				memberValues.addValue(featureValue);
+				if (isMember) {
+					memberValues.addValue(featureValue);
+				}
 			}
 		}
 

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

@@ -348,6 +348,16 @@ public void testTestDataStore() throws Exception {
     	assertEqualValues("output", output.get(0), 1, 2);
     }
 
+    public void testTestClassUnmarshaller() throws Exception {
+    	ParameterValueList output = execute("TestClassUnmarshaller");
+    	log.info("done");
+    	
+    	assertNotNull(output);
+    	assertEquals("output.size()", 2, output.size());
+    	assertEqualValues("x", output.get(0), 0);
+    	assertEqualValues("y", output.get(1), 1, 2);
+    }
+
     private ParameterValueList execute(String activityName)
     {
         Behavior behavior = environment.findBehavior(activityName);