--- a/jdk/src/share/classes/java/beans/MethodDescriptor.java Thu Dec 01 11:09:54 2011 +0000
+++ b/jdk/src/share/classes/java/beans/MethodDescriptor.java Thu Dec 01 18:34:23 2011 +0000
@@ -42,7 +42,7 @@
private String[] paramNames;
- private List params;
+ private List<WeakReference<Class<?>>> params;
private ParameterDescriptor parameterDescriptors[];
@@ -81,10 +81,10 @@
public synchronized Method getMethod() {
Method method = getMethod0();
if (method == null) {
- Class cls = getClass0();
+ Class<?> cls = getClass0();
String name = getName();
if ((cls != null) && (name != null)) {
- Class[] params = getParams();
+ Class<?>[] params = getParams();
if (params == null) {
for (int i = 0; i < 3; i++) {
// Find methods for up to 2 params. We are guessing here.
@@ -121,15 +121,15 @@
: null;
}
- private synchronized void setParams(Class[] param) {
+ private synchronized void setParams(Class<?>[] param) {
if (param == null) {
return;
}
paramNames = new String[param.length];
- params = new ArrayList(param.length);
+ params = new ArrayList<>(param.length);
for (int i = 0; i < param.length; i++) {
paramNames[i] = param[i].getName();
- params.add(new WeakReference(param[i]));
+ params.add(new WeakReference<Class<?>>(param[i]));
}
}
@@ -138,12 +138,12 @@
return paramNames;
}
- private synchronized Class[] getParams() {
- Class[] clss = new Class[params.size()];
+ private synchronized Class<?>[] getParams() {
+ Class<?>[] clss = new Class<?>[params.size()];
for (int i = 0; i < params.size(); i++) {
- Reference ref = (Reference)params.get(i);
- Class cls = (Class)ref.get();
+ Reference<? extends Class<?>> ref = (Reference<? extends Class<?>>)params.get(i);
+ Class<?> cls = ref.get();
if (cls == null) {
return null;
} else {