Author: rahul
Date: Tue Jan 15 14:51:01 2008
New Revision: 612274
URL: http://svn.apache.org/viewvc?rev=612274&view=rev
Log:
Type safety improvements + Using for-each to reduce clutter.
Modified:
commons/proper/scxml/branches/J5/src/main/java/org/apache/commons/scxml/SCXMLHelper.java
Modified:
commons/proper/scxml/branches/J5/src/main/java/org/apache/commons/scxml/SCXMLHelper.java
URL:
http://svn.apache.org/viewvc/commons/proper/scxml/branches/J5/src/main/java/org/apache/commons/scxml/SCXMLHelper.java?rev=612274&r1=612273&r2=612274&view=diff
==============================================================================
---
commons/proper/scxml/branches/J5/src/main/java/org/apache/commons/scxml/SCXMLHelper.java
(original)
+++
commons/proper/scxml/branches/J5/src/main/java/org/apache/commons/scxml/SCXMLHelper.java
Tue Jan 15 14:51:01 2008
@@ -18,7 +18,6 @@
import java.util.HashSet;
import java.util.IdentityHashMap;
-import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -90,8 +89,7 @@
public static Set<TransitionTarget> getAncestorClosure(final
Set<TransitionTarget> states,
final Set<TransitionTarget> upperBounds) {
Set<TransitionTarget> closure = new
HashSet<TransitionTarget>(states.size() * 2);
- for (Iterator i = states.iterator(); i.hasNext();) {
- TransitionTarget tt = (TransitionTarget) i.next();
+ for (TransitionTarget tt : states) {
while (tt != null) {
if (!closure.add(tt)) {
//tt is already a part of the closure
@@ -131,8 +129,7 @@
Map<TransitionTarget, Set<TransitionTarget>> counts =
new IdentityHashMap<TransitionTarget, Set<TransitionTarget>>();
Set<TransitionTarget> scxmlCount = new HashSet<TransitionTarget>();
- for (Iterator i = states.iterator(); i.hasNext();) {
- TransitionTarget tt = (TransitionTarget) i.next();
+ for (TransitionTarget tt : states) {
TransitionTarget parent = null;
while ((parent = tt.getParent()) != null) {
Set<TransitionTarget> cnt = counts.get(parent);
@@ -147,10 +144,9 @@
scxmlCount.add(tt);
}
//Validate counts:
- for (Iterator i = counts.entrySet().iterator(); i.hasNext();) {
- Map.Entry entry = (Map.Entry) i.next();
- TransitionTarget tt = (TransitionTarget) entry.getKey();
- Set count = (Set) entry.getValue();
+ for (Map.Entry<TransitionTarget, Set<TransitionTarget>> entry :
counts.entrySet()) {
+ TransitionTarget tt = entry.getKey();
+ Set<TransitionTarget> count = entry.getValue();
if (tt instanceof Parallel) {
Parallel p = (Parallel) tt;
if (count.size() < p.getChildren().size()) {
@@ -236,8 +232,7 @@
//the easy part
allStates.addAll(p.getUpwardSegment());
TransitionTarget source = t.getParent();
- for (Iterator act = currentStates.iterator(); act.hasNext();) {
- TransitionTarget a = (TransitionTarget) act.next();
+ for (TransitionTarget a : currentStates) {
if (isDescendant(a, source)) {
boolean added = false;
added = allStates.add(a);
@@ -248,17 +243,12 @@
}
}
if (p.isCrossRegion()) {
- for (Iterator regions = p.getRegionsExited().iterator();
- regions.hasNext();) {
- Parallel par = ((Parallel) ((State) regions.next()).
- getParent());
+ for (State region : p.getRegionsExited()) {
+ Parallel par = (Parallel) region.getParent();
//let's find affected states in sibling regions
- for (Iterator siblings = par.getChildren().iterator();
- siblings.hasNext();) {
- State s = (State) siblings.next();
- for (Iterator act = currentStates.iterator();
- act.hasNext();) {
- TransitionTarget a = (TransitionTarget) act.next();
+ for (TransitionTarget tt : par.getChildren()) {
+ State s = (State) tt;
+ for (TransitionTarget a : currentStates) {
if (isDescendant(a, s)) {
//a is affected
boolean added = false;
@@ -433,12 +423,11 @@
if (datamodel == null) {
return;
}
- List data = datamodel.getData();
+ List<Data> data = datamodel.getData();
if (data == null) {
return;
}
- for (Iterator iter = data.iterator(); iter.hasNext();) {
- Data datum = (Data) iter.next();
+ for (Data datum : data) {
Node datumNode = datum.getNode();
Node valueNode = null;
if (datumNode != null) {
