commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject svn commit: r922280 [21/40] - in /websites/production/commons/content/proper/commons-scxml: ./ 0.5/ 0.6/ 0.7/ 0.8/ 0.9/ apidocs/ apidocs/org/apache/commons/scxml2/ apidocs/org/apache/commons/scxml2/class-use/ apidocs/org/apache/commons/scxml2/env/ apid...
Date Mon, 15 Sep 2014 13:36:45 GMT
Modified: websites/production/commons/content/proper/commons-scxml/apidocs/src-html/org/apache/commons/scxml2/env/SimpleScheduler.html
==============================================================================
--- websites/production/commons/content/proper/commons-scxml/apidocs/src-html/org/apache/commons/scxml2/env/SimpleScheduler.html (original)
+++ websites/production/commons/content/proper/commons-scxml/apidocs/src-html/org/apache/commons/scxml2/env/SimpleScheduler.html Mon Sep 15 13:36:40 2014
@@ -134,139 +134,128 @@
 <span class="sourceLineNo">126</span>                if (log.isWarnEnabled()) {<a name="line.126"></a>
 <span class="sourceLineNo">127</span>                    log.warn("&lt;send&gt;: Unavailable target - " + target);<a name="line.127"></a>
 <span class="sourceLineNo">128</span>                }<a name="line.128"></a>
