Return-Path: 
 <commits-return-14667-apmail-commons-commits-archive=commons.apache.org@commons.apache.org>
Delivered-To: apmail-commons-commits-archive@minotaur.apache.org
Received: (qmail 83585 invoked from network); 7 Nov 2010 09:41:49 -0000
Received: from unknown (HELO mail.apache.org) (140.211.11.3)
  by 140.211.11.9 with SMTP; 7 Nov 2010 09:41:49 -0000
Received: (qmail 57381 invoked by uid 500); 7 Nov 2010 09:42:20 -0000
Delivered-To: apmail-commons-commits-archive@commons.apache.org
Received: (qmail 57321 invoked by uid 500); 7 Nov 2010 09:42:20 -0000
Mailing-List: contact commits-help@commons.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@commons.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@commons.apache.org>
List-Post: <mailto:commits@commons.apache.org>
List-Id: <commits.commons.apache.org>
Reply-To: dev@commons.apache.org
Delivered-To: mailing list commits@commons.apache.org
Received: (qmail 57314 invoked by uid 99); 7 Nov 2010 09:42:20 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 07 Nov 2010 09:42:20 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 07 Nov 2010 09:42:17 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 750BB238896F; Sun,  7 Nov 2010 09:41:03 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1032247 - in
 /commons/sandbox/gsoc/2010/scxml-js/trunk/src/xslt/backends/js:
 AbstractEnumeratedStatechartGenerator.xsl AbstractStatechartGenerator.xsl
 StatePatternStatechartGenerator.xsl SwitchyardStatechartGenerator.xsl
Date: Sun, 07 Nov 2010 09:41:03 -0000
To: commits@commons.apache.org
From: jbeard@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20101107094103.750BB238896F@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: jbeard
Date: Sun Nov  7 09:41:02 2010
New Revision: 1032247

URL: http://svn.apache.org/viewvc?rev=1032247&view=rev
Log:
Finishing previous commit. All tests pass for all strategies.

Modified:
    commons/sandbox/gsoc/2010/scxml-js/trunk/src/xslt/backends/js/AbstractEnumeratedStatechartGenerator.xsl
    commons/sandbox/gsoc/2010/scxml-js/trunk/src/xslt/backends/js/AbstractStatechartGenerator.xsl
    commons/sandbox/gsoc/2010/scxml-js/trunk/src/xslt/backends/js/StatePatternStatechartGenerator.xsl
    commons/sandbox/gsoc/2010/scxml-js/trunk/src/xslt/backends/js/SwitchyardStatechartGenerator.xsl

Modified: commons/sandbox/gsoc/2010/scxml-js/trunk/src/xslt/backends/js/AbstractEnumeratedStatechartGenerator.xsl
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-js/trunk/src/xslt/backends/js/AbstractEnumeratedStatechartGenerator.xsl?rev=1032247&r1=1032246&r2=1032247&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-js/trunk/src/xslt/backends/js/AbstractEnumeratedStatechartGenerator.xsl (original)
+++ commons/sandbox/gsoc/2010/scxml-js/trunk/src/xslt/backends/js/AbstractEnumeratedStatechartGenerator.xsl Sun Nov  7 09:41:02 2010
@@ -139,8 +139,7 @@
 						&amp;&amp; <value-of select="@cond"/>
 					</if>){
 
-					<value-of select="@c:tName"/>();
-					break;
+					return <value-of select="@c:tName"/>();
 				}
 			</for-each>
 			break;
@@ -301,6 +300,21 @@
 		</choose>
 	</template>
 
+	<template name="genPreemptedBasicStatesSet">
+		<param name="t"/>
+		
+		{
+			<!-- TODO: move this out into subclasses -->
+			<for-each select="$t/c:basicStateDescendantsOfLCA/c:basicStateDescendant">
+				<variable name="basicStateDescendantId" select="text()"/>
+				<variable name="descendantState" select="$allStates[@id=$basicStateDescendantId]"/>
+				<value-of select="$descendantState/@c:stateNum - 1"/> : true
+				<if test="position() != last()">,</if>
+			</for-each>
+		}
+	</template>
+
+
 	<template name="genStateHooks"/>
 	<template name="genEnumeratedHooks"/>
 	<template name="genTriggerIntEnum"/>

Modified: commons/sandbox/gsoc/2010/scxml-js/trunk/src/xslt/backends/js/AbstractStatechartGenerator.xsl
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-js/trunk/src/xslt/backends/js/AbstractStatechartGenerator.xsl?rev=1032247&r1=1032246&r2=1032247&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-js/trunk/src/xslt/backends/js/AbstractStatechartGenerator.xsl (original)
+++ commons/sandbox/gsoc/2010/scxml-js/trunk/src/xslt/backends/js/AbstractStatechartGenerator.xsl Sun Nov  7 09:41:02 2010
@@ -1074,17 +1074,6 @@
 		</choose>
 	</template>
 
-	<template name="genPreemptedBasicStatesSet">
-		<param name="t"/>
-		
-		{
-			<for-each select="$t/c:basicStateDescendantsOfLCA/c:basicStateDescendant">
-				<value-of select="text()"/> : true
-				<if test="position() != last()">,</if>
-			</for-each>
-		}
-	</template>
-
 	<template name="genTriggerDispatcherInnerContents">
 		<param name="s"/>
 		<param name="t"/>

Modified: commons/sandbox/gsoc/2010/scxml-js/trunk/src/xslt/backends/js/StatePatternStatechartGenerator.xsl
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-js/trunk/src/xslt/backends/js/StatePatternStatechartGenerator.xsl?rev=1032247&r1=1032246&r2=1032247&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-js/trunk/src/xslt/backends/js/StatePatternStatechartGenerator.xsl (original)
+++ commons/sandbox/gsoc/2010/scxml-js/trunk/src/xslt/backends/js/StatePatternStatechartGenerator.xsl Sun Nov  7 09:41:02 2010
@@ -196,4 +196,16 @@
 		"<value-of select="$eventName"/>"
 	</template>
 
+       <template name="genPreemptedBasicStatesSet">
+               <param name="t"/>
+               
+               {
+                       <for-each select="$t/c:basicStateDescendantsOfLCA/c:basicStateDescendant">
+                               <value-of select="text()"/> : true
+                               <if test="position() != last()">,</if>
+                       </for-each>
+               }
+       </template>
+
+
 </stylesheet>

Modified: commons/sandbox/gsoc/2010/scxml-js/trunk/src/xslt/backends/js/SwitchyardStatechartGenerator.xsl
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-js/trunk/src/xslt/backends/js/SwitchyardStatechartGenerator.xsl?rev=1032247&r1=1032246&r2=1032247&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-js/trunk/src/xslt/backends/js/SwitchyardStatechartGenerator.xsl (original)
+++ commons/sandbox/gsoc/2010/scxml-js/trunk/src/xslt/backends/js/SwitchyardStatechartGenerator.xsl Sun Nov  7 09:41:02 2010
@@ -75,8 +75,7 @@
 		</variable>
 
 		case <value-of select="$eventName"/>:
-			<value-of select="$t/@c:tName"/>();
-			break;
+			return <value-of select="$t/@c:tName"/>();
 	</template>
 
 </stylesheet>