Spring/spring-webflow
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Replace use of Iterator with Java 5 foreach loops

Browse Source 
Issues: SWF-1532
This commit is contained in:
Phillip Webb
2012-04-05 15:52:09 -07:00
parent 22b018e95a
commit 34f4837ebd
35 changed files with 113 additions and 255 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
spring-binding/src/main/java/org/springframework/binding/convert/converters/ArrayToCollection.java
View File

@@ -19,7 +19,6 @@ import java.lang.reflect.Array;
import java.lang.reflect.Constructor;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Iterator;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Set;
@@ -101,8 +100,7 @@ public class ArrayToCollection implements TwoWayConverter {
Collection<?> collection = (Collection<?>) target;
Object array = Array.newInstance(sourceClass.getComponentType(), collection.size());
int i = 0;
for (Iterator<?> it = collection.iterator(); it.hasNext(); i++) {
Object value = it.next();
for (Object value : collection) {
if (value != null) {
ConversionExecutor converter;
if (elementConverter != null) {
@@ -113,7 +111,7 @@ public class ArrayToCollection implements TwoWayConverter {
}
value = converter.execute(value);
}
Array.set(array, i, value);
Array.set(array, i++, value);
}
return array;
}

5
spring-binding/src/main/java/org/springframework/binding/convert/converters/CollectionToCollection.java
View File

@@ -1,7 +1,6 @@
package org.springframework.binding.convert.converters;
import java.util.Collection;
import java.util.Iterator;
import org.springframework.binding.convert.ConversionExecutor;
import org.springframework.binding.convert.ConversionService;
@@ -54,9 +53,7 @@ public class CollectionToCollection implements Converter {
Collection targetCollection = CollectionFactory.createCollection(targetClass, DEFAULT_INITIAL_SIZE);
ConversionExecutor elementConverter = getElementConverter(source, (Class<? extends Collection<?>>) targetClass);
Collection sourceCollection = (Collection) source;
Iterator it = sourceCollection.iterator();
while (it.hasNext()) {
Object value = it.next();
for (Object value : sourceCollection) {
if (elementConverter != null) {
value = elementConverter.execute(value);
}

5
spring-binding/src/main/java/org/springframework/binding/expression/el/DefaultELResolver.java
View File

@@ -15,7 +15,6 @@
*/
package org.springframework.binding.expression.el;
import java.util.Iterator;
import java.util.List;
import javax.el.ArrayELResolver;
@@ -91,9 +90,7 @@ public class DefaultELResolver extends CompositeELResolver {
private void configureResolvers(List<? extends ELResolver> customResolvers) {
if (customResolvers != null) {
Iterator<? extends ELResolver> i = customResolvers.iterator();
while (i.hasNext()) {
ELResolver resolver = i.next();
for (ELResolver resolver : customResolvers) {
add(resolver);
}
}

5
spring-binding/src/main/java/org/springframework/binding/mapping/impl/DefaultMapper.java
View File

@@ -16,7 +16,6 @@
package org.springframework.binding.mapping.impl;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import org.apache.commons.logging.Log;
@@ -62,9 +61,7 @@ public class DefaultMapper implements Mapper {
+ target.getClass().getName() + "]");
}
DefaultMappingContext context = new DefaultMappingContext(source, target);
Iterator<DefaultMapping> it = mappings.iterator();
while (it.hasNext()) {
DefaultMapping mapping = it.next();
for (DefaultMapping mapping : mappings) {
mapping.map(context);
}
MappingResults results = context.getMappingResults();

13
spring-binding/src/main/java/org/springframework/binding/mapping/impl/DefaultMappingResults.java
View File

@@ -17,7 +17,6 @@ package org.springframework.binding.mapping.impl;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Iterator;
import java.util.List;
import org.springframework.binding.mapping.MappingResult;
@@ -61,9 +60,7 @@ public class DefaultMappingResults implements MappingResults {
}
public boolean hasErrorResults() {
Iterator<MappingResult> it = mappingResults.iterator();
while (it.hasNext()) {
MappingResult result = it.next();
for (MappingResult result : mappingResults) {
if (result.isError()) {
return true;
}
@@ -73,9 +70,7 @@ public class DefaultMappingResults implements MappingResults {
public List<MappingResult> getErrorResults() {
List<MappingResult> errorResults = new ArrayList<MappingResult>();
Iterator<MappingResult> it = mappingResults.iterator();
while (it.hasNext()) {
MappingResult result = it.next();
for (MappingResult result : mappingResults) {
if (result.isError()) {
errorResults.add(result);
}
@@ -85,9 +80,7 @@ public class DefaultMappingResults implements MappingResults {
public List<MappingResult> getResults(MappingResultsCriteria criteria) {
List<MappingResult> results = new ArrayList<MappingResult>();
Iterator<MappingResult> it = mappingResults.iterator();
while (it.hasNext()) {
MappingResult result = it.next();
for (MappingResult result : mappingResults) {
if (criteria.test(result)) {
results.add(result);
}

9
spring-binding/src/main/java/org/springframework/binding/message/DefaultMessageContext.java
View File

@@ -18,7 +18,6 @@ package org.springframework.binding.message;
import java.io.Serializable;
import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Locale;
@@ -88,9 +87,7 @@ public class DefaultMessageContext implements StateManageableMessageContext {
public Message[] getMessagesByCriteria(MessageCriteria criteria) {
List<Message> messages = new ArrayList<Message>();
Iterator<List<Message>> it = sourceMessages.values().iterator();
while (it.hasNext()) {
List<Message> sourceMessages = it.next();
for (List<Message> sourceMessages : this.sourceMessages.values()) {
for (Message message : sourceMessages) {
if (criteria.test(message)) {
messages.add(message);
@@ -101,9 +98,7 @@ public class DefaultMessageContext implements StateManageableMessageContext {
}
public boolean hasErrorMessages() {
Iterator<List<Message>> it = sourceMessages.values().iterator();
while (it.hasNext()) {
List<Message> sourceMessages = it.next();
for (List<Message> sourceMessages : this.sourceMessages.values()) {
for (Message message : sourceMessages) {
if (message.getSeverity() == Severity.ERROR) {
return true;

5
spring-binding/src/main/java/org/springframework/binding/message/MessageContextErrors.java
View File

@@ -17,7 +17,6 @@ package org.springframework.binding.message;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Iterator;
import java.util.List;
import org.springframework.binding.expression.Expression;
@@ -100,9 +99,7 @@ public class MessageContextErrors extends AbstractErrors {
}
public void addAllErrors(Errors errors) {
Iterator<ObjectError> it = errors.getAllErrors().iterator();
while (it.hasNext()) {
ObjectError error = it.next();
for (ObjectError error : errors.getAllErrors()) {
MessageBuilder builder = new MessageBuilder().error().codes(error.getCodes()).args(error.getArguments())
.defaultText(error.getDefaultMessage());
if (error instanceof FieldError) {