Merge pull request #37 from ModelDriven/FUML15-12

FUML15-12 fUML should include streaming

Author: seidewitz

org.modeldriven.fuml/.classpath

@@ -34,6 +34,6 @@
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/3"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>

org.modeldriven.fuml/log4j.properties

@@ -3,7 +3,7 @@
 #Valid values are:  OFF, FATAL, ERROR, WARN, INFO, DEBUG, ALL
 log4j.threshold=ALL
 
-log4j.rootLogger=ERROR, console
+log4j.rootLogger=ERROR, fumllog
 
 # Set to DEBUG to see full execution trace logging.
 # Set to INFO to see subset execution event logging.
@@ -23,10 +23,10 @@ log4j.category.org.modeldriven.fuml.meta=INFO
 log4j.category.org.modeldriven.fuml.io=INFO
 
 # fumllog appender settings for rootLogger.
-log4j.appender.fumllog=org.apache.log4j.DailyRollingFileAppender
+log4j.appender.fumllog=org.apache.log4j.FileAppender
 log4j.appender.fumllog.File=fuml.log
-log4j.appender.fumllog.DatePattern='.'yyyy-MM-dd
-log4j.appender.fumllog.Append=true
+# log4j.appender.fumllog.DatePattern='.'yyyy-MM-dd
+log4j.appender.fumllog.Append=false
 log4j.appender.fumllog.layout=org.apache.log4j.PatternLayout
 log4j.appender.fumllog.layout.ConversionPattern=%d{dd MMM yyyy HH:mm:ss,SSS} %-5p [%t] %c{2} %m%n
 

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

@@ -165,22 +165,10 @@ public fuml.semantics.activities.TokenList completeAction() {
 	} // completeAction
 
 	public boolean isReady() {
-		// In addition to the default condition, check that, if the action has
-		// isLocallyReentrant=false, then the activation is not currently
-		// firing,
-		// and that the sources of all incoming edges (control flows) have
-		// offers and all input pin activations are ready.
-		// [This assumes that all edges directly incoming to the action are
-		// control flows.]
+		// Check that the action is ready to fire, including
+		// that all input pin activations are ready.
 
-		boolean ready = super.isReady()
-				& (((Action) this.node).isLocallyReentrant | !this.isFiring());
-
-		int i = 1;
-		while (ready & i <= this.incomingEdges.size()) {
-			ready = this.incomingEdges.getValue(i - 1).hasOffer();
-			i = i + 1;
-		}
+		boolean ready = isControlReady();
 
 		InputPinList inputPins = ((Action) (this.node)).input;
 		int j = 1;
@@ -191,6 +179,25 @@ public boolean isReady() {
 
 		return ready;
 	} // isReady
+	
+	public boolean isControlReady() {
+		// In addition to the default condition for being ready, check that, 
+		// if the action has isLocallyReentrant=false, then the activation is 
+		// not currently firing, and that the sources of all incoming edges
+		// have offers. (This assumes that all edges directly incoming to the
+		// action are control flows.)
+		
+		boolean ready = super.isReady()
+				& (((Action) this.node).isLocallyReentrant | !this.isFiring());
+
+		int i = 1;
+		while (ready & i <= this.incomingEdges.size()) {
+			ready = this.incomingEdges.getValue(i - 1).hasOffer();
+			i = i + 1;
+		}
+
+		return ready;
+	}
 
 	public boolean isFiring() {
 		// Indicate whether this action activation is currently firing or not.
@@ -206,7 +213,7 @@ public void sendOffers() {
 		Action action = (Action) (this.node);
 
 		// *** Send offers from all output pins concurrently. ***
-		OutputPinList outputPins = action.output;
+		OutputPinList outputPins = this.getOfferingOutputPins();
 		for (Iterator i = outputPins.iterator(); i.hasNext();) {
 			OutputPin outputPin = (OutputPin) i.next();
 			PinActivation pinActivation = this.getPinActivation(outputPin);
@@ -221,6 +228,15 @@ public void sendOffers() {
 			this.outgoingEdges.getValue(0).sendOffer(tokens);
 		}
 	} // sendOffers
+	
+	public OutputPinList getOfferingOutputPins() {
+		// Return the output pins of the action of this action activation from 
+		// which offers are to be sent when the action activation finishes firing.
+		// (This is normally all the output pins of the action, but it can be
+		// overridden in subclasses to only return a subset of the output pins.)
+		
+		return ((Action)this.node).output;
+	}
 
 	public void createNodeActivations() {
 		// Create node activations for the input and output pins of the action