svn commit: r12983 - trunk/tests/org/argouml/moduleloader/GUITestModuleLoader2.java

Author: tfmorris
Date: 2007-07-04 21:59:26-0700
New Revision: 12983

Modified:
   trunk/tests/org/argouml/moduleloader/GUITestModuleLoader2.java

Log:
Use Java 5 for loop

Modified: trunk/tests/org/argouml/moduleloader/GUITestModuleLoader2.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/tests/org/argouml/moduleloader/GUITestModuleLoader2.java?view=diff&rev=12983&p1=trunk/tests/org/argouml/moduleloader/GUITestModuleLoader2.java&p2=trunk/tests/org/argouml/moduleloader/GUITestModuleLoader2.java&r1=12982&r2=12983
==============================================================================
--- trunk/tests/org/argouml/moduleloader/GUITestModuleLoader2.java	(original)
+++ trunk/tests/org/argouml/moduleloader/GUITestModuleLoader2.java	2007-07-04 21:59:26-0700
@@ -25,10 +25,10 @@
 package org.argouml.moduleloader;
 
 import java.util.Collection;
-import java.util.Iterator;
 import java.util.List;
 
 import junit.framework.TestCase;
+
 import org.argouml.model.InitializeModel;
 
 /**
@@ -61,9 +61,8 @@
 	Collection<String> all = ModuleLoader2.allModules();
 	assertNotNull(all);
 
-	Iterator<String> iter = all.iterator();
-	while (iter.hasNext()) {
-	    assertNotNull(iter.next());
+        for (String module : all) {
+	    assertNotNull(module);
 	}
     }
 
@@ -89,9 +88,9 @@
 	List<String> extensionLocations =
 	    ModuleLoader2.getInstance().getExtensionLocations();
 	assertNotNull(extensionLocations);
-	for (Iterator<String> iter = extensionLocations.iterator();
-		iter.hasNext();) {
-	    assertNotNull(iter.next());
+        
+	for (String extensionLocation : extensionLocations) {
+	    assertNotNull(extensionLocation);
 	}
     }