diff --git a/org.springframework.core/src/main/java/org/springframework/core/annotation/AnnotationUtils.java b/org.springframework.core/src/main/java/org/springframework/core/annotation/AnnotationUtils.java index 94af2c95bd2..356d6d9a135 100644 --- a/org.springframework.core/src/main/java/org/springframework/core/annotation/AnnotationUtils.java +++ b/org.springframework.core/src/main/java/org/springframework/core/annotation/AnnotationUtils.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2009 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -83,7 +83,7 @@ public abstract class AnnotationUtils { * supplied {@link Method}, traversing its super methods if no annotation * can be found on the given method itself. *

Annotations on methods are not inherited by default, so we need to handle - * this explicitly. Tge + * this explicitly. * @param method the method to look for annotations on * @param annotationType the annotation class to look for * @return the annotation found, or null if none found diff --git a/org.springframework.core/src/main/java/org/springframework/util/StringUtils.java b/org.springframework.core/src/main/java/org/springframework/util/StringUtils.java index 47208f6dda6..db5b860347b 100644 --- a/org.springframework.core/src/main/java/org/springframework/util/StringUtils.java +++ b/org.springframework.core/src/main/java/org/springframework/util/StringUtils.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2009 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -354,7 +354,9 @@ public abstract class StringUtils { if (str == null || sub == null || str.length() == 0 || sub.length() == 0) { return 0; } - int count = 0, pos = 0, idx = 0; + int count = 0; + int pos = 0; + int idx = 0; while ((idx = str.indexOf(sub, pos)) != -1) { ++count; pos = idx + sub.length(); @@ -738,8 +740,7 @@ public abstract class StringUtils { } List result = new ArrayList(); result.addAll(Arrays.asList(array1)); - for (int i = 0; i < array2.length; i++) { - String str = array2[i]; + for (String str : array2) { if (!result.contains(str)) { result.add(str); } @@ -818,8 +819,8 @@ public abstract class StringUtils { return array; } Set set = new TreeSet(); - for (int i = 0; i < array.length; i++) { - set.add(array[i]); + for (String element : array) { + set.add(element); } return toStringArray(set); } @@ -882,10 +883,9 @@ public abstract class StringUtils { return null; } Properties result = new Properties(); - for (int i = 0; i < array.length; i++) { - String element = array[i]; + for (String element : array) { if (charsToDelete != null) { - element = deleteAny(array[i], charsToDelete); + element = deleteAny(element, charsToDelete); } String[] splittedElement = split(element, delimiter); if (splittedElement == null) { @@ -1028,8 +1028,8 @@ public abstract class StringUtils { public static Set commaDelimitedListToSet(String str) { Set set = new TreeSet(); String[] tokens = commaDelimitedListToStringArray(str); - for (int i = 0; i < tokens.length; i++) { - set.add(tokens[i]); + for (String token : tokens) { + set.add(token); } return set; }