Convert 'for' loops to enhanced 'for' loops.
git-svn-id: https://svn.apache.org/repos/asf/commons/proper/digester/trunk@1806244 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/examples/api/addressbook/src/main/java/org/apache/commons/digester3/examples/api/addressbook/AddressBook.java b/examples/api/addressbook/src/main/java/org/apache/commons/digester3/examples/api/addressbook/AddressBook.java
index 2dd65c3..d2f8324 100644
--- a/examples/api/addressbook/src/main/java/org/apache/commons/digester3/examples/api/addressbook/AddressBook.java
+++ b/examples/api/addressbook/src/main/java/org/apache/commons/digester3/examples/api/addressbook/AddressBook.java
@@ -18,7 +18,6 @@
*/
import java.util.LinkedList;
-import java.util.Iterator;
/**
* See Main.java.
@@ -37,9 +36,7 @@
{
System.out.println( "Address book has " + people.size() + " entries" );
- for ( Iterator<Person> i = people.iterator(); i.hasNext(); )
- {
- Person p = i.next();
+ for (Person p : people) {
p.print();
}
}
diff --git a/examples/api/addressbook/src/main/java/org/apache/commons/digester3/examples/api/addressbook/Person.java b/examples/api/addressbook/src/main/java/org/apache/commons/digester3/examples/api/addressbook/Person.java
index e5cb21b..d5f7e61 100644
--- a/examples/api/addressbook/src/main/java/org/apache/commons/digester3/examples/api/addressbook/Person.java
+++ b/examples/api/addressbook/src/main/java/org/apache/commons/digester3/examples/api/addressbook/Person.java
@@ -19,7 +19,6 @@
import java.util.ArrayList;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.List;
/**
@@ -73,17 +72,13 @@
System.out.println( " category=" + category );
System.out.println( " name=" + name );
- for ( Iterator<String> i = emails.keySet().iterator(); i.hasNext(); )
- {
- String type = i.next();
+ for (String type : emails.keySet()) {
String address = emails.get( type );
System.out.println( " email (type " + type + ") : " + address );
}
- for ( Iterator<Address> i = addresses.iterator(); i.hasNext(); )
- {
- Address addr = i.next();
+ for (Address addr : addresses) {
addr.print( System.out, 2 );
}
}
diff --git a/examples/api/catalog/src/main/java/org/apache/commons/digester3/examples/api/catalog/Catalog.java b/examples/api/catalog/src/main/java/org/apache/commons/digester3/examples/api/catalog/Catalog.java
index 116416e..a795cfe 100644
--- a/examples/api/catalog/src/main/java/org/apache/commons/digester3/examples/api/catalog/Catalog.java
+++ b/examples/api/catalog/src/main/java/org/apache/commons/digester3/examples/api/catalog/Catalog.java
@@ -18,7 +18,6 @@
*/
import java.util.LinkedList;
-import java.util.Iterator;
/**
* See Main.java.
@@ -37,9 +36,7 @@
{
System.out.println( "This catalog has " + items.size() + " items" );
- for ( Iterator<Item> i = items.iterator(); i.hasNext(); )
- {
- Item item = i.next();
+ for (Item item : items) {
item.print();
}
}
diff --git a/examples/api/dbinsert/src/main/java/org/apache/commons/digester3/examples/api/dbinsert/RowInserterRule.java b/examples/api/dbinsert/src/main/java/org/apache/commons/digester3/examples/api/dbinsert/RowInserterRule.java
index e5bb7b8..d46c823 100644
--- a/examples/api/dbinsert/src/main/java/org/apache/commons/digester3/examples/api/dbinsert/RowInserterRule.java
+++ b/examples/api/dbinsert/src/main/java/org/apache/commons/digester3/examples/api/dbinsert/RowInserterRule.java
@@ -18,7 +18,6 @@
*/
import java.sql.Connection;
-import java.util.Iterator;
import org.apache.commons.digester3.Rule;
import org.apache.commons.digester3.examples.api.dbinsert.Row.Column;
@@ -80,10 +79,7 @@
StringBuilder colnames = new StringBuilder();
StringBuilder colvalues = new StringBuilder();
- for ( Iterator<Column> i = row.getColumns().iterator(); i.hasNext(); )
- {
- Column column = i.next();
-
+ for (Column column : row.getColumns()) {
if ( colnames.length() > 0 )
{
colnames.append( ", " );
diff --git a/examples/plugins/pipeline/src/main/java/org/apache/commons/digester3/examples/plugins/pipeline/CompoundTransform.java b/examples/plugins/pipeline/src/main/java/org/apache/commons/digester3/examples/plugins/pipeline/CompoundTransform.java
index 7a16669..9fe1d2c 100644
--- a/examples/plugins/pipeline/src/main/java/org/apache/commons/digester3/examples/plugins/pipeline/CompoundTransform.java
+++ b/examples/plugins/pipeline/src/main/java/org/apache/commons/digester3/examples/plugins/pipeline/CompoundTransform.java
@@ -18,7 +18,6 @@
*/
import java.util.LinkedList;
-import java.util.Iterator;
import org.apache.commons.digester3.Digester;
import org.apache.commons.digester3.plugins.PluginCreateRule;
@@ -45,9 +44,7 @@
@Override
public String transform( String s )
{
- for ( Iterator<Transform> i = transforms.iterator(); i.hasNext(); )
- {
- Transform t = i.next();
+ for (Transform t : transforms) {
s = t.transform( s );
}
return s;
diff --git a/examples/rss/src/main/java/org/apache/commons/digester3/rss/Channel.java b/examples/rss/src/main/java/org/apache/commons/digester3/rss/Channel.java
index 219f308..ab9d515 100644
--- a/examples/rss/src/main/java/org/apache/commons/digester3/rss/Channel.java
+++ b/examples/rss/src/main/java/org/apache/commons/digester3/rss/Channel.java
@@ -600,10 +600,9 @@
if ( skipDays.length > 0 )
{
writer.println( " <skipDays>" );
- for ( int i = 0; i < skipDays.length; i++ )
- {
+ for (String skipDay : skipDays) {
writer.print( " <skipDay>" );
- writer.print( skipDays[i] );
+ writer.print( skipDay );
writer.println( "</skipDay>" );
}
writer.println( " </skipDays>" );
@@ -613,10 +612,9 @@
if ( skipHours.length > 0 )
{
writer.println( " <skipHours>" );
- for ( int i = 0; i < skipHours.length; i++ )
- {
+ for (String skipHour : skipHours) {
writer.print( " <skipHour>" );
- writer.print( skipHours[i] );
+ writer.print( skipHour );
writer.println( "</skipHour>" );
}
writer.println( " </skipHours>" );
@@ -624,9 +622,8 @@
}
Item items[] = findItems();
- for ( int i = 0; i < items.length; i++ )
- {
- items[i].render( writer );
+ for (Item item : items) {
+ item.render( writer );
writer.println();
}
diff --git a/examples/xmlrules/addressbook/src/main/java/org/apache/commons/digester3/examples/xmlrules/addressbook/AddressBook.java b/examples/xmlrules/addressbook/src/main/java/org/apache/commons/digester3/examples/xmlrules/addressbook/AddressBook.java
index 81a6bd1..1e99b99 100644
--- a/examples/xmlrules/addressbook/src/main/java/org/apache/commons/digester3/examples/xmlrules/addressbook/AddressBook.java
+++ b/examples/xmlrules/addressbook/src/main/java/org/apache/commons/digester3/examples/xmlrules/addressbook/AddressBook.java
@@ -18,7 +18,6 @@
*/
import java.util.LinkedList;
-import java.util.Iterator;
/**
* See Main.java.
@@ -37,9 +36,7 @@
{
System.out.println( "Address book has " + people.size() + " entries" );
- for ( Iterator<Person> i = people.iterator(); i.hasNext(); )
- {
- Person p = i.next();
+ for (Person p : people) {
p.print();
}
}
diff --git a/examples/xmlrules/addressbook/src/main/java/org/apache/commons/digester3/examples/xmlrules/addressbook/Person.java b/examples/xmlrules/addressbook/src/main/java/org/apache/commons/digester3/examples/xmlrules/addressbook/Person.java
index 393dff2..745e5d8 100644
--- a/examples/xmlrules/addressbook/src/main/java/org/apache/commons/digester3/examples/xmlrules/addressbook/Person.java
+++ b/examples/xmlrules/addressbook/src/main/java/org/apache/commons/digester3/examples/xmlrules/addressbook/Person.java
@@ -19,7 +19,6 @@
import java.util.ArrayList;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.List;
/**
@@ -73,17 +72,13 @@
System.out.println( " category=" + category );
System.out.println( " name=" + name );
- for ( Iterator<String> i = emails.keySet().iterator(); i.hasNext(); )
- {
- String type = i.next();
+ for (String type : emails.keySet()) {
String address = emails.get( type );
System.out.println( " email (type " + type + ") : " + address );
}
- for ( Iterator<Address> i = addresses.iterator(); i.hasNext(); )
- {
- Address addr = i.next();
+ for (Address addr : addresses) {
addr.print( System.out, 2 );
}
}