-<span class="sourceLineNo">129</span>                try {<a name="line.129"></a>
-<span class="sourceLineNo">130</span>                    this.executor.triggerEvent(new TriggerEvent(<a name="line.130"></a>
-<span class="sourceLineNo">131</span>                        EVENT_ERR_SEND_TARGETUNAVAILABLE,<a name="line.131"></a>
-<span class="sourceLineNo">132</span>                        TriggerEvent.ERROR_EVENT));<a name="line.132"></a>
-<span class="sourceLineNo">133</span>                } catch (ModelException me) {<a name="line.133"></a>
-<span class="sourceLineNo">134</span>                    log.error(me.getMessage(), me);<a name="line.134"></a>
-<span class="sourceLineNo">135</span>                }<a name="line.135"></a>
-<span class="sourceLineNo">136</span>                return; // done<a name="line.136"></a>
-<span class="sourceLineNo">137</span>            }<a name="line.137"></a>
-<span class="sourceLineNo">138</span><a name="line.138"></a>
-<span class="sourceLineNo">139</span>            if (delay &gt; 0L) {<a name="line.139"></a>
-<span class="sourceLineNo">140</span>                // Need to schedule this one<a name="line.140"></a>
-<span class="sourceLineNo">141</span>                Timer timer = new Timer(true);<a name="line.141"></a>
-<span class="sourceLineNo">142</span>                timer.schedule(new DelayedEventTask(sendId, event, params), delay);<a name="line.142"></a>
-<span class="sourceLineNo">143</span>                timers.put(sendId, timer);<a name="line.143"></a>
-<span class="sourceLineNo">144</span>                if (log.isDebugEnabled()) {<a name="line.144"></a>
-<span class="sourceLineNo">145</span>                    log.debug("Scheduled event '" + event + "' with delay "<a name="line.145"></a>
-<span class="sourceLineNo">146</span>                        + delay + "ms, as specified by &lt;send&gt; with id '"<a name="line.146"></a>
-<span class="sourceLineNo">147</span>                        + sendId + "'");<a name="line.147"></a>
-<span class="sourceLineNo">148</span>                }<a name="line.148"></a>
-<span class="sourceLineNo">149</span>            }<a name="line.149"></a>
-<span class="sourceLineNo">150</span>            // else short-circuited by Send#execute()<a name="line.150"></a>
-<span class="sourceLineNo">151</span>            // TODO: Pass through in v1.0<a name="line.151"></a>
-<span class="sourceLineNo">152</span><a name="line.152"></a>
-<span class="sourceLineNo">153</span>        }<a name="line.153"></a>
-<span class="sourceLineNo">154</span><a name="line.154"></a>
-<span class="sourceLineNo">155</span>    }<a name="line.155"></a>
-<span class="sourceLineNo">156</span><a name="line.156"></a>
-<span class="sourceLineNo">157</span>    /**<a name="line.157"></a>
-<span class="sourceLineNo">158</span>     * Get the log instance.<a name="line.158"></a>
-<span class="sourceLineNo">159</span>     *<a name="line.159"></a>
-<span class="sourceLineNo">160</span>     * @return The current log instance<a name="line.160"></a>
-<span class="sourceLineNo">161</span>     */<a name="line.161"></a>
-<span class="sourceLineNo">162</span>    protected Log getLog() {<a name="line.162"></a>
-<span class="sourceLineNo">163</span>        return log;<a name="line.163"></a>
-<span class="sourceLineNo">164</span>    }<a name="line.164"></a>
-<span class="sourceLineNo">165</span><a name="line.165"></a>
-<span class="sourceLineNo">166</span>    /**<a name="line.166"></a>
-<span class="sourceLineNo">167</span>     * Get the current timers.<a name="line.167"></a>
-<span class="sourceLineNo">168</span>     *<a name="line.168"></a>
-<span class="sourceLineNo">169</span>     * @return The currently scheduled timers<a name="line.169"></a>
-<span class="sourceLineNo">170</span>     */<a name="line.170"></a>
-<span class="sourceLineNo">171</span>    protected Map&lt;String, Timer&gt; getTimers() {<a name="line.171"></a>
-<span class="sourceLineNo">172</span>        return timers;<a name="line.172"></a>
-<span class="sourceLineNo">173</span>    }<a name="line.173"></a>
-<span class="sourceLineNo">174</span><a name="line.174"></a>
-<span class="sourceLineNo">175</span>    /**<a name="line.175"></a>
-<span class="sourceLineNo">176</span>     * Get the executor we're attached to.<a name="line.176"></a>
-<span class="sourceLineNo">177</span>     *<a name="line.177"></a>
-<span class="sourceLineNo">178</span>     * @return The owning executor instance<a name="line.178"></a>
-<span class="sourceLineNo">179</span>     */<a name="line.179"></a>
-<span class="sourceLineNo">180</span>    protected SCXMLExecutor getExecutor() {<a name="line.180"></a>
-<span class="sourceLineNo">181</span>        return executor;<a name="line.181"></a>
-<span class="sourceLineNo">182</span>    }<a name="line.182"></a>
-<span class="sourceLineNo">183</span><a name="line.183"></a>
-<span class="sourceLineNo">184</span>    /**<a name="line.184"></a>
-<span class="sourceLineNo">185</span>     * TimerTask implementation.<a name="line.185"></a>
-<span class="sourceLineNo">186</span>     */<a name="line.186"></a>
-<span class="sourceLineNo">187</span>    class DelayedEventTask extends TimerTask {<a name="line.187"></a>
-<span class="sourceLineNo">188</span><a name="line.188"></a>
-<span class="sourceLineNo">189</span>        /**<a name="line.189"></a>
-<span class="sourceLineNo">190</span>         * The ID of the &amp;lt;send&amp;gt; element.<a name="line.190"></a>
-<span class="sourceLineNo">191</span>         */<a name="line.191"></a>
-<span class="sourceLineNo">192</span>        private String sendId;<a name="line.192"></a>
-<span class="sourceLineNo">193</span><a name="line.193"></a>
-<span class="sourceLineNo">194</span>        /**<a name="line.194"></a>
-<span class="sourceLineNo">195</span>         * The event name.<a name="line.195"></a>
-<span class="sourceLineNo">196</span>         */<a name="line.196"></a>
-<span class="sourceLineNo">197</span>        private String event;<a name="line.197"></a>
-<span class="sourceLineNo">198</span><a name="line.198"></a>
-<span class="sourceLineNo">199</span>        /**<a name="line.199"></a>
-<span class="sourceLineNo">200</span>         * The event payload, if any.<a name="line.200"></a>
-<span class="sourceLineNo">201</span>         */<a name="line.201"></a>
-<span class="sourceLineNo">202</span>        private Map&lt;String, Object&gt; payload;<a name="line.202"></a>
-<span class="sourceLineNo">203</span><a name="line.203"></a>
-<span class="sourceLineNo">204</span>        /**<a name="line.204"></a>
-<span class="sourceLineNo">205</span>         * Constructor.<a name="line.205"></a>
-<span class="sourceLineNo">206</span>         *<a name="line.206"></a>
-<span class="sourceLineNo">207</span>         * @param sendId The ID of the send element.<a name="line.207"></a>
-<span class="sourceLineNo">208</span>         * @param event The name of the event to be triggered.<a name="line.208"></a>
-<span class="sourceLineNo">209</span>         */<a name="line.209"></a>
-<span class="sourceLineNo">210</span>        DelayedEventTask(final String sendId, final String event) {<a name="line.210"></a>
-<span class="sourceLineNo">211</span>            this(sendId, event, null);<a name="line.211"></a>
-<span class="sourceLineNo">212</span>        }<a name="line.212"></a>
-<span class="sourceLineNo">213</span><a name="line.213"></a>
-<span class="sourceLineNo">214</span>        /**<a name="line.214"></a>
-<span class="sourceLineNo">215</span>         * Constructor for events with payload.<a name="line.215"></a>
-<span class="sourceLineNo">216</span>         *<a name="line.216"></a>
-<span class="sourceLineNo">217</span>         * @param sendId The ID of the send element.<a name="line.217"></a>
-<span class="sourceLineNo">218</span>         * @param event The name of the event to be triggered.<a name="line.218"></a>
-<span class="sourceLineNo">219</span>         * @param payload The event payload, if any.<a name="line.219"></a>
-<span class="sourceLineNo">220</span>         */<a name="line.220"></a>
-<span class="sourceLineNo">221</span>        DelayedEventTask(final String sendId, final String event,<a name="line.221"></a>
-<span class="sourceLineNo">222</span>                final Map&lt;String, Object&gt; payload) {<a name="line.222"></a>
-<span class="sourceLineNo">223</span>            super();<a name="line.223"></a>
-<span class="sourceLineNo">224</span>            this.sendId = sendId;<a name="line.224"></a>
-<span class="sourceLineNo">225</span>            this.event = event;<a name="line.225"></a>
-<span class="sourceLineNo">226</span>            this.payload = payload;<a name="line.226"></a>
-<span class="sourceLineNo">227</span>        }<a name="line.227"></a>
-<span class="sourceLineNo">228</span><a name="line.228"></a>
-<span class="sourceLineNo">229</span>        /**<a name="line.229"></a>
-<span class="sourceLineNo">230</span>         * What to do when timer expires.<a name="line.230"></a>
-<span class="sourceLineNo">231</span>         */<a name="line.231"></a>
-<span class="sourceLineNo">232</span>        @Override<a name="line.232"></a>
-<span class="sourceLineNo">233</span>        public void run() {<a name="line.233"></a>
-<span class="sourceLineNo">234</span>            timers.remove(sendId);<a name="line.234"></a>
-<span class="sourceLineNo">235</span>            try {<a name="line.235"></a>
-<span class="sourceLineNo">236</span>                executor.triggerEvent(new TriggerEvent(event,<a name="line.236"></a>
-<span class="sourceLineNo">237</span>                    TriggerEvent.SIGNAL_EVENT, payload));<a name="line.237"></a>
-<span class="sourceLineNo">238</span>            } catch (ModelException me) {<a name="line.238"></a>
-<span class="sourceLineNo">239</span>                log.error(me.getMessage(), me);<a name="line.239"></a>
-<span class="sourceLineNo">240</span>            }<a name="line.240"></a>
-<span class="sourceLineNo">241</span>            if (log.isDebugEnabled()) {<a name="line.241"></a>
-<span class="sourceLineNo">242</span>                log.debug("Fired event '" + event + "' as scheduled by "<a name="line.242"></a>
-<span class="sourceLineNo">243</span>                    + "&lt;send&gt; with id '" + sendId + "'");<a name="line.243"></a>
-<span class="sourceLineNo">244</span>            }<a name="line.244"></a>
-<span class="sourceLineNo">245</span>        }<a name="line.245"></a>
-<span class="sourceLineNo">246</span><a name="line.246"></a>
-<span class="sourceLineNo">247</span>    }<a name="line.247"></a>
+<span class="sourceLineNo">129</span>                this.executor.addEvent(new TriggerEvent(EVENT_ERR_SEND_TARGETUNAVAILABLE,TriggerEvent.ERROR_EVENT));<a name="line.129"></a>
+<span class="sourceLineNo">130</span>                return; // done<a name="line.130"></a>
+<span class="sourceLineNo">131</span>            }<a name="line.131"></a>
+<span class="sourceLineNo">132</span><a name="line.132"></a>
+<span class="sourceLineNo">133</span>            if (delay &gt; 0L) {<a name="line.133"></a>
+<span class="sourceLineNo">134</span>                // Need to schedule this one<a name="line.134"></a>
+<span class="sourceLineNo">135</span>                Timer timer = new Timer(true);<a name="line.135"></a>
+<span class="sourceLineNo">136</span>                timer.schedule(new DelayedEventTask(sendId, event, params), delay);<a name="line.136"></a>
+<span class="sourceLineNo">137</span>                timers.put(sendId, timer);<a name="line.137"></a>
+<span class="sourceLineNo">138</span>                if (log.isDebugEnabled()) {<a name="line.138"></a>
+<span class="sourceLineNo">139</span>                    log.debug("Scheduled event '" + event + "' with delay "<a name="line.139"></a>
+<span class="sourceLineNo">140</span>                        + delay + "ms, as specified by &lt;send&gt; with id '"<a name="line.140"></a>
+<span class="sourceLineNo">141</span>                        + sendId + "'");<a name="line.141"></a>
+<span class="sourceLineNo">142</span>                }<a name="line.142"></a>
+<span class="sourceLineNo">143</span>            }<a name="line.143"></a>
+<span class="sourceLineNo">144</span>            // else short-circuited by Send#execute()<a name="line.144"></a>
+<span class="sourceLineNo">145</span>            // TODO: Pass through in v1.0<a name="line.145"></a>
+<span class="sourceLineNo">146</span><a name="line.146"></a>
+<span class="sourceLineNo">147</span>        }<a name="line.147"></a>
+<span class="sourceLineNo">148</span><a name="line.148"></a>
+<span class="sourceLineNo">149</span>    }<a name="line.149"></a>
+<span class="sourceLineNo">150</span><a name="line.150"></a>
+<span class="sourceLineNo">151</span>    /**<a name="line.151"></a>
+<span class="sourceLineNo">152</span>     * Get the log instance.<a name="line.152"></a>
+<span class="sourceLineNo">153</span>     *<a name="line.153"></a>
+<span class="sourceLineNo">154</span>     * @return The current log instance<a name="line.154"></a>
+<span class="sourceLineNo">155</span>     */<a name="line.155"></a>
+<span class="sourceLineNo">156</span>    protected Log getLog() {<a name="line.156"></a>
+<span class="sourceLineNo">157</span>        return log;<a name="line.157"></a>
+<span class="sourceLineNo">158</span>    }<a name="line.158"></a>
+<span class="sourceLineNo">159</span><a name="line.159"></a>
+<span class="sourceLineNo">160</span>    /**<a name="line.160"></a>
+<span class="sourceLineNo">161</span>     * Get the current timers.<a name="line.161"></a>
+<span class="sourceLineNo">162</span>     *<a name="line.162"></a>
+<span class="sourceLineNo">163</span>     * @return The currently scheduled timers<a name="line.163"></a>
+<span class="sourceLineNo">164</span>     */<a name="line.164"></a>
+<span class="sourceLineNo">165</span>    protected Map&lt;String, Timer&gt; getTimers() {<a name="line.165"></a>
+<span class="sourceLineNo">166</span>        return timers;<a name="line.166"></a>
+<span class="sourceLineNo">167</span>    }<a name="line.167"></a>
+<span class="sourceLineNo">168</span><a name="line.168"></a>
+<span class="sourceLineNo">169</span>    /**<a name="line.169"></a>
+<span class="sourceLineNo">170</span>     * Get the executor we're attached to.<a name="line.170"></a>
+<span class="sourceLineNo">171</span>     *<a name="line.171"></a>
+<span class="sourceLineNo">172</span>     * @return The owning executor instance<a name="line.172"></a>
+<span class="sourceLineNo">173</span>     */<a name="line.173"></a>
+<span class="sourceLineNo">174</span>    protected SCXMLExecutor getExecutor() {<a name="line.174"></a>
+<span class="sourceLineNo">175</span>        return executor;<a name="line.175"></a>
+<span class="sourceLineNo">176</span>    }<a name="line.176"></a>
+<span class="sourceLineNo">177</span><a name="line.177"></a>
+<span class="sourceLineNo">178</span>    /**<a name="line.178"></a>
+<span class="sourceLineNo">179</span>     * TimerTask implementation.<a name="line.179"></a>
+<span class="sourceLineNo">180</span>     */<a name="line.180"></a>
+<span class="sourceLineNo">181</span>    class DelayedEventTask extends TimerTask {<a name="line.181"></a>
+<span class="sourceLineNo">182</span><a name="line.182"></a>
+<span class="sourceLineNo">183</span>        /**<a name="line.183"></a>
+<span class="sourceLineNo">184</span>         * The ID of the &amp;lt;send&amp;gt; element.<a name="line.184"></a>
+<span class="sourceLineNo">185</span>         */<a name="line.185"></a>
+<span class="sourceLineNo">186</span>        private String sendId;<a name="line.186"></a>
+<span class="sourceLineNo">187</span><a name="line.187"></a>
+<span class="sourceLineNo">188</span>        /**<a name="line.188"></a>
+<span class="sourceLineNo">189</span>         * The event name.<a name="line.189"></a>
+<span class="sourceLineNo">190</span>         */<a name="line.190"></a>
+<span class="sourceLineNo">191</span>        private String event;<a name="line.191"></a>
+<span class="sourceLineNo">192</span><a name="line.192"></a>
+<span class="sourceLineNo">193</span>        /**<a name="line.193"></a>
+<span class="sourceLineNo">194</span>         * The event payload, if any.<a name="line.194"></a>
+<span class="sourceLineNo">195</span>         */<a name="line.195"></a>
+<span class="sourceLineNo">196</span>        private Map&lt;String, Object&gt; payload;<a name="line.196"></a>
+<span class="sourceLineNo">197</span><a name="line.197"></a>
+<span class="sourceLineNo">198</span>        /**<a name="line.198"></a>
+<span class="sourceLineNo">199</span>         * Constructor.<a name="line.199"></a>
+<span class="sourceLineNo">200</span>         *<a name="line.200"></a>
+<span class="sourceLineNo">201</span>         * @param sendId The ID of the send element.<a name="line.201"></a>
+<span class="sourceLineNo">202</span>         * @param event The name of the event to be triggered.<a name="line.202"></a>
+<span class="sourceLineNo">203</span>         */<a name="line.203"></a>
+<span class="sourceLineNo">204</span>        DelayedEventTask(final String sendId, final String event) {<a name="line.204"></a>
+<span class="sourceLineNo">205</span>            this(sendId, event, null);<a name="line.205"></a>
+<span class="sourceLineNo">206</span>        }<a name="line.206"></a>
+<span class="sourceLineNo">207</span><a name="line.207"></a>
+<span class="sourceLineNo">208</span>        /**<a name="line.208"></a>
+<span class="sourceLineNo">209</span>         * Constructor for events with payload.<a name="line.209"></a>
+<span class="sourceLineNo">210</span>         *<a name="line.210"></a>
+<span class="sourceLineNo">211</span>         * @param sendId The ID of the send element.<a name="line.211"></a>
+<span class="sourceLineNo">212</span>         * @param event The name of the event to be triggered.<a name="line.212"></a>
+<span class="sourceLineNo">213</span>         * @param payload The event payload, if any.<a name="line.213"></a>
+<span class="sourceLineNo">214</span>         */<a name="line.214"></a>
+<span class="sourceLineNo">215</span>        DelayedEventTask(final String sendId, final String event,<a name="line.215"></a>
+<span class="sourceLineNo">216</span>                final Map&lt;String, Object&gt; payload) {<a name="line.216"></a>
+<span class="sourceLineNo">217</span>            super();<a name="line.217"></a>
+<span class="sourceLineNo">218</span>            this.sendId = sendId;<a name="line.218"></a>
+<span class="sourceLineNo">219</span>            this.event = event;<a name="line.219"></a>
+<span class="sourceLineNo">220</span>            this.payload = payload;<a name="line.220"></a>
+<span class="sourceLineNo">221</span>        }<a name="line.221"></a>
+<span class="sourceLineNo">222</span><a name="line.222"></a>
+<span class="sourceLineNo">223</span>        /**<a name="line.223"></a>
+<span class="sourceLineNo">224</span>         * What to do when timer expires.<a name="line.224"></a>
+<span class="sourceLineNo">225</span>         */<a name="line.225"></a>
+<span class="sourceLineNo">226</span>        @Override<a name="line.226"></a>
+<span class="sourceLineNo">227</span>        public void run() {<a name="line.227"></a>
+<span class="sourceLineNo">228</span>            timers.remove(sendId);<a name="line.228"></a>
+<span class="sourceLineNo">229</span>            executor.addEvent(new TriggerEvent(event, TriggerEvent.SIGNAL_EVENT, payload));<a name="line.229"></a>
+<span class="sourceLineNo">230</span>            if (log.isDebugEnabled()) {<a name="line.230"></a>
+<span class="sourceLineNo">231</span>                log.debug("Fired event '" + event + "' as scheduled by "<a name="line.231"></a>
+<span class="sourceLineNo">232</span>                    + "&lt;send&gt; with id '" + sendId + "'");<a name="line.232"></a>
+<span class="sourceLineNo">233</span>            }<a name="line.233"></a>
+<span class="sourceLineNo">234</span>        }<a name="line.234"></a>
+<span class="sourceLineNo">235</span><a name="line.235"></a>
+<span class="sourceLineNo">236</span>    }<a name="line.236"></a>
+<span class="sourceLineNo">237</span><a name="line.237"></a>
+<span class="sourceLineNo">238</span>    /**<a name="line.238"></a>
+<span class="sourceLineNo">239</span>     * The default target type.<a name="line.239"></a>
+<span class="sourceLineNo">240</span>     */<a name="line.240"></a>
+<span class="sourceLineNo">241</span>    private static final String TYPE_SCXML = "scxml";<a name="line.241"></a>
+<span class="sourceLineNo">242</span><a name="line.242"></a>
+<span class="sourceLineNo">243</span>    /**<a name="line.243"></a>
+<span class="sourceLineNo">244</span>     * The spec mandated derived event when target cannot be reached.<a name="line.244"></a>
+<span class="sourceLineNo">245</span>     */<a name="line.245"></a>
+<span class="sourceLineNo">246</span>    private static final String EVENT_ERR_SEND_TARGETUNAVAILABLE =<a name="line.246"></a>
+<span class="sourceLineNo">247</span>        "error.send.targetunavailable";<a name="line.247"></a>
 <span class="sourceLineNo">248</span><a name="line.248"></a>
