stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8028229: Fix more raw types lint warning in core libraries

Browse Source 
Reviewed-by: chegar, forax, lancea, alanb, jfranck
This commit is contained in:
Joe Darcy 2013-11-12 09:44:39 -08:00
parent f5d34bdef1
commit 600047c7fc
13 changed files with 28 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jdk/src/share/classes/java/io/ObjectOutputStream.java
View File

@ -1248,7 +1248,7 @@ public class ObjectOutputStream
handles.assign(unshared ? null : desc);
Class<?> cl = desc.forClass();
Class[] ifaces = cl.getInterfaces();
Class<?>[] ifaces = cl.getInterfaces();
bout.writeInt(ifaces.length);
for (int i = 0; i < ifaces.length; i++) {
bout.writeUTF(ifaces[i].getName());

4
jdk/src/share/classes/java/io/ObjectStreamClass.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1996, 2011, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1996, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -1746,7 +1746,7 @@ public class ObjectStreamClass implements Serializable {
dout.writeUTF("()V");
}
Constructor[] cons = cl.getDeclaredConstructors();
Constructor<?>[] cons = cl.getDeclaredConstructors();
MemberSignature[] consSigs = new MemberSignature[cons.length];
for (int i = 0; i < cons.length; i++) {
consSigs[i] = new MemberSignature(cons[i]);

5
jdk/src/share/classes/java/lang/reflect/Proxy.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -494,9 +494,10 @@ public class Proxy implements java.io.Serializable {
private final int hash;
private final WeakReference<Class<?>>[] refs;
@SuppressWarnings("unchecked")
KeyX(Class<?>[] interfaces) {
hash = Arrays.hashCode(interfaces);
refs = new WeakReference[interfaces.length];
refs = (WeakReference<Class<?>>[])new WeakReference<?>[interfaces.length];
for (int i = 0; i < interfaces.length; i++) {
refs[i] = new WeakReference<>(interfaces[i]);
}

8
jdk/src/share/classes/java/nio/file/TempFileHelper.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -81,7 +81,7 @@ class TempFileHelper {
String prefix,
String suffix,
boolean createDirectory,
FileAttribute[] attrs)
FileAttribute<?>[] attrs)
throws IOException
{
if (prefix == null)
@ -155,7 +155,7 @@ class TempFileHelper {
static Path createTempFile(Path dir,
String prefix,
String suffix,
FileAttribute[] attrs)
FileAttribute<?>[] attrs)
throws IOException
{
return create(dir, prefix, suffix, false, attrs);
@ -167,7 +167,7 @@ class TempFileHelper {
*/
static Path createTempDirectory(Path dir,
String prefix,
FileAttribute[] attrs)
FileAttribute<?>[] attrs)
throws IOException
{
return create(dir, prefix, null, true, attrs);

2
jdk/src/share/classes/java/util/IdentityHashMap.java
View File

@ -1243,7 +1243,7 @@ public class IdentityHashMap<K,V>
if (ti >= size) {
throw new ConcurrentModificationException();
}
a[ti++] = (T) new AbstractMap.SimpleEntry(unmaskNull(key), tab[si + 1]);
a[ti++] = (T) new AbstractMap.SimpleEntry<>(unmaskNull(key), tab[si + 1]);
}
}
// fewer elements than expected or concurrent modification from other thread detected

2
jdk/src/share/classes/java/util/logging/Logger.java
View File

@ -351,7 +351,7 @@ public class Logger {
? caller.getClassLoader()
: null);
if (callersClassLoader != null) {
this.callersClassLoaderRef = new WeakReference(callersClassLoader);
this.callersClassLoaderRef = new WeakReference<>(callersClassLoader);
}
}

6
jdk/src/share/classes/java/util/logging/Logging.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -55,11 +55,11 @@ class Logging implements LoggingMXBean {
}
public List<String> getLoggerNames() {
Enumeration loggers = logManager.getLoggerNames();
Enumeration<String> loggers = logManager.getLoggerNames();
ArrayList<String> array = new ArrayList<>();
for (; loggers.hasMoreElements();) {
array.add((String) loggers.nextElement());
array.add(loggers.nextElement());
}
return array;
}

7
jdk/src/share/classes/sun/misc/Cleaner.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -57,14 +57,14 @@ import java.security.PrivilegedAction;
*/
public class Cleaner
extends PhantomReference
extends PhantomReference<Object>
{
// Dummy reference queue, needed because the PhantomReference constructor
// insists that we pass a queue. Nothing will ever be placed on this queue
// since the reference handler invokes cleaners explicitly.
//
private static final ReferenceQueue dummyQueue = new ReferenceQueue();
private static final ReferenceQueue<Object> dummyQueue = new ReferenceQueue<>();
// Doubly-linked list of live cleaners, which prevents the cleaners
// themselves from being GC'd before their referents
@ -119,6 +119,7 @@ public class Cleaner
/**
* Creates a new cleaner.
*
* @param ob the referent object to be cleaned
* @param thunk
* The cleanup code to be run when the cleaner is invoked. The
* cleanup code is run directly from the reference-handler thread,

4
jdk/src/share/classes/sun/misc/ProxyGenerator.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -384,7 +384,7 @@ public class ProxyGenerator {
private String className;
/** proxy interfaces */
private Class[] interfaces;
private Class<?>[] interfaces;
/** proxy class access flags */
private int accessFlags;

4
jdk/src/share/classes/sun/rmi/rmic/Main.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1996, 2012, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1996, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -494,7 +494,7 @@ public class Main implements sun.rmi.rmic.Constants {
extDirsArg);
BatchEnvironment result = null;
try {
Class[] ctorArgTypes = {OutputStream.class,ClassPath.class,Main.class};
Class<?>[] ctorArgTypes = {OutputStream.class,ClassPath.class,Main.class};
Object[] ctorArgs = {out,classPath,this};
Constructor<? extends BatchEnvironment> constructor =
environmentClass.getConstructor(ctorArgTypes);

4
jdk/src/share/classes/sun/rmi/server/LoaderHandler.java
View File

@ -692,7 +692,7 @@ public final class LoaderHandler {
* Define a proxy class in the given class loader. The proxy
* class will implement the given interfaces Classes.
*/
private static Class<?> loadProxyClass(ClassLoader loader, Class[] interfaces)
private static Class<?> loadProxyClass(ClassLoader loader, Class<?>[] interfaces)
throws ClassNotFoundException
{
try {
@ -719,7 +719,7 @@ public final class LoaderHandler {
*/
private static ClassLoader loadProxyInterfaces(String[] interfaces,
ClassLoader loader,
Class[] classObjs,
Class<?>[] classObjs,
boolean[] nonpublic)
throws ClassNotFoundException
{

2
jdk/src/share/classes/sun/rmi/server/UnicastServerRef.java
View File

@ -299,7 +299,7 @@ public class UnicastServerRef extends UnicastRef
logCall(obj, method);
// unmarshal parameters
Class[] types = method.getParameterTypes();
Class<?>[] types = method.getParameterTypes();
Object[] params = new Object[types.length];
try {

4
jdk/src/share/classes/sun/rmi/server/Util.java
View File

@ -87,7 +87,7 @@ public final class Util {
Collections.synchronizedMap(new WeakHashMap<Class<?>, Void>(11));
/** parameter types for stub constructor */
private static final Class[] stubConsParamTypes = { RemoteRef.class };
private static final Class<?>[] stubConsParamTypes = { RemoteRef.class };
private Util() {
}
@ -143,7 +143,7 @@ public final class Util {
}
final ClassLoader loader = implClass.getClassLoader();
final Class[] interfaces = getRemoteInterfaces(implClass);
final Class<?>[] interfaces = getRemoteInterfaces(implClass);
final InvocationHandler handler =
new RemoteObjectInvocationHandler(clientRef);