You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@commons.apache.org by ra...@apache.org on 2007/04/25 22:52:20 UTC
svn commit: r532480 - in
/jakarta/commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml/semantics:
SCXMLSemanticsImpl.java TransitionTargetComparator.java
Author: rahul
Date: Wed Apr 25 13:52:18 2007
New Revision: 532480
URL: http://svn.apache.org/viewvc?view=rev&rev=532480
Log:
Feb '07 WD related minor tweaks for the semantics package, mostly:
- Eliminate use of deprecated APIs
- Better naming as a consequence of above
Modified:
jakarta/commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml/semantics/SCXMLSemanticsImpl.java
jakarta/commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml/semantics/TransitionTargetComparator.java
Modified: jakarta/commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml/semantics/SCXMLSemanticsImpl.java
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml/semantics/SCXMLSemanticsImpl.java?view=diff&rev=532480&r1=532479&r2=532480
==============================================================================
--- jakarta/commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml/semantics/SCXMLSemanticsImpl.java (original)
+++ jakarta/commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml/semantics/SCXMLSemanticsImpl.java Wed Apr 25 13:52:18 2007
@@ -109,8 +109,8 @@
/**
* @param input
* SCXML state machine [in]
- * @param states
- * a set of States to populate [out]
+ * @param targets
+ * a set of initial targets to populate [out]
* @param entryList
* a list of States and Parallels to enter [out]
* @param errRep
@@ -120,19 +120,19 @@
* @throws ModelException
* in case there is a fatal SCXML object model problem.
*/
- public void determineInitialStates(final SCXML input, final Set states,
+ public void determineInitialStates(final SCXML input, final Set targets,
final List entryList, final ErrorReporter errRep,
final SCInstance scInstance)
throws ModelException {
- State tmp = input.getInitialState();
+ TransitionTarget tmp = input.getInitialTarget();
if (tmp == null) {
errRep.onError(ErrorConstants.NO_INITIAL,
"SCXML initialstate is missing!", input);
} else {
- states.add(tmp);
- determineTargetStates(states, errRep, scInstance);
+ targets.add(tmp);
+ determineTargetStates(targets, errRep, scInstance);
//set of ALL entered states (even if initialState is a jump-over)
- Set onEntry = SCXMLHelper.getAncestorClosure(states, null);
+ Set onEntry = SCXMLHelper.getAncestorClosure(targets, null);
// sort onEntry according state hierarchy
Object[] oen = onEntry.toArray();
onEntry.clear();
@@ -261,8 +261,8 @@
//let's check its siblings too
Parallel p = (Parallel) parent.getParent();
int finCount = 0;
- int pCount = p.getStates().size();
- for (Iterator regions = p.getStates().iterator();
+ int pCount = p.getChildren().size();
+ for (Iterator regions = p.getChildren().iterator();
regions.hasNext();) {
State reg = (State) regions.next();
if (reg.isDone()) {
@@ -505,7 +505,7 @@
for (Iterator k = regs.iterator(); k.hasNext();) {
State region = (State) k.next();
regions.addAll(((Parallel) region.getParent()).
- getStates());
+ getChildren());
}
}
}
@@ -548,7 +548,7 @@
// NOTE: Digester has to verify this precondition!
if (st.isSimple()) {
states.add(st); //leaf
- } else if (st.isOrthogonal()) {
+ } else if (st.isOrthogonal()) { //TODO: Remove else if in v1.0
wrkSet.addLast(st.getParallel()); //parallel
} else {
// composite state
@@ -558,7 +558,7 @@
}
} else if (tt instanceof Parallel) {
Parallel prl = (Parallel) tt;
- for (Iterator i = prl.getStates().iterator(); i.hasNext();) {
+ for (Iterator i = prl.getChildren().iterator(); i.hasNext();) {
//fork
wrkSet.addLast(i.next());
}
Modified: jakarta/commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml/semantics/TransitionTargetComparator.java
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml/semantics/TransitionTargetComparator.java?view=diff&rev=532480&r1=532479&r2=532480
==============================================================================
--- jakarta/commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml/semantics/TransitionTargetComparator.java (original)
+++ jakarta/commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml/semantics/TransitionTargetComparator.java Wed Apr 25 13:52:18 2007
@@ -85,7 +85,7 @@
while (parent2.getParent() != lca) {
parent2 = parent2.getParent();
}
- for (Iterator iter = lca.getStates().iterator();
+ for (Iterator iter = lca.getChildren().iterator();
iter.hasNext();) {
State s = (State) iter.next();
if (s == parent1) {
---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org