-<span class="sourceLineNo">249</span>    /**<a name="line.249"></a>
-<span class="sourceLineNo">250</span>     * The default target type.<a name="line.250"></a>
-<span class="sourceLineNo">251</span>     */<a name="line.251"></a>
-<span class="sourceLineNo">252</span>    private static final String TYPE_SCXML = "scxml";<a name="line.252"></a>
-<span class="sourceLineNo">253</span><a name="line.253"></a>
-<span class="sourceLineNo">254</span>    /**<a name="line.254"></a>
-<span class="sourceLineNo">255</span>     * The spec mandated derived event when target cannot be reached.<a name="line.255"></a>
-<span class="sourceLineNo">256</span>     */<a name="line.256"></a>
-<span class="sourceLineNo">257</span>    private static final String EVENT_ERR_SEND_TARGETUNAVAILABLE =<a name="line.257"></a>
-<span class="sourceLineNo">258</span>        "error.send.targetunavailable";<a name="line.258"></a>
-<span class="sourceLineNo">259</span><a name="line.259"></a>
-<span class="sourceLineNo">260</span>}<a name="line.260"></a>
-<span class="sourceLineNo">261</span><a name="line.261"></a>
+<span class="sourceLineNo">249</span>}<a name="line.249"></a>
+<span class="sourceLineNo">250</span><a name="line.250"></a>
 
 
 

