Author: rahul
Date: Mon Mar 12 12:31:21 2007
New Revision: 517353
URL: http://svn.apache.org/viewvc?view=rev&rev=517353
Log:
Remove/deprecate as necessary, bits related to non-determinism, which are no
longer relevant.
Modified:
jakarta/commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml/ErrorReporter.java
jakarta/commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml/env/SimpleErrorReporter.java
jakarta/commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml/semantics/ErrorConstants.java
Modified:
jakarta/commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml/ErrorReporter.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml/ErrorReporter.java?view=diff&rev=517353&r1=517352&r2=517353
==============================================================================
---
jakarta/commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml/ErrorReporter.java
(original)
+++
jakarta/commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml/ErrorReporter.java
Mon Mar 12 12:31:21 2007
@@ -79,7 +79,8 @@
* Non-deterministic situation has occured - there are more than
* one enabled transitions in conflict.
*
- * @deprecated Use [EMAIL PROTECTED] ErrorConstants#NON_DETERMINISTIC}
instead.
+ * @deprecated No longer necessary, non determinism is solved based
+ * on state heirarchy and document order priorities.
*/
String NON_DETERMINISTIC = "NON_DETERMINISTIC";
Modified:
jakarta/commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml/env/SimpleErrorReporter.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml/env/SimpleErrorReporter.java?view=diff&rev=517353&r1=517352&r2=517353
==============================================================================
---
jakarta/commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml/env/SimpleErrorReporter.java
(original)
+++
jakarta/commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml/env/SimpleErrorReporter.java
Mon Mar 12 12:31:21 2007
@@ -17,7 +17,6 @@
package org.apache.commons.scxml.env;
import java.io.Serializable;
-import java.util.HashSet;
import java.util.Iterator;
import java.util.Map;
import java.util.Set;
@@ -27,7 +26,6 @@
import org.apache.commons.scxml.ErrorReporter;
import org.apache.commons.scxml.model.SCXML;
import org.apache.commons.scxml.model.State;
-import org.apache.commons.scxml.model.Transition;
import org.apache.commons.scxml.model.TransitionTarget;
import org.apache.commons.scxml.semantics.ErrorConstants;
@@ -71,20 +69,6 @@
} else if (errCode == ErrorConstants.UNKNOWN_ACTION) {
//executeActionList
msg.append("Action: " + errCtx.getClass().getName());
- } else if (errCode == ErrorConstants.NON_DETERMINISTIC) {
- //filterTransitionSet
- msg.append(" [");
- if (errCtx instanceof HashSet) {
- for (Iterator i = ((Set) errCtx).iterator(); i.hasNext();) {
- Transition t = (Transition) i.next();
- msg.append(LogUtils.transToString(t.getParent(),
- t.getTarget(), t));
- if (i.hasNext()) {
- msg.append(", ");
- }
- }
- }
- msg.append(']');
} else if (errCode == ErrorConstants.ILLEGAL_CONFIG) {
//isLegalConfig
if (errCtx instanceof Map.Entry) {
Modified:
jakarta/commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml/semantics/ErrorConstants.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml/semantics/ErrorConstants.java?view=diff&rev=517353&r1=517352&r2=517353
==============================================================================
---
jakarta/commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml/semantics/ErrorConstants.java
(original)
+++
jakarta/commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml/semantics/ErrorConstants.java
Mon Mar 12 12:31:21 2007
@@ -53,6 +53,9 @@
/**
* Non-deterministic situation has occured - there are more than
* one enabled transitions in conflict.
+ *
+ * @deprecated Non deterministic behavior is now resolved using
+ * state heirarchy and document order priorities.
*/
public static final String NON_DETERMINISTIC = "NON_DETERMINISTIC";
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
