svn commit: r612288 - /commons/proper/scxml/branches/J5/src/main/java/org/apache/commons/scxml/io/SCXMLDigester.java

[rahul]

Author: rahul
Date: Tue Jan 15 15:03:09 2008
New Revision: 612288

URL: http://svn.apache.org/viewvc?rev=612288&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/io/SCXMLDigester.java

Modified: 
commons/proper/scxml/branches/J5/src/main/java/org/apache/commons/scxml/io/SCXMLDigester.java
URL: 
http://svn.apache.org/viewvc/commons/proper/scxml/branches/J5/src/main/java/org/apache/commons/scxml/io/SCXMLDigester.java?rev=612288&r1=612287&r2=612288&view=diff
==============================================================================
--- 
commons/proper/scxml/branches/J5/src/main/java/org/apache/commons/scxml/io/SCXMLDigester.java
 (original)
+++ 
commons/proper/scxml/branches/J5/src/main/java/org/apache/commons/scxml/io/SCXMLDigester.java
 Tue Jan 15 15:03:09 2008
@@ -21,6 +21,7 @@
 import java.text.MessageFormat;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
@@ -1025,8 +1026,7 @@
         if (customActions == null || customActions.size() == 0) {
             return;
         }
-        for (int i = 0; i < customActions.size(); i++) {
-            CustomAction ca = customActions.get(i);
+        for (CustomAction ca : customActions) {
             if (ca == null) {
                 org.apache.commons.logging.Log log = LogFactory.
                     getLog(SCXMLDigester.class);
@@ -1461,10 +1461,10 @@
             Initial ini = new Initial();
             ini.setTransition(t);
             s.setInitial(ini);
-            Map children = externalSCXML.getStates();
-            Object[] ids = children.keySet().toArray();
-            for (int i = 0; i < ids.length; i++) {
-                s.addChild((State) children.get(ids[i]));
+            Map<String, TransitionTarget> children = externalSCXML.getStates();
+            Set<String> ids = children.keySet();
+            for (String id : ids) {
+                s.addChild(children.get(id));
             }
             s.setDatamodel(externalSCXML.getDatamodel());
         }