commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbe...@apache.org
Subject svn commit: r954065 - in /commons/sandbox/gsoc/2010/scxml-js/trunk: src/scxml/cgf/SCXMLCompiler.js test/xslt/AbstractStatechartGenerator.xsl
Date Sat, 12 Jun 2010 19:35:48 GMT
Author: jbeard
Date: Sat Jun 12 19:35:48 2010
New Revision: 954065

URL: http://svn.apache.org/viewvc?rev=954065&view=rev
Log:
Fixed problem with js_beautify. Was breaking because we were passing it a Java string. Works
well now.

Modified:
    commons/sandbox/gsoc/2010/scxml-js/trunk/src/scxml/cgf/SCXMLCompiler.js
    commons/sandbox/gsoc/2010/scxml-js/trunk/test/xslt/AbstractStatechartGenerator.xsl

Modified: commons/sandbox/gsoc/2010/scxml-js/trunk/src/scxml/cgf/SCXMLCompiler.js
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-js/trunk/src/scxml/cgf/SCXMLCompiler.js?rev=954065&r1=954064&r2=954065&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-js/trunk/src/scxml/cgf/SCXMLCompiler.js (original)
+++ commons/sandbox/gsoc/2010/scxml-js/trunk/src/scxml/cgf/SCXMLCompiler.js Sat Jun 12 19:35:48
2010
@@ -350,7 +350,6 @@ require.def("src/scxml/cgf/SCXMLCompiler
 				//return scxmlRoot;
 
 				//do transforms
-				debugger;
 				importPackage(javax.xml.transform);
 				importPackage(javax.xml.transform.stream);
 				importClass(java.io.StringWriter);
@@ -373,13 +372,12 @@ require.def("src/scxml/cgf/SCXMLCompiler
 				*/
 
 				transformer.transform(new StreamSource("build/tmp.xml"), new StreamResult(outWriter));
-				var transformedJs = outWriter.toString();
+				var transformedJs = new String(outWriter.toString());	//convert him from Java string
to js string for js_beautify
 
-				/*
 				if(options.beautify){
-					transformedJs = js_beautify(transformedJs,{});
+					debugger;
+					transformedJs = js_beautify(transformedJs);
 				}
-				*/
 
 				return transformedJs; 
 

Modified: commons/sandbox/gsoc/2010/scxml-js/trunk/test/xslt/AbstractStatechartGenerator.xsl
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-js/trunk/test/xslt/AbstractStatechartGenerator.xsl?rev=954065&r1=954064&r2=954065&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-js/trunk/test/xslt/AbstractStatechartGenerator.xsl (original)
+++ commons/sandbox/gsoc/2010/scxml-js/trunk/test/xslt/AbstractStatechartGenerator.xsl Sat
Jun 12 19:35:48 2010
@@ -583,9 +583,6 @@
 		</for-each>
 
 		//update configuration
-		<message>
-			<copy-of select="$s"/>
-		</message>
 		<choose>
 			<when test="$s/@c:isParallelSubstate and not($t/@c:exitsParallelRegion)">
 				<call-template name="genParallelSubstateConfigurationSetString">



Mime
View raw message