Author: sebb
Date: Sat Oct 24 13:43:11 2009
New Revision: 829367
URL: http://svn.apache.org/viewvc?rev=829367&view=rev
Log:
Fix internal raw types
Modified:
commons/proper/lang/trunk/src/java/org/apache/commons/lang/reflect/ConstructorUtils.java
Modified:
commons/proper/lang/trunk/src/java/org/apache/commons/lang/reflect/ConstructorUtils.java
URL:
http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/java/org/apache/commons/lang/reflect/ConstructorUtils.java?rev=829367&r1=829366&r2=829367&view=diff
==============================================================================
---
commons/proper/lang/trunk/src/java/org/apache/commons/lang/reflect/ConstructorUtils.java
(original)
+++
commons/proper/lang/trunk/src/java/org/apache/commons/lang/reflect/ConstructorUtils.java
Sat Oct 24 13:43:11 2009
@@ -145,7 +145,7 @@
if (args == null) {
args = ArrayUtils.EMPTY_OBJECT_ARRAY;
}
- Constructor ctor = getMatchingAccessibleConstructor(cls,
parameterTypes);
+ Constructor<?> ctor = getMatchingAccessibleConstructor(cls,
parameterTypes);
if (null == ctor) {
throw new NoSuchMethodException(
"No such accessible constructor on object: "
@@ -238,7 +238,7 @@
if (parameterTypes == null) {
parameterTypes = ArrayUtils.EMPTY_CLASS_ARRAY;
}
- Constructor ctor = getAccessibleConstructor(cls, parameterTypes);
+ Constructor<?> ctor = getAccessibleConstructor(cls, parameterTypes);
if (null == ctor) {
throw new NoSuchMethodException(
"No such accessible constructor on object: "
@@ -309,20 +309,20 @@
// see if we can find the constructor directly
// most of the time this works and it's much faster
try {
- Constructor ctor = cls.getConstructor(parameterTypes);
+ Constructor<?> ctor = cls.getConstructor(parameterTypes);
MemberUtils.setAccessibleWorkaround(ctor);
return ctor;
} catch (NoSuchMethodException e) { /* SWALLOW */
}
- Constructor result = null;
+ Constructor<?> result = null;
// search through all constructors
- Constructor[] ctors = cls.getConstructors();
+ Constructor<?>[] ctors = cls.getConstructors();
for (int i = 0; i < ctors.length; i++) {
// compare parameters
if (ClassUtils.isAssignable(parameterTypes, ctors[i]
.getParameterTypes(), true)) {
// get accessible version of method
- Constructor ctor = getAccessibleConstructor(ctors[i]);
+ Constructor<?> ctor = getAccessibleConstructor(ctors[i]);
if (ctor != null) {
MemberUtils.setAccessibleWorkaround(ctor);
if (result == null