Modified: websites/production/commons/content/proper/commons-scxml/apidocs/src-html/org/apache/commons/scxml2/invoke/SimpleSCXMLInvoker.html
==============================================================================
--- websites/production/commons/content/proper/commons-scxml/apidocs/src-html/org/apache/commons/scxml2/invoke/SimpleSCXMLInvoker.html (original)
+++ websites/production/commons/content/proper/commons-scxml/apidocs/src-html/org/apache/commons/scxml2/invoke/SimpleSCXMLInvoker.html Mon Sep 15 13:36:40 2014
@@ -133,32 +133,24 @@
 <span class="sourceLineNo">125</span>            return; // no further processing should take place<a name="line.125"></a>
 <span class="sourceLineNo">126</span>        }<a name="line.126"></a>
 <span class="sourceLineNo">127</span>        boolean doneBefore = executor.getCurrentStatus().isFinal();<a name="line.127"></a>
-<span class="sourceLineNo">128</span>        try {<a name="line.128"></a>
-<span class="sourceLineNo">129</span>            executor.triggerEvent(evt);<a name="line.129"></a>
-<span class="sourceLineNo">130</span>        } catch (ModelException me) {<a name="line.130"></a>
-<span class="sourceLineNo">131</span>            throw new InvokerException(me.getMessage(), me.getCause());<a name="line.131"></a>
+<span class="sourceLineNo">128</span>        executor.addEvent(evt);<a name="line.128"></a>
+<span class="sourceLineNo">129</span>        if (!doneBefore &amp;&amp; executor.getCurrentStatus().isFinal()) {<a name="line.129"></a>
+<span class="sourceLineNo">130</span>            TriggerEvent te = new TriggerEvent("done.invoke."+parentStateId,TriggerEvent.SIGNAL_EVENT);<a name="line.130"></a>
+<span class="sourceLineNo">131</span>            new AsyncTrigger(parentIOProcessor, te).start();<a name="line.131"></a>
 <span class="sourceLineNo">132</span>        }<a name="line.132"></a>
-<span class="sourceLineNo">133</span>        if (!doneBefore &amp;&amp; executor.getCurrentStatus().isFinal()) {<a name="line.133"></a>
-<span class="sourceLineNo">134</span>            TriggerEvent te = new TriggerEvent("done.invoke."+parentStateId,TriggerEvent.SIGNAL_EVENT);<a name="line.134"></a>
-<span class="sourceLineNo">135</span>            new AsyncTrigger(parentIOProcessor, te).start();<a name="line.135"></a>
-<span class="sourceLineNo">136</span>        }<a name="line.136"></a>
-<span class="sourceLineNo">137</span>    }<a name="line.137"></a>
-<span class="sourceLineNo">138</span><a name="line.138"></a>
-<span class="sourceLineNo">139</span>    /**<a name="line.139"></a>
-<span class="sourceLineNo">140</span>     * {@inheritDoc}.<a name="line.140"></a>
-<span class="sourceLineNo">141</span>     */<a name="line.141"></a>
-<span class="sourceLineNo">142</span>    public void cancel()<a name="line.142"></a>
-<span class="sourceLineNo">143</span>    throws InvokerException {<a name="line.143"></a>
-<span class="sourceLineNo">144</span>        cancelled = true;<a name="line.144"></a>
-<span class="sourceLineNo">145</span>        try {<a name="line.145"></a>
-<span class="sourceLineNo">146</span>            executor.triggerEvent(new TriggerEvent("cancel.invoke."+parentStateId, TriggerEvent.CANCEL_EVENT));<a name="line.146"></a>
-<span class="sourceLineNo">147</span>        } catch (ModelException me) {<a name="line.147"></a>
-<span class="sourceLineNo">148</span>            throw new InvokerException(me.getMessage(), me.getCause());<a name="line.148"></a>
-<span class="sourceLineNo">149</span>        }<a name="line.149"></a>
-<span class="sourceLineNo">150</span>    }<a name="line.150"></a>
-<span class="sourceLineNo">151</span><a name="line.151"></a>
-<span class="sourceLineNo">152</span>}<a name="line.152"></a>
-<span class="sourceLineNo">153</span><a name="line.153"></a>
+<span class="sourceLineNo">133</span>    }<a name="line.133"></a>
+<span class="sourceLineNo">134</span><a name="line.134"></a>
+<span class="sourceLineNo">135</span>    /**<a name="line.135"></a>
+<span class="sourceLineNo">136</span>     * {@inheritDoc}.<a name="line.136"></a>
+<span class="sourceLineNo">137</span>     */<a name="line.137"></a>
+<span class="sourceLineNo">138</span>    public void cancel()<a name="line.138"></a>
+<span class="sourceLineNo">139</span>    throws InvokerException {<a name="line.139"></a>
+<span class="sourceLineNo">140</span>        cancelled = true;<a name="line.140"></a>
+<span class="sourceLineNo">141</span>        executor.addEvent(new TriggerEvent("cancel.invoke."+parentStateId, TriggerEvent.CANCEL_EVENT));<a name="line.141"></a>
+<span class="sourceLineNo">142</span>    }<a name="line.142"></a>
+<span class="sourceLineNo">143</span><a name="line.143"></a>
+<span class="sourceLineNo">144</span>}<a name="line.144"></a>
+<span class="sourceLineNo">145</span><a name="line.145"></a>
 
 
 

