Added operations to CallEventExecution (OMG issue FUML13-16)

- Also renamed CallEventOccurrence::releaseCaller to returnFromCall.

Author: seidewitz

org.modeldriven.fuml/src/main/java/fUML/Semantics/Actions/CompleteActions/ReturnInformation.java

@@ -31,7 +31,7 @@ public void reply(ParameterValueList outputParameterValues) {
 		// releasing the caller.
 
 		this.callEventOccurrence.setOutputParameterValues(outputParameterValues);
-		this.callEventOccurrence.releaseCaller();
+		this.callEventOccurrence.returnFromCall();
 	}
 
 	@Override
@@ -84,7 +84,12 @@ public Value copy() {
 	public String toString() {
 		// Return a string representation of the return information.
 
-		return "ReturnInformation(" + callEventOccurrence.getOperation().name + ")";
+		String s = "ReturnInformation";
+		String name = callEventOccurrence.getOperation().name;
+		if (name != null) {
+			s = s + "(" + name + ")";
+		}
+		return s;
 	}
 
 }

org.modeldriven.fuml/src/main/java/fUML/Semantics/CommonBehaviors/Communications/CallEventBehavior.java

@@ -43,7 +43,11 @@ public void setOperation(Operation operation) {
 			this.member.addValue(parameter);
 			this.ownedParameter.addValue(parameter);
 		}
-		this.isReentrant = true;		
+		this.isReentrant = true;
+		this.name = "CallEventBehavior";
+		if (operation.name != null) {
+			this.name = this.name + "(" + operation.name + ")";
+		}
 	}
 
 }

org.modeldriven.fuml/src/main/java/fUML/Semantics/CommonBehaviors/Communications/CallEventExecution.java

@@ -9,7 +9,6 @@
 package fUML.Semantics.CommonBehaviors.Communications;
 
 import fUML.Debug;
-import fUML.Semantics.Classes.Kernel.Object_;
 import fUML.Semantics.Classes.Kernel.Reference;
 import fUML.Semantics.Classes.Kernel.Value;
 import fUML.Semantics.CommonBehaviors.BasicBehaviors.Execution;
@@ -22,7 +21,6 @@
 
 public class CallEventExecution extends Execution {
 
-	public Object_ caller = null;
 	public boolean callerSuspended = false;
 
 	public boolean isCallerSuspended() {
@@ -49,33 +47,54 @@ public void setCallerSuspended(boolean callerSuspended) {
 		_endIsolation();
 	}
 
-	public void suspend(){
+	public void suspendCaller() {
 		// Suspend the caller until the caller is released.
 
-		this.setCallerSuspended(true);
-		
-		do {
+		while(this.isCallerSuspended()) {
 			this.wait_();
-		} while(this.isCallerSuspended());
+		}
+		
+	}
+	
+	public void releaseCaller() {
+		// Release the caller, if suspended.
 
+		this.setCallerSuspended(false);
 	}
 
 	@Override
 	public void execute() {
-		// Send a new CallEventOccurrence to the target of this call
-		// (which is the context of this execution) and suspend the
-		// caller until the call is completed. Note that the
-		// call will never be completed if the target is not an active
-		// object, since then the object would then have no event
-		// pool in which the event occurrence could be placed.
+		// Make the call on the target object (which is the context of this execution) 
+		// and suspend the caller until the call is completed. 
+		
+		// Note: The callerSuspended flag needs to be set before the call is made,
+		// in case the call is immediately handled and returned, even before the
+		// suspend loop is started.
+		this.setCallerSuspended(true);
+		
+		this.makeCall();		
+		this.suspendCaller();		
+	}
+	
+	public void makeCall() {
+		// Make the call on the target object (which is the context of this execution)
+		// by sending a call event occurrence. (Note that the call will never be 
+		// completed if the target is not an active object, since then the object 
+		// would then have no event pool in which the event occurrence could be placed.)
 
 		Reference reference = new Reference();
-		reference.referent = this.context;
-
+		reference.referent = this.context;		
+		this.createEventOccurrence().sendTo(reference);		
+	}
+	
+	public EventOccurrence createEventOccurrence() {
+		// Create a call event occurrence associated with this call event execution.
+		// (This operation may be overridden in subclasses to alter how the event
+		// occurrence is create, e.g., if it is necessary to wrap it.)
+		
 		CallEventOccurrence eventOccurrence = new CallEventOccurrence();
 		eventOccurrence.execution = this;
-		eventOccurrence.sendTo(reference);
-		this.suspend();		
+		return eventOccurrence;
 	}
 
 	public Operation getOperation() {

org.modeldriven.fuml/src/main/java/fUML/Semantics/CommonBehaviors/Communications/CallEventOccurrence.java

@@ -43,27 +43,21 @@ public ParameterValueList getParameterValues() {
 		// this call event occurrence, which correspond to the values of the
 		// operation input parameters for the call.
 
-		ParameterValueList parameterValues = new ParameterValueList();
-		if (this.execution != null) {
-			parameterValues = this.execution.getInputParameterValues();
-		}			
-		return parameterValues;
+		return this.execution.getInputParameterValues();
 	}
 
 	public void setOutputParameterValues(ParameterValueList parameterValues) {
 		// Set the output parameter values of the call event execution for
 		// this call event occurrence, which correspond to the values of the
 		// operation output parameters for the call.
 
-		if (this.execution != null) {
-			this.execution.setOutputParameterValues(parameterValues);
-		}			
+		this.execution.setOutputParameterValues(parameterValues);
 	}
 
-	public void releaseCaller() {
+	public void returnFromCall() {
 		// Release the caller on return from the call.
 
-		this.execution.setCallerSuspended(false);
+		this.execution.releaseCaller();
 	}
 
 }

org.modeldriven.fuml/src/test/java/org/modeldriven/fuml/test/builtin/environment/ActivityFactory.java

@@ -1814,7 +1814,7 @@ public void createCallSender(String operationName, String signalName) {
 		NamedElement element = this.environment.getElement(signalName);
 
 		if (element == null || !(element instanceof Signal)) {
-			Debug.println("[createSender] " + signalName
+			Debug.println("[createCallSender] " + signalName
 					+ " does not exist or is not a signal.");
 			return;
 		}