svn commit: r1000101 - /commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/semantics/SCXMLSemanticsImpl.java

[rahul]

Author: rahul
Date: Wed Sep 22 17:38:06 2010
New Revision: 1000101

URL: http://svn.apache.org/viewvc?rev=1000101&view=rev
Log:
Javadoc note and fixing a typo.

Modified:
    
commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/semantics/SCXMLSemanticsImpl.java

Modified: 
commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/semantics/SCXMLSemanticsImpl.java
URL: 
http://svn.apache.org/viewvc/commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/semantics/SCXMLSemanticsImpl.java?rev=1000101&r1=1000100&r2=1000101&view=diff
==============================================================================
--- 
commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/semantics/SCXMLSemanticsImpl.java
 (original)
+++ 
commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/semantics/SCXMLSemanticsImpl.java
 Wed Sep 22 17:38:06 2010
@@ -440,7 +440,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
@@ -454,6 +454,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<TransitionTarget> regions = new 
HashSet<TransitionTarget>();
                 for (Transition t : nonDeterm) {
                     TransitionTarget parent = t.getParent();