Modified: websites/production/commons/content/proper/commons-scxml/apidocs/src-html/org/apache/commons/scxml2/model/Action.html
==============================================================================
--- websites/production/commons/content/proper/commons-scxml/apidocs/src-html/org/apache/commons/scxml2/model/Action.html (original)
+++ websites/production/commons/content/proper/commons-scxml/apidocs/src-html/org/apache/commons/scxml2/model/Action.html Mon Sep 15 13:36:40 2014
@@ -110,41 +110,45 @@
 <span class="sourceLineNo">102</span>            // global script doesn't have a EnterableState<a name="line.102"></a>
 <span class="sourceLineNo">103</span>            return null;<a name="line.103"></a>
 <span class="sourceLineNo">104</span>        }<a name="line.104"></a>
-<span class="sourceLineNo">105</span>        TransitionTarget tt = parent.getParent();<a name="line.105"></a>
-<span class="sourceLineNo">106</span>        if (tt instanceof EnterableState) {<a name="line.106"></a>
-<span class="sourceLineNo">107</span>            return (EnterableState)tt;<a name="line.107"></a>
-<span class="sourceLineNo">108</span>        } else if (tt instanceof History) {<a name="line.108"></a>
-<span class="sourceLineNo">109</span>            return ((History)tt).getParent();<a name="line.109"></a>
-<span class="sourceLineNo">110</span>        } else {<a name="line.110"></a>
-<span class="sourceLineNo">111</span>            throw new ModelException("Unknown TransitionTarget subclass:"<a name="line.111"></a>
-<span class="sourceLineNo">112</span>                    + tt.getClass().getName());<a name="line.112"></a>
-<span class="sourceLineNo">113</span>        }<a name="line.113"></a>
-<span class="sourceLineNo">114</span>    }<a name="line.114"></a>
-<span class="sourceLineNo">115</span><a name="line.115"></a>
-<span class="sourceLineNo">116</span>    /**<a name="line.116"></a>
-<span class="sourceLineNo">117</span>     * Execute this action instance.<a name="line.117"></a>
-<span class="sourceLineNo">118</span>     *<a name="line.118"></a>
-<span class="sourceLineNo">119</span>     * @param exctx The ActionExecutionContext for this execution instance<a name="line.119"></a>
-<span class="sourceLineNo">120</span>     *<a name="line.120"></a>
-<span class="sourceLineNo">121</span>     * @throws ModelException If the execution causes the model to enter<a name="line.121"></a>
-<span class="sourceLineNo">122</span>     *                        a non-deterministic state.<a name="line.122"></a>
-<span class="sourceLineNo">123</span>     * @throws SCXMLExpressionException If the execution involves trying<a name="line.123"></a>
-<span class="sourceLineNo">124</span>     *                        to evaluate an expression which is malformed.<a name="line.124"></a>
-<span class="sourceLineNo">125</span>     */<a name="line.125"></a>
-<span class="sourceLineNo">126</span>    public abstract void execute(ActionExecutionContext exctx) throws ModelException, SCXMLExpressionException;<a name="line.126"></a>
-<span class="sourceLineNo">127</span><a name="line.127"></a>
-<span class="sourceLineNo">128</span>    /**<a name="line.128"></a>
-<span class="sourceLineNo">129</span>     * Return the key under which the current document namespaces are saved<a name="line.129"></a>
-<span class="sourceLineNo">130</span>     * in the parent state's context.<a name="line.130"></a>
-<span class="sourceLineNo">131</span>     *<a name="line.131"></a>
-<span class="sourceLineNo">132</span>     * @return The namespaces key<a name="line.132"></a>
-<span class="sourceLineNo">133</span>     */<a name="line.133"></a>
-<span class="sourceLineNo">134</span>    protected static String getNamespacesKey() {<a name="line.134"></a>
-<span class="sourceLineNo">135</span>        return Context.NAMESPACES_KEY;<a name="line.135"></a>
-<span class="sourceLineNo">136</span>    }<a name="line.136"></a>
-<span class="sourceLineNo">137</span><a name="line.137"></a>
-<span class="sourceLineNo">138</span>}<a name="line.138"></a>
-<span class="sourceLineNo">139</span><a name="line.139"></a>
+<span class="sourceLineNo">105</span>        else if (parent == null) {<a name="line.105"></a>
+<span class="sourceLineNo">106</span>            throw new ModelException("Action "<a name="line.106"></a>
+<span class="sourceLineNo">107</span>                    + this.getClass().getName() + " instance missing required parent TransitionTarget");<a name="line.107"></a>
+<span class="sourceLineNo">108</span>        }<a name="line.108"></a>
+<span class="sourceLineNo">109</span>        TransitionTarget tt = parent.getParent();<a name="line.109"></a>
+<span class="sourceLineNo">110</span>        if (tt instanceof EnterableState) {<a name="line.110"></a>
+<span class="sourceLineNo">111</span>            return (EnterableState)tt;<a name="line.111"></a>
+<span class="sourceLineNo">112</span>        } else if (tt instanceof History) {<a name="line.112"></a>
+<span class="sourceLineNo">113</span>            return ((History)tt).getParent();<a name="line.113"></a>
+<span class="sourceLineNo">114</span>        } else {<a name="line.114"></a>
+<span class="sourceLineNo">115</span>            throw new ModelException("Unknown TransitionTarget subclass:"<a name="line.115"></a>
+<span class="sourceLineNo">116</span>                    + tt.getClass().getName());<a name="line.116"></a>
+<span class="sourceLineNo">117</span>        }<a name="line.117"></a>
+<span class="sourceLineNo">118</span>    }<a name="line.118"></a>
+<span class="sourceLineNo">119</span><a name="line.119"></a>
+<span class="sourceLineNo">120</span>    /**<a name="line.120"></a>
+<span class="sourceLineNo">121</span>     * Execute this action instance.<a name="line.121"></a>
+<span class="sourceLineNo">122</span>     *<a name="line.122"></a>
+<span class="sourceLineNo">123</span>     * @param exctx The ActionExecutionContext for this execution instance<a name="line.123"></a>
+<span class="sourceLineNo">124</span>     *<a name="line.124"></a>
+<span class="sourceLineNo">125</span>     * @throws ModelException If the execution causes the model to enter<a name="line.125"></a>
+<span class="sourceLineNo">126</span>     *                        a non-deterministic state.<a name="line.126"></a>
+<span class="sourceLineNo">127</span>     * @throws SCXMLExpressionException If the execution involves trying<a name="line.127"></a>
+<span class="sourceLineNo">128</span>     *                        to evaluate an expression which is malformed.<a name="line.128"></a>
+<span class="sourceLineNo">129</span>     */<a name="line.129"></a>
+<span class="sourceLineNo">130</span>    public abstract void execute(ActionExecutionContext exctx) throws ModelException, SCXMLExpressionException;<a name="line.130"></a>
+<span class="sourceLineNo">131</span><a name="line.131"></a>
+<span class="sourceLineNo">132</span>    /**<a name="line.132"></a>
+<span class="sourceLineNo">133</span>     * Return the key under which the current document namespaces are saved<a name="line.133"></a>
+<span class="sourceLineNo">134</span>     * in the parent state's context.<a name="line.134"></a>
+<span class="sourceLineNo">135</span>     *<a name="line.135"></a>
+<span class="sourceLineNo">136</span>     * @return The namespaces key<a name="line.136"></a>
+<span class="sourceLineNo">137</span>     */<a name="line.137"></a>
+<span class="sourceLineNo">138</span>    protected static String getNamespacesKey() {<a name="line.138"></a>
+<span class="sourceLineNo">139</span>        return Context.NAMESPACES_KEY;<a name="line.139"></a>
+<span class="sourceLineNo">140</span>    }<a name="line.140"></a>
+<span class="sourceLineNo">141</span><a name="line.141"></a>
+<span class="sourceLineNo">142</span>}<a name="line.142"></a>
+<span class="sourceLineNo">143</span><a name="line.143"></a>
 
 
 

