root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

polishing

This commit is contained in:
Juergen Hoeller 2009-01-19 22:07:25 +00:00
parent 5948d05ee0
commit 76888e243f
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
org.springframework.core/src/main/java/org/springframework/core/annotation/AnnotationUtils.java
View File

@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with 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 * supplied {@link Method}, traversing its super methods if no annotation
* can be found on the given method itself. * can be found on the given method itself.
* <p>Annotations on methods are not inherited by default, so we need to handle * <p>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 method the method to look for annotations on
* @param annotationType the annotation class to look for * @param annotationType the annotation class to look for
* @return the annotation found, or <code>null</code> if none found * @return the annotation found, or <code>null</code> if none found

22
org.springframework.core/src/main/java/org/springframework/util/StringUtils.java
View File

@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with 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) { if (str == null || sub == null || str.length() == 0 || sub.length() == 0) {
return 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) { while ((idx = str.indexOf(sub, pos)) != -1) {
++count; ++count;
pos = idx + sub.length(); pos = idx + sub.length();
@ -738,8 +740,7 @@ public abstract class StringUtils {
} }
List<String> result = new ArrayList<String>(); List<String> result = new ArrayList<String>();
result.addAll(Arrays.asList(array1)); result.addAll(Arrays.asList(array1));
for (int i = 0; i < array2.length; i++) { for (String str : array2) {
String str = array2[i];
if (!result.contains(str)) { if (!result.contains(str)) {
result.add(str); result.add(str);
} }
@ -818,8 +819,8 @@ public abstract class StringUtils {
return array; return array;
} }
Set<String> set = new TreeSet<String>(); Set<String> set = new TreeSet<String>();
for (int i = 0; i < array.length; i++) { for (String element : array) {
set.add(array[i]); set.add(element);
} }
return toStringArray(set); return toStringArray(set);
} }
@ -882,10 +883,9 @@ public abstract class StringUtils {
return null; return null;
} }
Properties result = new Properties(); Properties result = new Properties();
for (int i = 0; i < array.length; i++) { for (String element : array) {
String element = array[i];
if (charsToDelete != null) { if (charsToDelete != null) {
element = deleteAny(array[i], charsToDelete); element = deleteAny(element, charsToDelete);
} }
String[] splittedElement = split(element, delimiter); String[] splittedElement = split(element, delimiter);
if (splittedElement == null) { if (splittedElement == null) {
@ -1028,8 +1028,8 @@ public abstract class StringUtils {
public static Set<String> commaDelimitedListToSet(String str) { public static Set<String> commaDelimitedListToSet(String str) {
Set<String> set = new TreeSet<String>(); Set<String> set = new TreeSet<String>();
String[] tokens = commaDelimitedListToStringArray(str); String[] tokens = commaDelimitedListToStringArray(str);
for (int i = 0; i < tokens.length; i++) { for (String token : tokens) {
set.add(tokens[i]); set.add(token);
} }
return set; return set;
} }