8000269: Cleanup javadoc warnings
Reviewed-by: lancea, darcy, ulfzibis, iris, naoto, dholmes
--- a/jdk/src/share/classes/java/io/FilePermission.java Sat Sep 29 15:44:06 2012 +0400
+++ b/jdk/src/share/classes/java/io/FilePermission.java Mon Oct 01 15:36:57 2012 +0100
@@ -76,7 +76,7 @@
* <P>
* Be careful when granting FilePermissions. Think about the implications
* of granting read and especially write access to various files and
- * directories. The "<<ALL FILES>>" permission with write action is
+ * directories. The "<<ALL FILES>>" permission with write action is
* especially dangerous. This grants permission to write to the entire
* file system. One thing this effectively allows is replacement of the
* system binary, including the JVM runtime environment.
@@ -180,9 +180,7 @@
* @param mask the actions mask to use.
*
*/
- private void init(int mask)
- {
-
+ private void init(int mask) {
if ((mask & ALL) != mask)
throw new IllegalArgumentException("invalid actions mask");
@@ -274,9 +272,7 @@
* If actions is <code>null</code>, empty or contains an action
* other than the specified possible actions.
*/
-
- public FilePermission(String path, String actions)
- {
+ public FilePermission(String path, String actions) {
super(path);
init(getMask(actions));
}
@@ -293,8 +289,7 @@
*/
// package private for use by the FilePermissionCollection add method
- FilePermission(String path, int mask)
- {
+ FilePermission(String path, int mask) {
super(path);
init(mask);
}
@@ -337,7 +332,6 @@
* this FilePermission's path also implies that FilePermission's path.
*
* @param that the FilePermission to check against.
- * @param exact return immediately if the masks are not equal
* @return the effective mask
*/
boolean impliesIgnoreMask(FilePermission that) {
@@ -412,7 +406,6 @@
*
* @return a hash code value for this object.
*/
-
public int hashCode() {
return this.cpath.hashCode();
}
@@ -424,7 +417,6 @@
* @return the actions mask.
*/
private static int getMask(String actions) {
-
int mask = NONE;
// Null action valid?
@@ -552,7 +544,6 @@
*
* @return the actions mask.
*/
-
int getMask() {
return mask;
}
@@ -564,8 +555,7 @@
*
* @return the canonical string representation of the actions.
*/
- private static String getActions(int mask)
- {
+ private static String getActions(int mask) {
StringBuilder sb = new StringBuilder();
boolean comma = false;
@@ -610,15 +600,13 @@
*
* @return the canonical string representation of the actions.
*/
- public String getActions()
- {
+ public String getActions() {
if (actions == null)
actions = getActions(this.mask);
return actions;
}
-
/**
* Returns a new PermissionCollection object for storing FilePermission
* objects.
@@ -650,7 +638,6 @@
* @return a new PermissionCollection object suitable for storing
* FilePermissions.
*/
-
public PermissionCollection newPermissionCollection() {
return new FilePermissionCollection();
}
@@ -712,22 +699,20 @@
*/
final class FilePermissionCollection extends PermissionCollection
-implements Serializable {
-
+ implements Serializable
+{
// Not serialized; see serialization section at end of class
private transient List<Permission> perms;
/**
- * Create an empty FilePermissions object.
- *
+ * Create an empty FilePermissionCollection object.
*/
-
public FilePermissionCollection() {
perms = new ArrayList<>();
}
/**
- * Adds a permission to the FilePermissions. The key for the hash is
+ * Adds a permission to the FilePermissionCollection. The key for the hash is
* permission.path.
*
* @param permission the Permission object to add.
@@ -738,9 +723,7 @@
* @exception SecurityException - if this FilePermissionCollection object
* has been marked readonly
*/
-
- public void add(Permission permission)
- {
+ public void add(Permission permission) {
if (! (permission instanceof FilePermission))
throw new IllegalArgumentException("invalid permission: "+
permission);
@@ -757,16 +740,14 @@
* Check and see if this set of permissions implies the permissions
* expressed in "permission".
*
- * @param p the Permission object to compare
+ * @param permission the Permission object to compare
*
* @return true if "permission" is a proper subset of a permission in
* the set, false if not.
*/
-
- public boolean implies(Permission permission)
- {
+ public boolean implies(Permission permission) {
if (! (permission instanceof FilePermission))
- return false;
+ return false;
FilePermission fp = (FilePermission) permission;
@@ -795,7 +776,6 @@
*
* @return an enumeration of all the FilePermission objects.
*/
-
public Enumeration<Permission> elements() {
// Convert Iterator into Enumeration
synchronized (this) {
@@ -841,8 +821,9 @@
/*
* Reads in a Vector of FilePermissions and saves them in the perms field.
*/
- private void readObject(ObjectInputStream in) throws IOException,
- ClassNotFoundException {
+ private void readObject(ObjectInputStream in)
+ throws IOException, ClassNotFoundException
+ {
// Don't call defaultReadObject()
// Read in serialized fields
--- a/jdk/src/share/classes/java/io/PrintWriter.java Sat Sep 29 15:44:06 2012 +0400
+++ b/jdk/src/share/classes/java/io/PrintWriter.java Mon Oct 01 15:36:57 2012 +0100
@@ -784,7 +784,7 @@
* <tt>null</tt> argument depends on the <a
* href="../util/Formatter.html#syntax">conversion</a>.
*
- * @throws IllegalFormatException
+ * @throws java.util.IllegalFormatException
* If a format string contains an illegal syntax, a format
* specifier that is incompatible with the given arguments,
* insufficient arguments given the format string, or other
@@ -835,7 +835,7 @@
* <tt>null</tt> argument depends on the <a
* href="../util/Formatter.html#syntax">conversion</a>.
*
- * @throws IllegalFormatException
+ * @throws java.util.IllegalFormatException
* If a format string contains an illegal syntax, a format
* specifier that is incompatible with the given arguments,
* insufficient arguments given the format string, or other
@@ -879,7 +879,7 @@
* <tt>null</tt> argument depends on the <a
* href="../util/Formatter.html#syntax">conversion</a>.
*
- * @throws IllegalFormatException
+ * @throws java.util.IllegalFormatException
* If a format string contains an illegal syntax, a format
* specifier that is incompatible with the given arguments,
* insufficient arguments given the format string, or other
@@ -939,7 +939,7 @@
* <tt>null</tt> argument depends on the <a
* href="../util/Formatter.html#syntax">conversion</a>.
*
- * @throws IllegalFormatException
+ * @throws java.util.IllegalFormatException
* If a format string contains an illegal syntax, a format
* specifier that is incompatible with the given arguments,
* insufficient arguments given the format string, or other
--- a/jdk/src/share/classes/java/io/Reader.java Sat Sep 29 15:44:06 2012 +0400
+++ b/jdk/src/share/classes/java/io/Reader.java Mon Oct 01 15:36:57 2012 +0100
@@ -91,7 +91,7 @@
* -1 if this source of characters is at its end
* @throws IOException if an I/O error occurs
* @throws NullPointerException if target is null
- * @throws ReadOnlyBufferException if target is a read only buffer
+ * @throws java.nio.ReadOnlyBufferException if target is a read only buffer
* @since 1.5
*/
public int read(java.nio.CharBuffer target) throws IOException {
--- a/jdk/src/share/classes/java/lang/Class.java Sat Sep 29 15:44:06 2012 +0400
+++ b/jdk/src/share/classes/java/lang/Class.java Mon Oct 01 15:36:57 2012 +0100
@@ -2970,7 +2970,7 @@
/**
* Returns a map from simple name to enum constant. This package-private
* method is used internally by Enum to implement
- * public static <T extends Enum<T>> T valueOf(Class<T>, String)
+ * {@code public static <T extends Enum<T>> T valueOf(Class<T>, String)}
* efficiently. Note that the map is returned by this method is
* created lazily on first use. Typically it won't ever get created.
*/
--- a/jdk/src/share/classes/java/lang/InheritableThreadLocal.java Sat Sep 29 15:44:06 2012 +0400
+++ b/jdk/src/share/classes/java/lang/InheritableThreadLocal.java Mon Oct 01 15:36:57 2012 +0100
@@ -76,7 +76,6 @@
*
* @param t the current thread
* @param firstValue value for the initial entry of the table.
- * @param map the map to store.
*/
void createMap(Thread t, T firstValue) {
t.inheritableThreadLocals = new ThreadLocalMap(this, firstValue);
--- a/jdk/src/share/classes/java/lang/Integer.java Sat Sep 29 15:44:06 2012 +0400
+++ b/jdk/src/share/classes/java/lang/Integer.java Mon Oct 01 15:36:57 2012 +0100
@@ -752,7 +752,7 @@
* -128 and 127 (inclusive) as required by JLS.
*
* The cache is initialized on first usage. The size of the cache
- * may be controlled by the -XX:AutoBoxCacheMax=<size> option.
+ * may be controlled by the {@code -XX:AutoBoxCacheMax=<size>} option.
* During VM initialization, java.lang.Integer.IntegerCache.high property
* may be set and saved in the private system properties in the
* sun.misc.VM class.
--- a/jdk/src/share/classes/java/lang/Package.java Sat Sep 29 15:44:06 2012 +0400
+++ b/jdk/src/share/classes/java/lang/Package.java Mon Oct 01 15:36:57 2012 +0100
@@ -316,7 +316,7 @@
* attributes are defined in the manifests that accompany
* the classes.
*
- * @param class the class to get the package of.
+ * @param c the class to get the package of.
* @return the package of the class. It may be null if no package
* information is available from the archive or codebase. */
static Package getPackage(Class<?> c) {
@@ -411,14 +411,13 @@
/**
* Construct a package instance with the specified version
* information.
- * @param pkgName the name of the package
+ * @param name the name of the package
* @param spectitle the title of the specification
* @param specversion the version of the specification
* @param specvendor the organization that maintains the specification
* @param impltitle the title of the implementation
* @param implversion the version of the implementation
* @param implvendor the organization that maintains the implementation
- * @return a new package for containing the specified information.
*/
Package(String name,
String spectitle, String specversion, String specvendor,
--- a/jdk/src/share/classes/java/lang/StrictMath.java Sat Sep 29 15:44:06 2012 +0400
+++ b/jdk/src/share/classes/java/lang/StrictMath.java Mon Oct 01 15:36:57 2012 +0100
@@ -365,7 +365,7 @@
* @param a the value to be floored or ceiled
* @param negativeBoundary result for values in (-1, 0)
* @param positiveBoundary result for values in (0, 1)
- * @param increment value to add when the argument is non-integral
+ * @param sign the sign of the result
*/
private static double floorOrCeil(double a,
double negativeBoundary,
@@ -811,7 +811,7 @@
* @param value the long value
* @return the argument as an int
* @throws ArithmeticException if the {@code argument} overflows an int
- * @see Math#toIntExact(int)
+ * @see Math#toIntExact(long)
* @since 1.8
*/
public static int toIntExact(long value) {
--- a/jdk/src/share/classes/java/lang/String.java Sat Sep 29 15:44:06 2012 +0400
+++ b/jdk/src/share/classes/java/lang/String.java Mon Oct 01 15:36:57 2012 +0100
@@ -2782,7 +2782,7 @@
* <tt>null</tt> argument depends on the <a
* href="../util/Formatter.html#syntax">conversion</a>.
*
- * @throws IllegalFormatException
+ * @throws java.util.IllegalFormatException
* If a format string contains an illegal syntax, a format
* specifier that is incompatible with the given arguments,
* insufficient arguments given the format string, or other
@@ -2826,7 +2826,7 @@
* <tt>null</tt> argument depends on the <a
* href="../util/Formatter.html#syntax">conversion</a>.
*
- * @throws IllegalFormatException
+ * @throws java.util.IllegalFormatException
* If a format string contains an illegal syntax, a format
* specifier that is incompatible with the given arguments,
* insufficient arguments given the format string, or other
--- a/jdk/src/share/classes/java/lang/System.java Sat Sep 29 15:44:06 2012 +0400
+++ b/jdk/src/share/classes/java/lang/System.java Mon Oct 01 15:36:57 2012 +0100
@@ -545,7 +545,7 @@
* <tr><td><code>java.version</code></td>
* <td>Java Runtime Environment version</td></tr>
* <tr><td><code>java.vendor</code></td>
- * <td>Java Runtime Environment vendor</td></tr
+ * <td>Java Runtime Environment vendor</td></tr>
* <tr><td><code>java.vendor.url</code></td>
* <td>Java vendor URL</td></tr>
* <tr><td><code>java.home</code></td>
--- a/jdk/src/share/classes/java/lang/ThreadGroup.java Sat Sep 29 15:44:06 2012 +0400
+++ b/jdk/src/share/classes/java/lang/ThreadGroup.java Mon Oct 01 15:36:57 2012 +0100
@@ -918,9 +918,6 @@
*
* @param t
* the Thread whose start method was invoked
- *
- * @param failed
- * true if the thread could not be started successfully
*/
void threadStartFailed(Thread t) {
synchronized(this) {
--- a/jdk/src/share/classes/java/lang/ThreadLocal.java Sat Sep 29 15:44:06 2012 +0400
+++ b/jdk/src/share/classes/java/lang/ThreadLocal.java Mon Oct 01 15:36:57 2012 +0100
@@ -47,8 +47,8 @@
* private static final AtomicInteger nextId = new AtomicInteger(0);
*
* // Thread local variable containing each thread's ID
- * private static final ThreadLocal<Integer> threadId =
- * new ThreadLocal<Integer>() {
+ * private static final ThreadLocal<Integer> threadId =
+ * new ThreadLocal<Integer>() {
* @Override protected Integer initialValue() {
* return nextId.getAndIncrement();
* }
@@ -222,7 +222,6 @@
*
* @param t the current thread
* @param firstValue value for the initial entry of the map
- * @param map the map to store.
*/
void createMap(Thread t, T firstValue) {
t.threadLocals = new ThreadLocalMap(this, firstValue);
--- a/jdk/src/share/classes/java/lang/management/ThreadInfo.java Sat Sep 29 15:44:06 2012 +0400
+++ b/jdk/src/share/classes/java/lang/management/ThreadInfo.java Mon Oct 01 15:36:57 2012 +0100
@@ -147,8 +147,9 @@
* @param waitedCount Number of times waited on a lock
* @param waitedTime Approx time waited on a lock
* @param stackTrace Thread stack trace
- * @param lockedMonitors List of locked monitors
- * @param lockedSynchronizers List of locked synchronizers
+ * @param monitors List of locked monitors
+ * @param stackDepths List of stack depths
+ * @param synchronizers List of locked synchronizers
*/
private ThreadInfo(Thread t, int state, Object lockObj, Thread lockOwner,
long blockedCount, long blockedTime,
--- a/jdk/src/share/classes/java/net/AbstractPlainDatagramSocketImpl.java Sat Sep 29 15:44:06 2012 +0400
+++ b/jdk/src/share/classes/java/net/AbstractPlainDatagramSocketImpl.java Mon Oct 01 15:36:57 2012 +0100
@@ -99,7 +99,7 @@
/**
* Sends a datagram packet. The packet contains the data and the
* destination address to send the packet to.
- * @param packet to be sent.
+ * @param p the packet to be sent.
*/
protected abstract void send(DatagramPacket p) throws IOException;
@@ -130,13 +130,13 @@
/**
* Peek at the packet to see who it is from.
- * @param return the address which the packet came from.
+ * @param i the address to populate with the sender address
*/
protected abstract int peek(InetAddress i) throws IOException;
protected abstract int peekData(DatagramPacket p) throws IOException;
/**
* Receive the datagram packet.
- * @param Packet Received.
+ * @param p the packet to receive into
*/
protected synchronized void receive(DatagramPacket p)
throws IOException {
@@ -148,7 +148,7 @@
/**
* Set the TTL (time-to-live) option.
- * @param TTL to be set.
+ * @param ttl TTL to be set.
*/
protected abstract void setTimeToLive(int ttl) throws IOException;
@@ -159,7 +159,7 @@
/**
* Set the TTL (time-to-live) option.
- * @param TTL to be set.
+ * @param ttl TTL to be set.
*/
@Deprecated
protected abstract void setTTL(byte ttl) throws IOException;
@@ -172,7 +172,7 @@
/**
* Join the multicast group.
- * @param multicast address to join.
+ * @param inetaddr multicast address to join.
*/
protected void join(InetAddress inetaddr) throws IOException {
join(inetaddr, null);
@@ -180,14 +180,14 @@
/**
* Leave the multicast group.
- * @param multicast address to leave.
+ * @param inetaddr multicast address to leave.
*/
protected void leave(InetAddress inetaddr) throws IOException {
leave(inetaddr, null);
}
/**
* Join the multicast group.
- * @param multicast address to join.
+ * @param mcastaddr multicast address to join.
* @param netIf specifies the local interface to receive multicast
* datagram packets
* @throws IllegalArgumentException if mcastaddr is null or is a
@@ -207,7 +207,7 @@
/**
* Leave the multicast group.
- * @param multicast address to leave.
+ * @param mcastaddr multicast address to leave.
* @param netIf specified the local interface to leave the group at
* @throws IllegalArgumentException if mcastaddr is null or is a
* SocketAddress subclass not supported by this socket
--- a/jdk/src/share/classes/java/net/AbstractPlainSocketImpl.java Sat Sep 29 15:44:06 2012 +0400
+++ b/jdk/src/share/classes/java/net/AbstractPlainSocketImpl.java Mon Oct 01 15:36:57 2012 +0100
@@ -368,7 +368,7 @@
/**
* Binds the socket to the specified address of the specified local port.
* @param address the address
- * @param port the port
+ * @param lport the port
*/
protected synchronized void bind(InetAddress address, int lport)
throws IOException
--- a/jdk/src/share/classes/java/net/DatagramSocket.java Sat Sep 29 15:44:06 2012 +0400
+++ b/jdk/src/share/classes/java/net/DatagramSocket.java Mon Oct 01 15:36:57 2012 +0100
@@ -105,7 +105,7 @@
* Connects this socket to a remote socket address (IP address + port number).
* Binds socket if not already bound.
* <p>
- * @param addr The remote address.
+ * @param address The remote address.
* @param port The remote port
* @throws SocketException if binding the socket fails.
*/
--- a/jdk/src/share/classes/java/net/Inet4Address.java Sat Sep 29 15:44:06 2012 +0400
+++ b/jdk/src/share/classes/java/net/Inet4Address.java Mon Oct 01 15:36:57 2012 +0100
@@ -177,7 +177,6 @@
* a loopback address; or false otherwise.
* @since 1.4
*/
- private static final int loopback = 2130706433; /* 127.0.0.1 */
public boolean isLoopbackAddress() {
/* 127.x.x.x */
byte[] byteAddr = getAddress();
--- a/jdk/src/share/classes/java/net/SocketInputStream.java Sat Sep 29 15:44:06 2012 +0400
+++ b/jdk/src/share/classes/java/net/SocketInputStream.java Mon Oct 01 15:36:57 2012 +0100
@@ -112,7 +112,7 @@
* <i>length</i> bytes of data.
* @param b the buffer into which the data is read
* @param off the start offset of the data
- * @param len the maximum number of bytes read
+ * @param length the maximum number of bytes read
* @return the actual number of bytes read, -1 is
* returned when the end of the stream is reached.
* @exception IOException If an I/O error has occurred.
@@ -209,7 +209,7 @@
/**
* Skips n bytes of input.
- * @param n the number of bytes to skip
+ * @param numbytes the number of bytes to skip
* @return the actual number of bytes skipped.
* @exception IOException If an I/O error has occurred.
*/
--- a/jdk/src/share/classes/java/net/SocketPermission.java Sat Sep 29 15:44:06 2012 +0400
+++ b/jdk/src/share/classes/java/net/SocketPermission.java Mon Oct 01 15:36:57 2012 +0100
@@ -138,7 +138,7 @@
*/
public final class SocketPermission extends Permission
-implements java.io.Serializable
+ implements java.io.Serializable
{
private static final long serialVersionUID = -7204263841984476862L;
@@ -232,8 +232,7 @@
trustNameService = tmp.booleanValue();
}
- private static synchronized Debug getDebug()
- {
+ private static synchronized Debug getDebug() {
if (!debugInit) {
debug = Debug.getInstance("access");
debugInit = true;
@@ -288,8 +287,7 @@
defaultDeny = true;
}
- private static String getHost(String host)
- {
+ private static String getHost(String host) {
if (host.equals("")) {
return "localhost";
} else {
@@ -679,8 +677,8 @@
}
private boolean authorizedIPv4(String cname, byte[] addr) {
- String authHost = "";
- InetAddress auth;
+ String authHost = "";
+ InetAddress auth;
try {
authHost = "auth." +
@@ -708,8 +706,8 @@
}
private boolean authorizedIPv6(String cname, byte[] addr) {
- String authHost = "";
- InetAddress auth;
+ String authHost = "";
+ InetAddress auth;
try {
StringBuffer sb = new StringBuffer(39);
@@ -810,7 +808,6 @@
* @return true if the specified permission is implied by this object,
* false if not.
*/
-
public boolean implies(Permission p) {
int i,j;
@@ -844,12 +841,11 @@
* to find a match based on the IP addresses in both objects.
* <li> Attempt to match on the canonical hostnames of both objects.
* </ul>
- * @param p the incoming permission request
+ * @param that the incoming permission request
*
* @return true if "permission" is a proper subset of the current object,
* false if not.
*/
-
boolean impliesIgnoreMask(SocketPermission that) {
int i,j;
@@ -1229,7 +1225,7 @@
*/
final class SocketPermissionCollection extends PermissionCollection
-implements Serializable
+ implements Serializable
{
// Not serialized; see serialization section at end of class
private transient List<SocketPermission> perms;
@@ -1255,9 +1251,7 @@
* @exception SecurityException - if this SocketPermissionCollection object
* has been marked readonly
*/
-
- public void add(Permission permission)
- {
+ public void add(Permission permission) {
if (! (permission instanceof SocketPermission))
throw new IllegalArgumentException("invalid permission: "+
permission);
@@ -1276,7 +1270,7 @@
* Check and see if this collection of permissions implies the permissions
* expressed in "permission".
*
- * @param p the Permission object to compare
+ * @param permission the Permission object to compare
*
* @return true if "permission" is a proper subset of a permission in
* the collection, false if not.
@@ -1369,8 +1363,9 @@
/*
* Reads in a Vector of SocketPermissions and saves them in the perms field.
*/
- private void readObject(ObjectInputStream in) throws IOException,
- ClassNotFoundException {
+ private void readObject(ObjectInputStream in)
+ throws IOException, ClassNotFoundException
+ {
// Don't call in.defaultReadObject()
// Read in serialized fields
--- a/jdk/src/share/classes/java/net/SocksSocketImpl.java Sat Sep 29 15:44:06 2012 +0400
+++ b/jdk/src/share/classes/java/net/SocksSocketImpl.java Mon Oct 01 15:36:57 2012 +0100
@@ -644,7 +644,7 @@
* means "accept incoming connection from", so the SocketAddress is the
* the one of the host we do accept connection from.
*
- * @param addr the Socket address of the remote host.
+ * @param saddr the Socket address of the remote host.
* @exception IOException if an I/O error occurs when binding this socket.
*/
protected synchronized void socksBind(InetSocketAddress saddr) throws IOException {
--- a/jdk/src/share/classes/java/net/URLConnection.java Sat Sep 29 15:44:06 2012 +0400
+++ b/jdk/src/share/classes/java/net/URLConnection.java Mon Oct 01 15:36:57 2012 +0100
@@ -1241,10 +1241,9 @@
/**
* Gets the Content Handler appropriate for this connection.
- * @param connection the connection to use.
*/
synchronized ContentHandler getContentHandler()
- throws UnknownServiceException
+ throws UnknownServiceException
{
String contentType = stripOffParameters(getContentType());
ContentHandler handler = null;
--- a/jdk/src/share/classes/java/nio/channels/Channels.java Sat Sep 29 15:44:06 2012 +0400
+++ b/jdk/src/share/classes/java/nio/channels/Channels.java Mon Oct 01 15:36:57 2012 +0100
@@ -84,7 +84,7 @@
/**
* Write all remaining bytes in buffer to the given channel.
*
- * @throws IllegalBlockingException
+ * @throws IllegalBlockingModeException
* If the channel is selectable and configured non-blocking.
*/
private static void writeFully(WritableByteChannel ch, ByteBuffer bb)
--- a/jdk/src/share/classes/java/nio/file/FileSystem.java Sat Sep 29 15:44:06 2012 +0400
+++ b/jdk/src/share/classes/java/nio/file/FileSystem.java Mon Oct 01 15:36:57 2012 +0100
@@ -347,7 +347,7 @@
* <td><tt>C:\\*</tt>
* <td>Matches <tt>C:\foo</tt> and <tt>C:\bar</tt> on the Windows
* platform (note that the backslash is escaped; as a string literal in the
- * Java Language the pattern would be <tt>"C:\\\\*"</tt>) </td>
+ * Java Language the pattern would be <tt>"C:\\\\*"</tt>) </td>
* </tr>
*
* </table>
--- a/jdk/src/share/classes/java/nio/file/Files.java Sat Sep 29 15:44:06 2012 +0400
+++ b/jdk/src/share/classes/java/nio/file/Files.java Mon Oct 01 15:36:57 2012 +0100
@@ -510,7 +510,7 @@
* <pre>
* DirectoryStream.Filter<Path> filter = new DirectoryStream.Filter<Path>() {
* public boolean accept(Path file) throws IOException {
- * return (Files.size(file) > 8192L);
+ * return (Files.size(file) > 8192L);
* }
* };
* Path dir = ...
@@ -1592,7 +1592,7 @@
* Path path = ...
* AclFileAttributeView view = Files.getFileAttributeView(path, AclFileAttributeView.class);
* if (view != null) {
- * List<AclEntry> acl = view.getAcl();
+ * List<AclEntry> acl = view.getAcl();
* :
* }
* </pre>
--- a/jdk/src/share/classes/java/nio/file/Path.java Sat Sep 29 15:44:06 2012 +0400
+++ b/jdk/src/share/classes/java/nio/file/Path.java Mon Oct 01 15:36:57 2012 +0100
@@ -522,7 +522,7 @@
*
* @return a {@code Path} object representing the absolute path
*
- * @throws IOError
+ * @throws java.io.IOError
* if an I/O error occurs
* @throws SecurityException
* In the case of the default provider, a security manager
--- a/jdk/src/share/classes/java/nio/file/attribute/AclFileAttributeView.java Sat Sep 29 15:44:06 2012 +0400
+++ b/jdk/src/share/classes/java/nio/file/attribute/AclFileAttributeView.java Mon Oct 01 15:36:57 2012 +0100
@@ -85,7 +85,7 @@
* .build();
*
* // read ACL, insert ACE, re-write ACL
- * List<AclEntry> acl = view.getAcl();
+ * List<AclEntry> acl = view.getAcl();
* acl.add(0, entry); // insert before any DENY entries
* view.setAcl(acl);
* </pre>
--- a/jdk/src/share/classes/java/nio/file/attribute/FileTime.java Sat Sep 29 15:44:06 2012 +0400
+++ b/jdk/src/share/classes/java/nio/file/attribute/FileTime.java Mon Oct 01 15:36:57 2012 +0100
@@ -310,7 +310,7 @@
private final long days;
/**
- * The excess (in nanoseconds); can be negative if days <= 0.
+ * The excess (in nanoseconds); can be negative if days <= 0.
*/
private final long excessNanos;
--- a/jdk/src/share/classes/java/security/AllPermission.java Sat Sep 29 15:44:06 2012 +0400
+++ b/jdk/src/share/classes/java/security/AllPermission.java Mon Oct 01 15:36:57 2012 +0100
@@ -62,9 +62,7 @@
/**
* Creates a new AllPermission object.
*/
-
- public AllPermission()
- {
+ public AllPermission() {
super("<all permissions>");
}
@@ -77,8 +75,7 @@
* @param name ignored
* @param actions ignored.
*/
- public AllPermission(String name, String actions)
- {
+ public AllPermission(String name, String actions) {
this();
}
@@ -120,8 +117,7 @@
*
* @return the actions.
*/
- public String getActions()
- {
+ public String getActions() {
return "<all actions>";
}
@@ -133,7 +129,6 @@
* @return a new PermissionCollection object suitable for
* storing AllPermissions.
*/
-
public PermissionCollection newPermissionCollection() {
return new AllPermissionCollection();
}
@@ -157,8 +152,8 @@
*/
final class AllPermissionCollection
-extends PermissionCollection
-implements java.io.Serializable
+ extends PermissionCollection
+ implements java.io.Serializable
{
// use serialVersionUID from JDK 1.2.2 for interoperability
@@ -188,8 +183,7 @@
* has been marked readonly
*/
- public void add(Permission permission)
- {
+ public void add(Permission permission) {
if (! (permission instanceof AllPermission))
throw new IllegalArgumentException("invalid permission: "+
permission);
@@ -203,13 +197,12 @@
* Check and see if this set of permissions implies the permissions
* expressed in "permission".
*
- * @param p the Permission object to compare
+ * @param permission the Permission object to compare
*
* @return always returns true.
*/
- public boolean implies(Permission permission)
- {
+ public boolean implies(Permission permission) {
return all_allowed; // No sync; staleness OK
}
@@ -219,8 +212,7 @@
*
* @return an enumeration of all the AllPermission objects.
*/
- public Enumeration<Permission> elements()
- {
+ public Enumeration<Permission> elements() {
return new Enumeration<Permission>() {
private boolean hasMore = all_allowed;
--- a/jdk/src/share/classes/java/security/BasicPermission.java Sat Sep 29 15:44:06 2012 +0400
+++ b/jdk/src/share/classes/java/security/BasicPermission.java Mon Oct 01 15:36:57 2012 +0100
@@ -68,7 +68,7 @@
*/
public abstract class BasicPermission extends Permission
-implements java.io.Serializable
+ implements java.io.Serializable
{
private static final long serialVersionUID = 6279438298436773498L;
@@ -84,10 +84,8 @@
/**
* initialize a BasicPermission object. Common to all constructors.
- *
*/
- private void init(String name)
- {
+ private void init(String name) {
if (name == null)
throw new NullPointerException("name can't be null");
@@ -129,9 +127,7 @@
* @throws NullPointerException if <code>name</code> is <code>null</code>.
* @throws IllegalArgumentException if <code>name</code> is empty.
*/
-
- public BasicPermission(String name)
- {
+ public BasicPermission(String name) {
super(name);
init(name);
}
@@ -148,8 +144,7 @@
* @throws NullPointerException if <code>name</code> is <code>null</code>.
* @throws IllegalArgumentException if <code>name</code> is empty.
*/
- public BasicPermission(String name, String actions)
- {
+ public BasicPermission(String name, String actions) {
super(name);
init(name);
}
@@ -238,8 +233,7 @@
*
* @return the empty string "".
*/
- public String getActions()
- {
+ public String getActions() {
return "";
}
@@ -296,7 +290,6 @@
*
* @see java.security.Permission
* @see java.security.Permissions
- * @see java.security.PermissionsImpl
*
*
* @author Roland Schemers
@@ -305,8 +298,8 @@
*/
final class BasicPermissionCollection
-extends PermissionCollection
-implements java.io.Serializable
+ extends PermissionCollection
+ implements java.io.Serializable
{
private static final long serialVersionUID = 739301742472979399L;
@@ -360,9 +353,7 @@
* @exception SecurityException - if this BasicPermissionCollection object
* has been marked readonly
*/
-
- public void add(Permission permission)
- {
+ public void add(Permission permission) {
if (! (permission instanceof BasicPermission))
throw new IllegalArgumentException("invalid permission: "+
permission);
@@ -398,16 +389,14 @@
* Check and see if this set of permissions implies the permissions
* expressed in "permission".
*
- * @param p the Permission object to compare
+ * @param permission the Permission object to compare
*
* @return true if "permission" is a proper subset of a permission in
* the set, false if not.
*/
-
- public boolean implies(Permission permission)
- {
+ public boolean implies(Permission permission) {
if (! (permission instanceof BasicPermission))
- return false;
+ return false;
BasicPermission bp = (BasicPermission) permission;
@@ -468,7 +457,6 @@
*
* @return an enumeration of all the BasicPermission objects.
*/
-
public Enumeration<Permission> elements() {
// Convert Iterator of Map values into an Enumeration
synchronized (this) {
--- a/jdk/src/share/classes/java/security/CodeSource.java Sat Sep 29 15:44:06 2012 +0400
+++ b/jdk/src/share/classes/java/security/CodeSource.java Mon Oct 01 15:36:57 2012 +0100
@@ -207,7 +207,7 @@
* Returns the code signers associated with this CodeSource.
* <p>
* If this CodeSource object was created using the
- * {@link #CodeSource(URL url, Certificate[] certs)}
+ * {@link #CodeSource(URL url, java.security.cert.Certificate[] certs)}
* constructor then its certificate chains are extracted and used to
* create an array of CodeSigner objects. Note that only X.509 certificates
* are examined - all other certificate types are ignored.
--- a/jdk/src/share/classes/java/security/KeyStore.java Sat Sep 29 15:44:06 2012 +0400
+++ b/jdk/src/share/classes/java/security/KeyStore.java Mon Oct 01 15:36:57 2012 +0100
@@ -32,6 +32,7 @@
import java.util.*;
import javax.crypto.SecretKey;
+import javax.security.auth.DestroyFailedException;
import javax.security.auth.callback.*;
/**
@@ -278,8 +279,7 @@
* @exception DestroyFailedException if this method was unable
* to clear the password
*/
- public synchronized void destroy()
- throws javax.security.auth.DestroyFailedException {
+ public synchronized void destroy() throws DestroyFailedException {
destroyed = true;
if (password != null) {
Arrays.fill(password, ' ');
--- a/jdk/src/share/classes/java/security/cert/PKIXRevocationChecker.java Sat Sep 29 15:44:06 2012 +0400
+++ b/jdk/src/share/classes/java/security/cert/PKIXRevocationChecker.java Mon Oct 01 15:36:57 2012 +0100
@@ -50,7 +50,7 @@
* status of certificates with OCSP and CRLs. By default, OCSP is the
* preferred mechanism for checking revocation status, with CRLs as the
* fallback mechanism. However, this preference can be switched to CRLs with
- * the {@link Option.PREFER_CRLS} option.
+ * the {@link Option#PREFER_CRLS PREFER_CRLS} option.
*
* <p>A {@code PKIXRevocationChecker} is obtained by calling the
* {@link CertPathValidator#getRevocationChecker getRevocationChecker} method
--- a/jdk/src/share/classes/java/sql/CallableStatement.java Sat Sep 29 15:44:06 2012 +0400
+++ b/jdk/src/share/classes/java/sql/CallableStatement.java Mon Oct 01 15:36:57 2012 +0100
@@ -1562,7 +1562,7 @@
* @param parameterName the name of the parameter
* @return the parameter value in full precision. If the value is
* SQL <code>NULL</code>, the result is <code>null</code>.
- * @exception SQLExceptionif parameterName does not correspond to a named
+ * @exception SQLException if parameterName does not correspond to a named
* parameter; if a database access error occurs or
* this method is called on a closed <code>CallableStatement</code>
* @exception SQLFeatureNotSupportedException if the JDBC driver does not support
--- a/jdk/src/share/classes/java/text/CollationElementIterator.java Sat Sep 29 15:44:06 2012 +0400
+++ b/jdk/src/share/classes/java/text/CollationElementIterator.java Mon Oct 01 15:36:57 2012 +0100
@@ -119,7 +119,7 @@
* on the predefined collation rules. If the source string is empty,
* NULLORDER will be returned on the calls to next().
* @param sourceText the source string.
- * @param order the collation object.
+ * @param owner the collation object.
*/
CollationElementIterator(String sourceText, RuleBasedCollator owner) {
this.owner = owner;
@@ -137,7 +137,7 @@
* on the predefined collation rules. If the source string is empty,
* NULLORDER will be returned on the calls to next().
* @param sourceText the source string.
- * @param order the collation object.
+ * @param owner the collation object.
*/
CollationElementIterator(CharacterIterator sourceText, RuleBasedCollator owner) {
this.owner = owner;
--- a/jdk/src/share/classes/java/text/DigitList.java Sat Sep 29 15:44:06 2012 +0400
+++ b/jdk/src/share/classes/java/text/DigitList.java Mon Oct 01 15:36:57 2012 +0100
@@ -62,7 +62,7 @@
* derived by placing all the digits of the list to the right of the
* decimal point, by 10^exponent.
*
- * @see Locale
+ * @see java.util.Locale
* @see Format
* @see NumberFormat
* @see DecimalFormat
--- a/jdk/src/share/classes/java/text/Format.java Sat Sep 29 15:44:06 2012 +0400
+++ b/jdk/src/share/classes/java/text/Format.java Mon Oct 01 15:36:57 2012 +0100
@@ -370,7 +370,7 @@
* Delegates should NOT assume that the <code>Format</code> will notify
* the delegate of fields in any particular order.
*
- * @see FieldPosition.Delegate
+ * @see FieldPosition#getFieldDelegate
* @see CharacterIteratorFieldDelegate
*/
interface FieldDelegate {
--- a/jdk/src/share/classes/java/text/RBCollationTables.java Sat Sep 29 15:44:06 2012 +0400
+++ b/jdk/src/share/classes/java/text/RBCollationTables.java Mon Oct 01 15:36:57 2012 +0100
@@ -192,13 +192,12 @@
*
* @see CollationElementIterator#getMaxExpansion
*/
- int getMaxExpansion(int order)
- {
+ int getMaxExpansion(int order) {
int result = 1;
if (expandTable != null) {
// Right now this does a linear search through the entire
- // expandsion table. If a collator had a large number of expansions,
+ // expansion table. If a collator had a large number of expansions,
// this could cause a performance problem, but in practise that
// rarely happens
for (int i = 0; i < expandTable.size(); i++) {
@@ -215,20 +214,19 @@
}
/**
- * Get the entry of hash table of the expanding string in the collation
- * table.
- * @param idx the index of the expanding string value list
+ * Get the entry of hash table of the expanding string in the collation
+ * table.
+ * @param idx the index of the expanding string value list
*/
- final int[] getExpandValueList(int order) {
- return expandTable.elementAt(order - EXPANDCHARINDEX);
+ final int[] getExpandValueList(int idx) {
+ return expandTable.elementAt(idx - EXPANDCHARINDEX);
}
/**
- * Get the comarison order of a character from the collation table.
- * @return the comparison order of a character.
+ * Get the comarison order of a character from the collation table.
+ * @return the comparison order of a character.
*/
- int getUnicodeOrder(int ch)
- {
+ int getUnicodeOrder(int ch) {
return mapping.elementAt(ch);
}
--- a/jdk/src/share/classes/java/text/RBTableBuilder.java Sat Sep 29 15:44:06 2012 +0400
+++ b/jdk/src/share/classes/java/text/RBTableBuilder.java Mon Oct 01 15:36:57 2012 +0100
@@ -71,7 +71,7 @@
* This is the main function that actually builds the tables and
* stores them back in the RBCollationTables object. It is called
* ONLY by the RBCollationTables constructor.
- * @see java.util.RuleBasedCollator#RuleBasedCollator
+ * @see RuleBasedCollator#RuleBasedCollator
* @exception ParseException If the rules format is incorrect.
*/
--- a/jdk/src/share/classes/java/text/SimpleDateFormat.java Sat Sep 29 15:44:06 2012 +0400
+++ b/jdk/src/share/classes/java/text/SimpleDateFormat.java Mon Oct 01 15:36:57 2012 +0100
@@ -1787,7 +1787,7 @@
* timeFields. Returns -start (for ParsePosition) if failed.
* @param text the time text to be parsed.
* @param start where to start parsing.
- * @param ch the pattern character for the date field text to be parsed.
+ * @param patternCharIndex the index of the pattern character.
* @param count the count of a pattern character.
* @param obeyCount if true, then the next field directly abuts this one,
* and we should use the count to know when to stop parsing.
--- a/jdk/src/share/classes/java/util/Calendar.java Sat Sep 29 15:44:06 2012 +0400
+++ b/jdk/src/share/classes/java/util/Calendar.java Mon Oct 01 15:36:57 2012 +0100
@@ -1788,7 +1788,6 @@
*
* @return a bit mask of selected fields
* @see #isExternallySet(int)
- * @see #setInternallySetState(int)
*/
final int selectFields() {
// This implementation has been taken from the GregorianCalendar class.
--- a/jdk/src/share/classes/java/util/Currency.java Sat Sep 29 15:44:06 2012 +0400
+++ b/jdk/src/share/classes/java/util/Currency.java Mon Oct 01 15:36:57 2012 +0100
@@ -665,7 +665,7 @@
*
* @param pattern regex pattern for the properties
* @param ctry country code
- * @param data currency data. This is a comma separated string that
+ * @param curdata currency data. This is a comma separated string that
* consists of "three-letter alphabet code", "three-digit numeric code",
* and "one-digit (0,1,2, or 3) default fraction digit".
* For example, "JPZ,392,0".
--- a/jdk/src/share/classes/java/util/Formatter.java Sat Sep 29 15:44:06 2012 +0400
+++ b/jdk/src/share/classes/java/util/Formatter.java Mon Oct 01 15:36:57 2012 +0100
@@ -918,7 +918,7 @@
* <p> If the {@code '0'} flag is given then the output will be padded
* with leading zeros to the field width following any indication of sign.
*
- * <p> If {@code '('}, {@code '+'}, '  ', or {@code ','} flags
+ * <p> If {@code '('}, {@code '+'}, ' ', or {@code ','} flags
* are given then a {@link FormatFlagsConversionMismatchException} will be
* thrown.
*
--- a/jdk/src/share/classes/java/util/JapaneseImperialCalendar.java Sat Sep 29 15:44:06 2012 +0400
+++ b/jdk/src/share/classes/java/util/JapaneseImperialCalendar.java Mon Oct 01 15:36:57 2012 +0100
@@ -1932,7 +1932,7 @@
* Computes the fixed date under either the Gregorian or the
* Julian calendar, using the given year and the specified calendar fields.
*
- * @param cal the CalendarSystem to be used for the date calculation
+ * @param era era index
* @param year the normalized year number, with 0 indicating the
* year 1 BCE, -1 indicating 2 BCE, etc.
* @param fieldMask the calendar fields to be used for the date calculation
@@ -2141,7 +2141,7 @@
* Returns the length of the specified month in the specified
* Gregorian year. The year number must be normalized.
*
- * @see #isLeapYear(int)
+ * @see GregorianCalendar#isLeapYear(int)
*/
private int monthLength(int month, int gregorianYear) {
return CalendarUtils.isGregorianLeapYear(gregorianYear) ?
@@ -2152,7 +2152,7 @@
* Returns the length of the specified month in the year provided
* by internalGet(YEAR).
*
- * @see #isLeapYear(int)
+ * @see GregorianCalendar#isLeapYear(int)
*/
private int monthLength(int month) {
assert jdate.isNormalized();
--- a/jdk/src/share/classes/java/util/JumboEnumSet.java Sat Sep 29 15:44:06 2012 +0400
+++ b/jdk/src/share/classes/java/util/JumboEnumSet.java Mon Oct 01 15:36:57 2012 +0100
@@ -345,7 +345,7 @@
* the same size, and every member of the given set is contained in
* this set.
*
- * @param e object to be compared for equality with this set
+ * @param o object to be compared for equality with this set
* @return <tt>true</tt> if the specified object is equal to this set
*/
public boolean equals(Object o) {
--- a/jdk/src/share/classes/java/util/Locale.java Sat Sep 29 15:44:06 2012 +0400
+++ b/jdk/src/share/classes/java/util/Locale.java Mon Oct 01 15:36:57 2012 +0100
@@ -1492,7 +1492,7 @@
* // returns "ja-JP-u-ca-japanese-x-lvariant-JP"
* Locale.forLanguageTag("th-TH-x-lvariant-TH").toLanguageTag();
* // returns "th-TH-u-nu-thai-x-lvariant-TH"
- * <pre></ul>
+ * </pre></ul>
*
* <p>This implements the 'Language-Tag' production of BCP47, and
* so supports grandfathered (regular and irregular) as well as
@@ -2143,7 +2143,7 @@
* @param in the <code>ObjectInputStream</code> to read
* @throws IOException
* @throws ClassNotFoundException
- * @throws IllformdLocaleException
+ * @throws IllformedLocaleException
* @since 1.7
*/
private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
--- a/jdk/src/share/classes/java/util/PropertyPermission.java Sat Sep 29 15:44:06 2012 +0400
+++ b/jdk/src/share/classes/java/util/PropertyPermission.java Mon Oct 01 15:36:57 2012 +0100
@@ -130,18 +130,15 @@
* @param mask the actions mask to use.
*
*/
-
- private void init(int mask)
- {
-
+ private void init(int mask) {
if ((mask & ALL) != mask)
- throw new IllegalArgumentException("invalid actions mask");
+ throw new IllegalArgumentException("invalid actions mask");
if (mask == NONE)
- throw new IllegalArgumentException("invalid actions mask");
+ throw new IllegalArgumentException("invalid actions mask");
if (getName() == null)
- throw new NullPointerException("name can't be null");
+ throw new NullPointerException("name can't be null");
this.mask = mask;
}
@@ -160,9 +157,7 @@
* @throws IllegalArgumentException if <code>name</code> is empty or if
* <code>actions</code> is invalid.
*/
-
- public PropertyPermission(String name, String actions)
- {
+ public PropertyPermission(String name, String actions) {
super(name,actions);
init(getMask(actions));
}
@@ -196,7 +191,6 @@
return ((this.mask & that.mask) == that.mask) && super.implies(that);
}
-
/**
* Checks two PropertyPermission objects for equality. Checks that <i>obj</i> is
* a PropertyPermission, and has the same name and actions as this object.
@@ -226,16 +220,14 @@
*
* @return a hash code value for this object.
*/
-
public int hashCode() {
return this.getName().hashCode();
}
-
/**
* Converts an actions String to an actions mask.
*
- * @param action the action string.
+ * @param actions the action string.
* @return the actions mask.
*/
private static int getMask(String actions) {
@@ -332,8 +324,7 @@
*
* @return the canonical string representation of the actions.
*/
- static String getActions(int mask)
- {
+ static String getActions(int mask) {
StringBuilder sb = new StringBuilder();
boolean comma = false;
@@ -359,8 +350,7 @@
*
* @return the canonical string representation of the actions.
*/
- public String getActions()
- {
+ public String getActions() {
if (actions == null)
actions = getActions(this.mask);
@@ -373,7 +363,6 @@
*
* @return the actions mask.
*/
-
int getMask() {
return mask;
}
@@ -386,7 +375,6 @@
* @return a new PermissionCollection object suitable for storing
* PropertyPermissions.
*/
-
public PermissionCollection newPermissionCollection() {
return new PropertyPermissionCollection();
}
@@ -436,7 +424,7 @@
* @serial include
*/
final class PropertyPermissionCollection extends PermissionCollection
-implements Serializable
+ implements Serializable
{
/**
@@ -454,10 +442,8 @@
private boolean all_allowed;
/**
- * Create an empty PropertyPermissions object.
- *
+ * Create an empty PropertyPermissionCollection object.
*/
-
public PropertyPermissionCollection() {
perms = new HashMap<>(32); // Capacity for default policy
all_allowed = false;
@@ -475,9 +461,7 @@
* @exception SecurityException - if this PropertyPermissionCollection
* object has been marked readonly
*/
-
- public void add(Permission permission)
- {
+ public void add(Permission permission) {
if (! (permission instanceof PropertyPermission))
throw new IllegalArgumentException("invalid permission: "+
permission);
@@ -514,14 +498,12 @@
* Check and see if this set of permissions implies the permissions
* expressed in "permission".
*
- * @param p the Permission object to compare
+ * @param permission the Permission object to compare
*
* @return true if "permission" is a proper subset of a permission in
* the set, false if not.
*/
-
- public boolean implies(Permission permission)
- {
+ public boolean implies(Permission permission) {
if (! (permission instanceof PropertyPermission))
return false;
@@ -655,8 +637,9 @@
* Reads in a Hashtable of PropertyPermissions and saves them in the
* perms field. Reads in all_allowed.
*/
- private void readObject(ObjectInputStream in) throws IOException,
- ClassNotFoundException {
+ private void readObject(ObjectInputStream in)
+ throws IOException, ClassNotFoundException
+ {
// Don't call defaultReadObject()
// Read in serialized fields
--- a/jdk/src/share/classes/java/util/RegularEnumSet.java Sat Sep 29 15:44:06 2012 +0400
+++ b/jdk/src/share/classes/java/util/RegularEnumSet.java Mon Oct 01 15:36:57 2012 +0100
@@ -289,7 +289,7 @@
* the same size, and every member of the given set is contained in
* this set.
*
- * @param e object to be compared for equality with this set
+ * @param o object to be compared for equality with this set
* @return <tt>true</tt> if the specified object is equal to this set
*/
public boolean equals(Object o) {
--- a/jdk/src/share/classes/java/util/Scanner.java Sat Sep 29 15:44:06 2012 +0400
+++ b/jdk/src/share/classes/java/util/Scanner.java Mon Oct 01 15:36:57 2012 +0100
@@ -568,9 +568,8 @@
* Constructs a <code>Scanner</code> that returns values scanned
* from the specified source delimited by the specified pattern.
*
- * @param source A character source implementing the Readable interface
+ * @param source A character source implementing the Readable interface
* @param pattern A delimiting pattern
- * @return A scanner with the specified source and pattern
*/
private Scanner(Readable source, Pattern pattern) {
assert source != null : "source should not be null";
--- a/jdk/src/share/classes/java/util/TimeZone.java Sat Sep 29 15:44:06 2012 +0400
+++ b/jdk/src/share/classes/java/util/TimeZone.java Mon Oct 01 15:36:57 2012 +0100
@@ -221,7 +221,7 @@
* @param date the milliseconds (since January 1, 1970,
* 00:00:00.000 GMT) at which the time zone offset and daylight
* saving amount are found
- * @param offset an array of int where the raw GMT offset
+ * @param offsets an array of int where the raw GMT offset
* (offset[0]) and daylight saving amount (offset[1]) are stored,
* or null if those values are not needed. The method assumes that
* the length of the given array is two or larger.
--- a/jdk/src/share/classes/java/util/logging/Logging.java Sat Sep 29 15:44:06 2012 +0400
+++ b/jdk/src/share/classes/java/util/logging/Logging.java Mon Oct 01 15:36:57 2012 +0100
@@ -41,8 +41,8 @@
* @since 1.5
*
* @see javax.management
- * @see java.util.Logger
- * @see java.util.LogManager
+ * @see Logger
+ * @see LogManager
*/
class Logging implements LoggingMXBean {
--- a/jdk/src/share/classes/java/util/prefs/XmlSupport.java Sat Sep 29 15:44:06 2012 +0400
+++ b/jdk/src/share/classes/java/util/prefs/XmlSupport.java Mon Oct 01 15:36:57 2012 +0100
@@ -92,7 +92,7 @@
* @throws BackingStoreException if preference data cannot be read from
* backing store.
* @throws IllegalStateException if this node (or an ancestor) has been
- * removed with the {@link #removeNode()} method.
+ * removed with the {@link Preferences#removeNode()} method.
*/
static void export(OutputStream os, final Preferences p, boolean subTree)
throws IOException, BackingStoreException {
--- a/jdk/src/share/classes/javax/crypto/CryptoAllPermission.java Sat Sep 29 15:44:06 2012 +0400
+++ b/jdk/src/share/classes/javax/crypto/CryptoAllPermission.java Mon Oct 01 15:36:57 2012 +0100
@@ -136,8 +136,7 @@
* @exception SecurityException - if this CryptoAllPermissionCollection
* object has been marked readonly
*/
- public void add(Permission permission)
- {
+ public void add(Permission permission) {
if (isReadOnly())
throw new SecurityException("attempt to add a Permission to " +
"a readonly PermissionCollection");
@@ -152,13 +151,12 @@
* Check and see if this set of permissions implies the permissions
* expressed in "permission".
*
- * @param p the Permission object to compare
+ * @param permission the Permission object to compare
*
* @return true if the given permission is implied by this
* CryptoAllPermissionCollection.
*/
- public boolean implies(Permission permission)
- {
+ public boolean implies(Permission permission) {
if (!(permission instanceof CryptoPermission)) {
return false;
}
--- a/jdk/src/share/classes/javax/crypto/CryptoPermission.java Sat Sep 29 15:44:06 2012 +0400
+++ b/jdk/src/share/classes/javax/crypto/CryptoPermission.java Mon Oct 01 15:36:57 2012 +0100
@@ -471,8 +471,8 @@
* @author Sharon Liu
*/
final class CryptoPermissionCollection extends PermissionCollection
-implements Serializable {
-
+ implements Serializable
+{
private static final long serialVersionUID = -511215555898802763L;
private Vector<Permission> permissions;
@@ -493,8 +493,7 @@
* @exception SecurityException - if this CryptoPermissionCollection
* object has been marked <i>readOnly</i>.
*/
- public void add(Permission permission)
- {
+ public void add(Permission permission) {
if (isReadOnly())
throw new SecurityException("attempt to add a Permission " +
"to a readonly PermissionCollection");
@@ -506,10 +505,10 @@
}
/**
- * Check and see if this CryptoPermission object implies
- * the given Permission object.
+ * Check and see if this CryptoPermission object implies
+ * the given Permission object.
*
- * @param p the Permission object to compare
+ * @param permission the Permission object to compare
*
* @return true if the given permission is implied by this
* CryptoPermissionCollection, false if not.
@@ -538,8 +537,7 @@
* @return an enumeration of all the CryptoPermission objects.
*/
- public Enumeration<Permission> elements()
- {
+ public Enumeration<Permission> elements() {
return permissions.elements();
}
}
--- a/jdk/src/share/classes/javax/crypto/CryptoPolicyParser.java Sat Sep 29 15:44:06 2012 +0400
+++ b/jdk/src/share/classes/javax/crypto/CryptoPolicyParser.java Mon Oct 01 15:36:57 2012 +0100
@@ -54,7 +54,7 @@
* @author Sharon Liu
*
* @see java.security.Permissions
- * @see java.security.spec.AlgrithomParameterSpec
+ * @see java.security.spec.AlgorithmParameterSpec
* @see javax.crypto.CryptoPermission
* @see javax.crypto.CryptoAllPermission
* @see javax.crypto.CryptoPermissions
--- a/jdk/src/share/classes/javax/crypto/NullCipherSpi.java Sat Sep 29 15:44:06 2012 +0400
+++ b/jdk/src/share/classes/javax/crypto/NullCipherSpi.java Mon Oct 01 15:36:57 2012 +0100
@@ -33,7 +33,7 @@
* tranform the plaintext.
*
* @author Li Gong
- * @see Nullcipher
+ * @see NullCipher
*
* @since 1.4
*/
--- a/jdk/src/share/classes/javax/management/loading/MLet.java Sat Sep 29 15:44:06 2012 +0400
+++ b/jdk/src/share/classes/javax/management/loading/MLet.java Mon Oct 01 15:36:57 2012 +0100
@@ -798,7 +798,7 @@
* Allows the m-let to perform any operations it needs before being unregistered
* by the MBean server.
*
- * @exception java.langException This exception should be caught
+ * @exception java.lang.Exception This exception should be caught
* by the MBean server and re-thrown as an
* MBeanRegistrationException.
*/
--- a/jdk/src/share/classes/javax/management/modelmbean/ModelMBeanAttributeInfo.java Sat Sep 29 15:44:06 2012 +0400
+++ b/jdk/src/share/classes/javax/management/modelmbean/ModelMBeanAttributeInfo.java Mon Oct 01 15:36:57 2012 +0100
@@ -189,7 +189,7 @@
* May be null if the property is write-only.
* @param setter The method used for writing the attribute value.
* May be null if the attribute is read-only.
- * @exception IntrospectionException There is a consistency
+ * @exception javax.management.IntrospectionException There is a consistency
* problem in the definition of this attribute.
*
*/
@@ -233,7 +233,7 @@
* it is null, then a default descriptor will be created. If
* the descriptor does not contain the field "displayName" this field is added
* in the descriptor with its default value.
- * @exception IntrospectionException There is a consistency
+ * @exception javax.management.IntrospectionException There is a consistency
* problem in the definition of this attribute.
* @exception RuntimeOperationsException Wraps an
* IllegalArgumentException. The descriptor is invalid, or descriptor
--- a/jdk/src/share/classes/javax/management/openmbean/CompositeDataInvocationHandler.java Sat Sep 29 15:44:06 2012 +0400
+++ b/jdk/src/share/classes/javax/management/openmbean/CompositeDataInvocationHandler.java Mon Oct 01 15:36:57 2012 +0100
@@ -124,11 +124,6 @@
<p>Construct a handler backed by the given {@code
CompositeData}.</p>
- @param mbsc the {@code MBeanServerConnection} related to this
- {@code CompositeData}. This is only relevant if a method in
- the interface for which this is an invocation handler returns
- a type that is an MXBean interface. Otherwise, it can be null.
-
@param compositeData the {@code CompositeData} that will supply
information to getters.
--- a/jdk/src/share/classes/javax/naming/spi/NamingManager.java Sat Sep 29 15:44:06 2012 +0400
+++ b/jdk/src/share/classes/javax/naming/spi/NamingManager.java Mon Oct 01 15:36:57 2012 +0100
@@ -416,7 +416,7 @@
* specified.
* See the <code>getObjectInstance</code> method for
* details.
- * @param ctx The context relative to which <code>name</code> is
+ * @param nameCtx The context relative to which <code>name</code> is
* specified, or null for the default initial context.
* See the <code>getObjectInstance</code> method for
* details.
--- a/jdk/src/share/classes/javax/security/auth/kerberos/DelegationPermission.java Sat Sep 29 15:44:06 2012 +0400
+++ b/jdk/src/share/classes/javax/security/auth/kerberos/DelegationPermission.java Mon Oct 01 15:36:57 2012 +0100
@@ -178,7 +178,6 @@
*
* @return a hash code value for this object.
*/
-
public int hashCode() {
return getName().hashCode();
}
@@ -278,12 +277,11 @@
* Check and see if this collection of permissions implies the permissions
* expressed in "permission".
*
- * @param p the Permission object to compare
+ * @param permission the Permission object to compare
*
* @return true if "permission" is a proper subset of a permission in
* the collection, false if not.
*/
-
public boolean implies(Permission permission) {
if (! (permission instanceof DelegationPermission))
return false;
@@ -310,7 +308,6 @@
* @exception SecurityException - if this PermissionCollection object
* has been marked readonly
*/
-
public void add(Permission permission) {
if (! (permission instanceof DelegationPermission))
throw new IllegalArgumentException("invalid permission: "+
@@ -329,7 +326,6 @@
*
* @return an enumeration of all the DelegationPermission objects.
*/
-
public Enumeration<Permission> elements() {
// Convert Iterator into Enumeration
synchronized (this) {
@@ -376,8 +372,9 @@
* Reads in a Vector of DelegationPermissions and saves them in the perms field.
*/
@SuppressWarnings("unchecked")
- private void readObject(ObjectInputStream in) throws IOException,
- ClassNotFoundException {
+ private void readObject(ObjectInputStream in)
+ throws IOException, ClassNotFoundException
+ {
// Don't call defaultReadObject()
// Read in serialized fields
--- a/jdk/src/share/classes/javax/security/auth/kerberos/ServicePermission.java Sat Sep 29 15:44:06 2012 +0400
+++ b/jdk/src/share/classes/javax/security/auth/kerberos/ServicePermission.java Mon Oct 01 15:36:57 2012 +0100
@@ -259,7 +259,6 @@
* Always returns present actions in the following order:
* initiate, accept.
*/
-
public String getActions() {
if (actions == null)
actions = getActions(this.mask);
@@ -280,7 +279,6 @@
* @return a new PermissionCollection object suitable for storing
* ServicePermissions.
*/
-
public PermissionCollection newPermissionCollection() {
return new KrbServicePermissionCollection();
}
@@ -290,7 +288,6 @@
*
* @return the actions mask.
*/
-
int getMask() {
return mask;
}
@@ -301,7 +298,6 @@
* @param action the action string
* @return the action mask
*/
-
private static int getMask(String action) {
if (action == null) {
@@ -468,12 +464,11 @@
* Check and see if this collection of permissions implies the permissions
* expressed in "permission".
*
- * @param p the Permission object to compare
+ * @param permission the Permission object to compare
*
* @return true if "permission" is a proper subset of a permission in
* the collection, false if not.
*/
-
public boolean implies(Permission permission) {
if (! (permission instanceof ServicePermission))
return false;
@@ -517,7 +512,6 @@
* @exception SecurityException - if this PermissionCollection object
* has been marked readonly
*/
-
public void add(Permission permission) {
if (! (permission instanceof ServicePermission))
throw new IllegalArgumentException("invalid permission: "+
@@ -584,8 +578,9 @@
* Reads in a Vector of ServicePermissions and saves them in the perms field.
*/
@SuppressWarnings("unchecked")
- private void readObject(ObjectInputStream in) throws IOException,
- ClassNotFoundException {
+ private void readObject(ObjectInputStream in)
+ throws IOException, ClassNotFoundException
+ {
// Don't call defaultReadObject()
// Read in serialized fields
--- a/jdk/src/share/classes/javax/sql/ConnectionPoolDataSource.java Sat Sep 29 15:44:06 2012 +0400
+++ b/jdk/src/share/classes/javax/sql/ConnectionPoolDataSource.java Mon Oct 01 15:36:57 2012 +0100
@@ -48,7 +48,7 @@
* connection to the database that this
* <code>ConnectionPoolDataSource</code> object represents
* @exception SQLException if a database access error occurs
- * @exception SQLFeatureNotSupportedException if the JDBC driver does not support
+ * @exception java.sql.SQLFeatureNotSupportedException if the JDBC driver does not support
* this method
* @since 1.4
*/
@@ -64,7 +64,7 @@
* connection to the database that this
* <code>ConnectionPoolDataSource</code> object represents
* @exception SQLException if a database access error occurs
- * @exception SQLFeatureNotSupportedException if the JDBC driver does not support
+ * @exception java.sql.SQLFeatureNotSupportedException if the JDBC driver does not support
* this method
* @since 1.4
*/
--- a/jdk/src/share/classes/javax/sql/PooledConnection.java Sat Sep 29 15:44:06 2012 +0400
+++ b/jdk/src/share/classes/javax/sql/PooledConnection.java Mon Oct 01 15:36:57 2012 +0100
@@ -102,7 +102,7 @@
* @return a <code>Connection</code> object that is a handle to
* this <code>PooledConnection</code> object
* @exception SQLException if a database access error occurs
- * @exception SQLFeatureNotSupportedException if the JDBC driver does not support
+ * @exception java.sql.SQLFeatureNotSupportedException if the JDBC driver does not support
* this method
* @since 1.4
*/
@@ -117,7 +117,7 @@
* information.
*
* @exception SQLException if a database access error occurs
- * @exception SQLFeatureNotSupportedException if the JDBC driver does not support
+ * @exception java.sql.SQLFeatureNotSupportedException if the JDBC driver does not support
* this method
* @since 1.4
*/
--- a/jdk/src/share/classes/javax/sql/rowset/spi/SyncProvider.java Sat Sep 29 15:44:06 2012 +0400
+++ b/jdk/src/share/classes/javax/sql/rowset/spi/SyncProvider.java Mon Oct 01 15:36:57 2012 +0100
@@ -293,7 +293,7 @@
* SyncProvider.DATASOURCE_TABLE_LOCK,
* SyncProvider.DATASOURCE_DB_LOCK
* </pre>
- * @throws SyncProviderExceptiom if an error occurs determining the data
+ * @throws SyncProviderException if an error occurs determining the data
* source locking level.
* @see #setDataSourceLock