Author: rahul
Date: Wed Sep 22 17:37:24 2010
New Revision: 1000100
URL: http://svn.apache.org/viewvc?rev=1000100&view=rev
Log:
Javadoc notes and a typo.
Modified:
commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml/semantics/SCXMLSemanticsImpl.java
Modified:
commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml/semantics/SCXMLSemanticsImpl.java
URL:
http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml/semantics/SCXMLSemanticsImpl.java?rev=1000100&r1=1000099&r2=1000100&view=diff
==============================================================================
---
commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml/semantics/SCXMLSemanticsImpl.java
(original)
+++
commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml/semantics/SCXMLSemanticsImpl.java
Wed Sep 22 17:37:24 2010
@@ -453,7 +453,7 @@ public class SCXMLSemanticsImpl implemen
removeList.add(t);
break; //it makes no sense to waste cycles with t
} else if (SCXMLHelper.isDescendant(tsrc, t2src)) {
- //t takes precendence over t2
+ //t takes precedence over t2
removeList.add(t2);
} else {
//add both to the non-determinism candidates
@@ -467,6 +467,7 @@ public class SCXMLSemanticsImpl implemen
if (nonDeterm.size() > 0) {
// if not, first one in each state / region (which is also
// first in document order) wins
+ // NOTE: Self or stay transitions are conflict-free
Set regions = new HashSet();
Iterator iter = nonDeterm.iterator();
while (iter.hasNext()) {