Modified: websites/production/commons/content/proper/commons-scxml/apidocs/src-html/org/apache/commons/scxml2/model/Foreach.html
==============================================================================
--- websites/production/commons/content/proper/commons-scxml/apidocs/src-html/org/apache/commons/scxml2/model/Foreach.html (original)
+++ websites/production/commons/content/proper/commons-scxml/apidocs/src-html/org/apache/commons/scxml2/model/Foreach.html Mon Sep 15 13:36:40 2014
@@ -115,43 +115,45 @@
 <span class="sourceLineNo">107</span>                if (arrayObject.getClass().isArray()) {<a name="line.107"></a>
 <span class="sourceLineNo">108</span>                    for (int currentIndex = 0, size = Array.getLength(arrayObject); currentIndex &lt; size; currentIndex++) {<a name="line.108"></a>
 <span class="sourceLineNo">109</span>                        ctx.setLocal(item, Array.get(arrayObject, currentIndex));<a name="line.109"></a>
-<span class="sourceLineNo">110</span>                        ctx.setLocal(index, currentIndex);<a name="line.110"></a>
-<span class="sourceLineNo">111</span>                        // The "foreach" statement is a "container"<a name="line.111"></a>
-<span class="sourceLineNo">112</span>                        for (Action aa : actions) {<a name="line.112"></a>
-<span class="sourceLineNo">113</span>                            aa.execute(exctx);<a name="line.113"></a>
-<span class="sourceLineNo">114</span>                        }<a name="line.114"></a>
-<span class="sourceLineNo">115</span>                    }<a name="line.115"></a>
-<span class="sourceLineNo">116</span>                }<a name="line.116"></a>
-<span class="sourceLineNo">117</span>                else {<a name="line.117"></a>
-<span class="sourceLineNo">118</span>                    // Spec requires to iterate over a shallow copy of underlying array in a way that modifications to<a name="line.118"></a>
-<span class="sourceLineNo">119</span>                    // the collection during the execution of &lt;foreach&gt; must not affect the iteration behavior.<a name="line.119"></a>
-<span class="sourceLineNo">120</span>                    // For array objects (see above) this isn't needed, but for Iterables we don't have that guarantee<a name="line.120"></a>
-<span class="sourceLineNo">121</span>                    // so we make a copy first<a name="line.121"></a>
-<span class="sourceLineNo">122</span>                    ArrayList&lt;Object&gt; arrayList = new ArrayList&lt;Object&gt;();<a name="line.122"></a>
-<span class="sourceLineNo">123</span>                    for (Object value: (Iterable)arrayObject) {<a name="line.123"></a>
-<span class="sourceLineNo">124</span>                        arrayList.add(value);<a name="line.124"></a>
-<span class="sourceLineNo">125</span>                    }<a name="line.125"></a>
-<span class="sourceLineNo">126</span>                    int currentIndex = 0;<a name="line.126"></a>
-<span class="sourceLineNo">127</span>                    for (Object value : arrayList) {<a name="line.127"></a>
-<span class="sourceLineNo">128</span>                        ctx.setLocal(item, value);<a name="line.128"></a>
-<span class="sourceLineNo">129</span>                        if (index != null) {<a name="line.129"></a>
-<span class="sourceLineNo">130</span>                            ctx.setLocal(index, currentIndex);<a name="line.130"></a>
-<span class="sourceLineNo">131</span>                        }<a name="line.131"></a>
-<span class="sourceLineNo">132</span>                        // The "foreach" statement is a "container"<a name="line.132"></a>
-<span class="sourceLineNo">133</span>                        for (Action aa : actions) {<a name="line.133"></a>
-<span class="sourceLineNo">134</span>                            aa.execute(exctx);<a name="line.134"></a>
-<span class="sourceLineNo">135</span>                        }<a name="line.135"></a>
-<span class="sourceLineNo">136</span>                        currentIndex++;<a name="line.136"></a>
-<span class="sourceLineNo">137</span>                    }<a name="line.137"></a>
-<span class="sourceLineNo">138</span>                }<a name="line.138"></a>
-<span class="sourceLineNo">139</span>            }<a name="line.139"></a>
-<span class="sourceLineNo">140</span>            // else {} TODO: place the error 'error.execution' in the internal event queue. (section "3.12.2 Errors")<a name="line.140"></a>
-<span class="sourceLineNo">141</span>        }<a name="line.141"></a>
-<span class="sourceLineNo">142</span>        finally {<a name="line.142"></a>
-<span class="sourceLineNo">143</span>            ctx.setLocal(getNamespacesKey(), null);<a name="line.143"></a>
-<span class="sourceLineNo">144</span>        }<a name="line.144"></a>
-<span class="sourceLineNo">145</span>    }<a name="line.145"></a>
-<span class="sourceLineNo">146</span>}<a name="line.146"></a>
+<span class="sourceLineNo">110</span>                        if (index != null) {<a name="line.110"></a>
+<span class="sourceLineNo">111</span>                            ctx.setLocal(index, currentIndex);<a name="line.111"></a>
+<span class="sourceLineNo">112</span>                        }<a name="line.112"></a>
+<span class="sourceLineNo">113</span>                        // The "foreach" statement is a "container"<a name="line.113"></a>
+<span class="sourceLineNo">114</span>                        for (Action aa : actions) {<a name="line.114"></a>
+<span class="sourceLineNo">115</span>                            aa.execute(exctx);<a name="line.115"></a>
+<span class="sourceLineNo">116</span>                        }<a name="line.116"></a>
+<span class="sourceLineNo">117</span>                    }<a name="line.117"></a>
+<span class="sourceLineNo">118</span>                }<a name="line.118"></a>
+<span class="sourceLineNo">119</span>                else {<a name="line.119"></a>
+<span class="sourceLineNo">120</span>                    // Spec requires to iterate over a shallow copy of underlying array in a way that modifications to<a name="line.120"></a>
+<span class="sourceLineNo">121</span>                    // the collection during the execution of &lt;foreach&gt; must not affect the iteration behavior.<a name="line.121"></a>
+<span class="sourceLineNo">122</span>                    // For array objects (see above) this isn't needed, but for Iterables we don't have that guarantee<a name="line.122"></a>
+<span class="sourceLineNo">123</span>                    // so we make a copy first<a name="line.123"></a>
+<span class="sourceLineNo">124</span>                    ArrayList&lt;Object&gt; arrayList = new ArrayList&lt;Object&gt;();<a name="line.124"></a>
+<span class="sourceLineNo">125</span>                    for (Object value: (Iterable)arrayObject) {<a name="line.125"></a>
+<span class="sourceLineNo">126</span>                        arrayList.add(value);<a name="line.126"></a>
+<span class="sourceLineNo">127</span>                    }<a name="line.127"></a>
+<span class="sourceLineNo">128</span>                    int currentIndex = 0;<a name="line.128"></a>
+<span class="sourceLineNo">129</span>                    for (Object value : arrayList) {<a name="line.129"></a>
+<span class="sourceLineNo">130</span>                        ctx.setLocal(item, value);<a name="line.130"></a>
+<span class="sourceLineNo">131</span>                        if (index != null) {<a name="line.131"></a>
+<span class="sourceLineNo">132</span>                            ctx.setLocal(index, currentIndex);<a name="line.132"></a>
+<span class="sourceLineNo">133</span>                        }<a name="line.133"></a>
+<span class="sourceLineNo">134</span>                        // The "foreach" statement is a "container"<a name="line.134"></a>
+<span class="sourceLineNo">135</span>                        for (Action aa : actions) {<a name="line.135"></a>
+<span class="sourceLineNo">136</span>                            aa.execute(exctx);<a name="line.136"></a>
+<span class="sourceLineNo">137</span>                        }<a name="line.137"></a>
+<span class="sourceLineNo">138</span>                        currentIndex++;<a name="line.138"></a>
+<span class="sourceLineNo">139</span>                    }<a name="line.139"></a>
+<span class="sourceLineNo">140</span>                }<a name="line.140"></a>
+<span class="sourceLineNo">141</span>            }<a name="line.141"></a>
+<span class="sourceLineNo">142</span>            // else {} TODO: place the error 'error.execution' in the internal event queue. (section "3.12.2 Errors")<a name="line.142"></a>
+<span class="sourceLineNo">143</span>        }<a name="line.143"></a>
+<span class="sourceLineNo">144</span>        finally {<a name="line.144"></a>
+<span class="sourceLineNo">145</span>            ctx.setLocal(getNamespacesKey(), null);<a name="line.145"></a>
+<span class="sourceLineNo">146</span>        }<a name="line.146"></a>
+<span class="sourceLineNo">147</span>    }<a name="line.147"></a>
+<span class="sourceLineNo">148</span>}<a name="line.148"></a>
 
 
 



Mime
View raw message