Author: rahul
Date: Sun Aug 7 09:16:40 2005
New Revision: 230681
URL: http://svn.apache.org/viewcvs?rev=230681&view=rev
Log:
1) Few code style changes
2) Added, a somewhat belated, news item about completion of RDC migration to
Proper
Modified:
jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/scxml/ErrorReporter.java
jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/scxml/NotificationRegistry.java
jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/scxml/SCXMLExecutor.java
jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/scxml/SCXMLHelper.java
jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/scxml/SCXMLSemantics.java
jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/scxml/Status.java
jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/scxml/model/Path.java
jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/scxml/model/State.java
jakarta/taglibs/proper/src/trunk/doc/index.xml
Modified:
jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/scxml/ErrorReporter.java
URL:
http://svn.apache.org/viewcvs/jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/scxml/ErrorReporter.java?rev=230681&r1=230680&r2=230681&view=diff
==============================================================================
---
jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/scxml/ErrorReporter.java
(original)
+++
jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/scxml/ErrorReporter.java
Sun Aug 7 09:16:40 2005
@@ -81,4 +81,5 @@
* An expression language error.
*/
public static final String EXPRESSION_ERROR = "EXPRESSION_ERROR";
+
}
Modified:
jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/scxml/NotificationRegistry.java
URL:
http://svn.apache.org/viewcvs/jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/scxml/NotificationRegistry.java?rev=230681&r1=230680&r2=230681&view=diff
==============================================================================
---
jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/scxml/NotificationRegistry.java
(original)
+++
jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/scxml/NotificationRegistry.java
Sun Aug 7 09:16:40 2005
@@ -84,8 +84,7 @@
public void fireOnEntry(Observable source, TransitionTarget state) {
HashSet entries = (HashSet)regs.get(source);
if(entries != null) {
- Iterator iter = entries.iterator();
- while(iter.hasNext()){
+ for (Iterator iter = entries.iterator(); iter.hasNext();) {
SCXMLListener lst = (SCXMLListener)iter.next();
lst.onEntry(state);
}
@@ -102,8 +101,7 @@
public void fireOnExit(Observable source, TransitionTarget state) {
HashSet entries = (HashSet)regs.get(source);
if(entries != null) {
- Iterator iter = entries.iterator();
- while(iter.hasNext()){
+ for (Iterator iter = entries.iterator(); iter.hasNext();) {
SCXMLListener lst = (SCXMLListener)iter.next();
lst.onExit(state);
}
@@ -122,8 +120,7 @@
TransitionTarget to, Transition transition) {
HashSet entries = (HashSet)regs.get(source);
if(entries != null) {
- Iterator iter = entries.iterator();
- while(iter.hasNext()){
+ for (Iterator iter = entries.iterator(); iter.hasNext();) {
SCXMLListener lst = (SCXMLListener)iter.next();
lst.onTransition(from, to, transition);
}
Modified:
jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/scxml/SCXMLExecutor.java
URL:
http://svn.apache.org/viewcvs/jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/scxml/SCXMLExecutor.java?rev=230681&r1=230680&r2=230681&view=diff
==============================================================================
---
jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/scxml/SCXMLExecutor.java
(original)
+++
jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/scxml/SCXMLExecutor.java
Sun Aug 7 09:16:40 2005
@@ -153,8 +153,8 @@
// Reset all variable contexts
stateMachine.getRootContext().reset();
// all states and parallels, only states have var. contexts
- Iterator i = stateMachine.getTargets().values().iterator();
- while(i.hasNext()) {
+ for (Iterator i =
stateMachine.getTargets().values().iterator();
+ i.hasNext();) {
TransitionTarget tt = (TransitionTarget)i.next();
if(tt instanceof State) {
((State)tt).getContext().reset();
Modified:
jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/scxml/SCXMLHelper.java
URL:
http://svn.apache.org/viewcvs/jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/scxml/SCXMLHelper.java?rev=230681&r1=230680&r2=230681&view=diff
==============================================================================
---
jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/scxml/SCXMLHelper.java
(original)
+++
jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/scxml/SCXMLHelper.java
Sun Aug 7 09:16:40 2005
@@ -77,9 +77,8 @@
* @return transitive closure of a given state set
*/
public static final Set getAncestorClosure(Set states, Set upperBounds)
{
- HashSet closure = new HashSet((int) (states.size() * 2));
- Iterator i = states.iterator();
- while (i.hasNext()) {
+ Set closure = new HashSet((int) (states.size() * 2));
+ for (Iterator i = states.iterator(); i.hasNext();) {
TransitionTarget tt = (TransitionTarget) i.next();
closure.add(tt);
while ((tt = tt.getParent()) != null) {
@@ -111,15 +110,14 @@
* For every active state we add 1 to the count of its parent.
Each
* Parallel should reach count equal to the number of its
children and
* contribute by 1 to its parent. Each State should reach count
exactly
- * 1. SXML elemnt (top) should reach count exactly 1. We
essentially
+ * 1. SCXML elemnt (top) should reach count exactly 1. We
essentially
* summarize up the hierarchy tree starting with a given set of
states =
* active configuration.
*/
boolean legalConfig = true; // let's be optimists
- IdentityHashMap counts = new IdentityHashMap();
- HashSet scxmlCount = new HashSet();
- Iterator i = states.iterator();
- while (i.hasNext()) {
+ Map counts = new IdentityHashMap();
+ Set scxmlCount = new HashSet();
+ for (Iterator i = states.iterator(); i.hasNext();) {
TransitionTarget tt = (TransitionTarget) i.next();
TransitionTarget parent = null;
while ((parent = tt.getParent()) != null) {
@@ -135,25 +133,23 @@
scxmlCount.add(tt);
}
//Validate counts:
- i = counts.entrySet().iterator();
- while (i.hasNext()) {
+ for (Iterator i = counts.entrySet().iterator(); i.hasNext();) {
Map.Entry entry = (Map.Entry) i.next();
TransitionTarget tt = (TransitionTarget) entry.getKey();
- HashSet count = (HashSet) entry.getValue();
+ Set count = (Set) entry.getValue();
if (tt instanceof Parallel) {
Parallel p = (Parallel) tt;
if (count.size() < p.getStates().size()) {
errRep.onError(ErrorReporter.ILLEGAL_CONFIG,
- "Not all AND states
active for parallel "
- +
p.getId(), entry);
+ "Not all AND states active for
parallel "
+ + p.getId(), entry);
legalConfig = false;
}
} else {
if (count.size() > 1) {
- errRep
-
.onError(ErrorReporter.ILLEGAL_CONFIG,
-
"Multiple OR states active for state "
-
+ tt.getId(), entry);
+
errRep.onError(ErrorReporter.ILLEGAL_CONFIG,
+ "Multiple OR states active for
state "
+ + tt.getId(), entry);
legalConfig = false;
}
}
@@ -186,7 +182,7 @@
} else if (isDescendant(tt2, tt1)) {
return tt1;
}
- HashSet parents = new HashSet();
+ Set parents = new HashSet();
TransitionTarget tmp = tt1;
while ((tmp = tmp.getParent()) != null) {
if (tmp instanceof State) {
@@ -220,20 +216,20 @@
* given transition is taken
*/
public static final Set getStatesExited(Transition t, Set
currentStates) {
- HashSet allStates = new HashSet();
+ Set allStates = new HashSet();
Path p = t.getPath();
//the easy part
allStates.addAll(p.getUpwardSegment());
if (p.isCrossRegion()) {
- Iterator regions = p.getRegionsExited().iterator();
- while (regions.hasNext()) {
+ for (Iterator regions =
p.getRegionsExited().iterator();
+ regions.hasNext(); ) {
Parallel par = ((Parallel) ((State)
regions.next()).getParent());
- //let's find affected states in sibling regions
- Iterator siblings = par.getStates().iterator();
- while (siblings.hasNext()) {
+ //let's find affected states in sibling regions
+ for (Iterator siblings =
par.getStates().iterator();
+ siblings.hasNext(); ) {
State s = (State) siblings.next();
- Iterator act = currentStates.iterator();
- while (act.hasNext()) {
+ for (Iterator act =
currentStates.iterator();
+ act.hasNext(); ) {
TransitionTarget a =
(TransitionTarget) act.next();
if (isDescendant(a, s)) {
//a is affected
Modified:
jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/scxml/SCXMLSemantics.java
URL:
http://svn.apache.org/viewcvs/jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/scxml/SCXMLSemantics.java?rev=230681&r1=230680&r2=230681&view=diff
==============================================================================
---
jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/scxml/SCXMLSemantics.java
(original)
+++
jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/scxml/SCXMLSemantics.java
Sun Aug 7 09:16:40 2005
@@ -26,10 +26,12 @@
import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
+import java.util.Map;
import java.util.Set;
import java.util.StringTokenizer;
import org.apache.commons.logging.LogFactory;
+
import org.apache.taglibs.rdc.scxml.model.Action;
import org.apache.taglibs.rdc.scxml.model.Assign;
import org.apache.taglibs.rdc.scxml.model.Cancel;
@@ -153,8 +155,7 @@
// recursively and pass a sub-list of actions embedded in a
particular
// "if"
Evaluator eval = exec.getEvaluator();
- Iterator i = actions.iterator();
- while (i.hasNext()) {
+ for (Iterator i = actions.iterator(); i.hasNext(); ) {
Action a = (Action) i.next();
State parentState = a.getParentState();
Context ctx = parentState.getContext();
@@ -185,12 +186,11 @@
//determine elseif/else separators evaluate
conditions
//extract a sub-list of If's actions and invoke
// executeActionList()
- LinkedList todoList = new LinkedList();
+ List todoList = new LinkedList();
If ifo = (If) a;
List subAct = ifo.getActions();
boolean cnd = eval.evalCond(ctx,
ifo.getCond()).booleanValue();
- Iterator ifiter = subAct.iterator();
- while (ifiter.hasNext()) {
+ for (Iterator ifiter = subAct.iterator();
ifiter.hasNext(); ) {
Action aa = (Action) ifiter.next();
if (cnd && !(aa instanceof ElseIf) &&
!(aa instanceof Else)) {
todoList.add(aa);
@@ -220,7 +220,7 @@
if (!SCXMLHelper.isStringEmpty(snd.getHints()))
{
hints = eval.eval(ctx, snd.getHints());
}
- HashMap params = null;
+ Map params = null;
if
(!SCXMLHelper.isStringEmpty(snd.getNamelist())) {
StringTokenizer tkn = new
StringTokenizer(snd.getNamelist());
params = new HashMap(tkn.countTokens());
@@ -271,11 +271,8 @@
SCXML sm = exec.getStateMachine();
NotificationRegistry nr = sm.getNotificationRegistry();
Collection internalEvents = step.getAfterStatus().getEvents();
- Iterator i = null;
- TriggerEvent te = null;
// ExecutePhaseActions / OnExit
- i = step.getExitList().iterator();
- while (i.hasNext()) {
+ for (Iterator i = step.getExitList().iterator(); i.hasNext(); )
{
TransitionTarget tt = (TransitionTarget) i.next();
OnExit oe = tt.getOnExit();
try {
@@ -286,13 +283,12 @@
}
nr.fireOnExit(tt, tt);
nr.fireOnExit(sm, tt);
- te = new TriggerEvent(tt.getId() + ".exit",
+ TriggerEvent te = new TriggerEvent(tt.getId() + ".exit",
TriggerEvent.CHANGE_EVENT);
internalEvents.add(te);
}
// ExecutePhaseActions / Transitions
- i = step.getTransitList().iterator();
- while (i.hasNext()) {
+ for (Iterator i = step.getTransitList().iterator();
i.hasNext(); ) {
Transition t = (Transition) i.next();
try {
executeActionList(t.getActions(),
internalEvents, exec, errRep);
@@ -304,8 +300,7 @@
nr.fireOnTransition(sm, t.getParent(),
t.getRuntimeTarget(), t);
}
// ExecutePhaseActions / OnEntry
- i = step.getEntryList().iterator();
- while (i.hasNext()) {
+ for (Iterator i = step.getEntryList().iterator(); i.hasNext();
) {
TransitionTarget tt = (TransitionTarget) i.next();
OnEntry oe = tt.getOnEntry();
try {
@@ -316,7 +311,7 @@
}
nr.fireOnEntry(tt, tt);
nr.fireOnEntry(sm, tt);
- te = new TriggerEvent(tt.getId() + ".entry",
+ TriggerEvent te = new TriggerEvent(tt.getId() +
".entry",
TriggerEvent.CHANGE_EVENT);
internalEvents.add(te);
//3.2.1 and 3.4 (.done events)
@@ -372,15 +367,14 @@
public void enumerateReachableTransitions(SCXML stateMachine, Step step,
ErrorReporter errRep) {
// prevents adding the same transition multiple times
- HashSet transSet = new HashSet();
+ Set transSet = new HashSet();
// prevents visiting the same state multiple times
- HashSet stateSet = new
HashSet(step.getBeforeStatus().getStates());
+ Set stateSet = new HashSet(step.getBeforeStatus().getStates());
// breath-first search to-do list
LinkedList todoList = new LinkedList(stateSet);
while (!todoList.isEmpty()) {
State st = (State) todoList.removeFirst();
- Iterator i = st.getTransitionsList().iterator();
- while (i.hasNext()) {
+ for (Iterator i = st.getTransitionsList().iterator();
i.hasNext(); ) {
Transition t = (Transition) i.next();
if (!transSet.contains(t)) {
transSet.add(t);
@@ -414,25 +408,23 @@
* each transition (local check) - transition precedence
(bottom-up) as
* defined by SCXML specs
*/
- HashSet allEvents = new
HashSet(step.getBeforeStatus().getEvents()
+ Set allEvents = new HashSet(step.getBeforeStatus().getEvents()
.size()
+ step.getExternalEvents().size());
//for now, we only match against event names
- Iterator ei = step.getBeforeStatus().getEvents().iterator();
- while (ei.hasNext()) {
+ for (Iterator ei =
step.getBeforeStatus().getEvents().iterator();
+ ei.hasNext(); ) {
TriggerEvent te = (TriggerEvent) ei.next();
allEvents.add(te.getName());
}
- ei = step.getExternalEvents().iterator();
- while (ei.hasNext()) {
+ for (Iterator ei = step.getExternalEvents().iterator();
ei.hasNext(); ) {
TriggerEvent te = (TriggerEvent) ei.next();
allEvents.add(te.getName());
}
//remove list (filtered-out list)
- LinkedList removeList = new LinkedList();
+ List removeList = new LinkedList();
//iterate over non-filtered transition set
- Iterator iter = step.getTransitList().iterator();
- while (iter.hasNext()) {
+ for (Iterator iter = step.getTransitList().iterator();
iter.hasNext();) {
Transition t = (Transition) iter.next();
// event check
String event = t.getEvent();
@@ -473,7 +465,7 @@
Object trans[] = step.getTransitList().toArray();
Set currentStates = step.getBeforeStatus().getStates();
// non-determinism candidates
- HashSet nonDeterm = new HashSet();
+ Set nonDeterm = new HashSet();
for (int i = 0; i < trans.length; i++) {
Transition t = (Transition) trans[i];
TransitionTarget tsrc = t.getParent();
@@ -523,18 +515,15 @@
Set targets = step.getAfterStatus().getStates();
List transitions = step.getTransitList();
/* populate the target set by taking targets of selected
transitions */
- Iterator i = transitions.iterator();
- while (i.hasNext()) {
+ for (Iterator i = transitions.iterator(); i.hasNext(); ) {
Transition t = (Transition) i.next();
targets.add(t.getRuntimeTarget());
}
/* retain the source states, which are not affected by the
transitions */
- i = sources.iterator();
- while (i.hasNext()) {
- Iterator j = transitions.iterator();
+ for (Iterator i = sources.iterator(); i.hasNext(); ) {
State s = (State) i.next();
boolean retain = true;
- while (j.hasNext()) {
+ for (Iterator j = transitions.iterator(); j.hasNext();
) {
Transition t = (Transition) j.next();
State ts = (State) t.getParent();
if (s == ts || SCXMLHelper.isDescendant(s, ts))
{
@@ -632,8 +621,7 @@
onExit.removeAll(onEntry);
onEntry.removeAll(onExit2);
//explicitly add self-transitions
- Iterator i = step.getTransitList().iterator();
- while (i.hasNext()) {
+ for (Iterator i = step.getTransitList().iterator();
i.hasNext(); ) {
Transition t = (Transition) i.next();
if (t.getParent() == t.getTarget()) {
onExit.add(t.getParent());
@@ -653,8 +641,7 @@
Collections.reverse(entering);
step.getEntryList().addAll(entering);
// reset 'done' flag
- Iterator reset = entering.iterator();
- while(reset.hasNext()) {
+ for (Iterator reset = entering.iterator(); reset.hasNext(); ) {
Object o = reset.next();
if(o instanceof State) {
((State)o).setDone(false);
@@ -672,8 +659,7 @@
*/
public void updateHistoryStates(Step step, ErrorReporter errRep) {
Set oldState = step.getBeforeStatus().getStates();
- Iterator i = step.getExitList().iterator();
- while (i.hasNext()) {
+ for (Iterator i = step.getExitList().iterator(); i.hasNext(); )
{
Object o = i.next();
if (o instanceof State) {
State s = (State) o;
Modified:
jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/scxml/Status.java
URL:
http://svn.apache.org/viewcvs/jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/scxml/Status.java?rev=230681&r1=230680&r2=230681&view=diff
==============================================================================
---
jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/scxml/Status.java
(original)
+++
jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/scxml/Status.java
Sun Aug 7 09:16:40 2005
@@ -53,8 +53,7 @@
*/
public boolean isFinal() {
boolean rslt = true;
- Iterator i = states.iterator();
- while (i.hasNext()) {
+ for (Iterator i = states.iterator(); i.hasNext(); ) {
State s = (State)i.next();
if (!s.getIsFinal()) {
rslt = false;
Modified:
jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/scxml/model/Path.java
URL:
http://svn.apache.org/viewcvs/jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/scxml/model/Path.java?rev=230681&r1=230680&r2=230681&view=diff
==============================================================================
---
jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/scxml/model/Path.java
(original)
+++
jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/scxml/model/Path.java
Sun Aug 7 09:16:40 2005
@@ -96,8 +96,7 @@
*/
public List getRegionsExited() {
LinkedList ll = new LinkedList();
- Iterator i = upSeg.iterator();
- while (i.hasNext()) {
+ for (Iterator i = upSeg.iterator(); i.hasNext();) {
Object o = i.next();
if (o instanceof State) {
State st = (State) o;
@@ -115,8 +114,7 @@
*/
public List getRegionsEntered() {
LinkedList ll = new LinkedList();
- Iterator i = downSeg.iterator();
- while (i.hasNext()) {
+ for (Iterator i = downSeg.iterator(); i.hasNext();) {
Object o = i.next();
if (o instanceof State) {
State st = (State) o;
Modified:
jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/scxml/model/State.java
URL:
http://svn.apache.org/viewcvs/jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/scxml/model/State.java?rev=230681&r1=230680&r2=230681&view=diff
==============================================================================
---
jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/scxml/model/State.java
(original)
+++
jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/scxml/model/State.java
Sun Aug 7 09:16:40 2005
@@ -196,7 +196,7 @@
public void addTransition(Transition transition) {
String event = transition.getEvent();
if (!transitions.containsKey(event)) {
- ArrayList eventTransitions = new ArrayList();
+ List eventTransitions = new ArrayList();
eventTransitions.add(transition);
transitions.put(event, eventTransitions);
} else {
@@ -233,8 +233,7 @@
public List getTransitionsList() {
// Each call creates a new List, this will change once TO-DO is
handled
List transitionsList = new ArrayList();
- Iterator iter = transitions.keySet().iterator();
- while (iter.hasNext()) {
+ for (Iterator iter = transitions.keySet().iterator();
iter.hasNext();) {
transitionsList.addAll((List)
transitions.get(iter.next()));
}
return transitionsList;
Modified: jakarta/taglibs/proper/src/trunk/doc/index.xml
URL:
http://svn.apache.org/viewcvs/jakarta/taglibs/proper/src/trunk/doc/index.xml?rev=230681&r1=230680&r2=230681&view=diff
==============================================================================
--- jakarta/taglibs/proper/src/trunk/doc/index.xml (original)
+++ jakarta/taglibs/proper/src/trunk/doc/index.xml Sun Aug 7 09:16:40 2005
@@ -82,6 +82,11 @@
</section>
<section name="News" href="News">
<news>
+ <newsitem date="08/04/2005" libname="RDC">
+ The Reusable Dialog Components (RDC) Taglib has
+ <a
href="http://jakarta.apache.org/site/news/news-2005-q3.html#20050804.1";>
+ migrated</a> to Taglibs-Proper after its graduation from
Taglibs-Sandbox.
+ </newsitem>
<newsitem date="07/26/2005" libname="RDC">
Version 1.0.0 of the Reusable Dialog Components (RDC) Taglib has been
<a
href="http://jakarta.apache.org/site/downloads/downloads_taglibs-rdc.cgi";>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
