commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject commons-scxml git commit: SCXML-261 Support ".*" besides "*" as 'any' wildcard event descriptor
Date Sun, 10 Dec 2017 03:42:46 GMT
Repository: commons-scxml
Updated Branches:
  refs/heads/master 8233b90eb -> f8b4e224b


SCXML-261 Support ".*" besides "*" as 'any' wildcard event descriptor


Project: http://git-wip-us.apache.org/repos/asf/commons-scxml/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-scxml/commit/f8b4e224
Tree: http://git-wip-us.apache.org/repos/asf/commons-scxml/tree/f8b4e224
Diff: http://git-wip-us.apache.org/repos/asf/commons-scxml/diff/f8b4e224

Branch: refs/heads/master
Commit: f8b4e224b0c719e4d9aca6b26c03214963cd6af8
Parents: 8233b90
Author: Ate Douma <ate@apache.org>
Authored: Sun Dec 10 04:42:38 2017 +0100
Committer: Ate Douma <ate@apache.org>
Committed: Sun Dec 10 04:42:38 2017 +0100

----------------------------------------------------------------------
 src/changes/changes.xml                                      | 6 +++++-
 .../java/org/apache/commons/scxml2/model/Transition.java     | 4 ++--
 src/test/java/org/apache/commons/scxml2/w3c/tests.xml        | 8 ++++----
 3 files changed, 11 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/commons-scxml/blob/f8b4e224/src/changes/changes.xml
----------------------------------------------------------------------
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index ac19a40..4ea5529 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -35,7 +35,11 @@
     <release version="2.0" date="In Git master"
       description="Latest unreleased code">
 
-      <action dev="ate" type="fix" issue="SCXML-259">
+      <action dev="ate" type="fix" issue="SCXML-261">
+        [12-10-2017] Support ".*" besides "*" as 'any' wildcard event descriptor
+      </action>
+
+      <action dev="ate" type="fix" issue="SCXML-260">
         [12-10-2017] &lt;foreach&gt; must fail on using illegal item definition
       </action>
 

http://git-wip-us.apache.org/repos/asf/commons-scxml/blob/f8b4e224/src/main/java/org/apache/commons/scxml2/model/Transition.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/scxml2/model/Transition.java b/src/main/java/org/apache/commons/scxml2/model/Transition.java
index 1884792..08d45c7 100644
--- a/src/main/java/org/apache/commons/scxml2/model/Transition.java
+++ b/src/main/java/org/apache/commons/scxml2/model/Transition.java
@@ -128,9 +128,9 @@ public class Transition extends SimpleTransition implements DocumentOrder
{
             StringTokenizer st = new StringTokenizer(this.event);
             while (st.hasMoreTokens()) {
                 String token = st.nextToken();
-                if (token.equals("*")) {
+                if (token.equals("*") || token.equals(".*")) {
                     events.clear();
-                    events.add(token);
+                    events.add("*");
                     break;
                 }
                 else {

http://git-wip-us.apache.org/repos/asf/commons-scxml/blob/f8b4e224/src/test/java/org/apache/commons/scxml2/w3c/tests.xml
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/scxml2/w3c/tests.xml b/src/test/java/org/apache/commons/scxml2/w3c/tests.xml
index 20b667a..abe86fc 100644
--- a/src/test/java/org/apache/commons/scxml2/w3c/tests.xml
+++ b/src/test/java/org/apache/commons/scxml2/w3c/tests.xml
@@ -75,10 +75,10 @@
   <test id="307" mandatory="true"                    manual="true"  jexl="true"  ecma="false"
finalState="final"/>
   <test id="309" mandatory="true"                    manual="false" jexl="true"  ecma="true"/>
   <test id="310" mandatory="true"                    manual="false" jexl="true"  ecma="true"/>
-  <test id="311" mandatory="true"                    manual="false" jexl="false" ecma="false"/>
-  <test id="312" mandatory="true"                    manual="false" jexl="false" ecma="false"/>
-  <test id="313" mandatory="true"                    manual="true"  jexl="false" ecma="false"
finalState="pass"/>
-  <test id="314" mandatory="true"                    manual="true"  jexl="false" ecma="false"
finalState="pass"/>
+  <test id="311" mandatory="true"                    manual="false" jexl="true"  ecma="true"/>
+  <test id="312" mandatory="true"                    manual="false" jexl="true"  ecma="true"/>
+  <test id="313" mandatory="true"                    manual="true"  jexl="true"  ecma="true"
finalState="pass"/>
+  <test id="314" mandatory="true"                    manual="true"  jexl="true"  ecma="true"
finalState="pass"/>
   <test id="344" mandatory="true"                    manual="false" jexl="true"  ecma="true"/>
   <test id="318" mandatory="true"                    manual="false" jexl="true"  ecma="true"/>
   <test id="319" mandatory="true"                    manual="false" jexl="true"  ecma="true"/>


Mime
View raw message