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

8000269: Cleanup javadoc warnings

Browse Source 
Reviewed-by: lancea, darcy, ulfzibis, iris, naoto, dholmes
This commit is contained in:
Alan Bateman 2012-10-01 15:36:57 +01:00
parent 8af0bcb7fe
commit 9b8e06e699
64 changed files with 172 additions and 261 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
jdk/src/share/classes/java/io/FilePermission.java
View File

@ -76,7 +76,7 @@ import sun.security.util.SecurityConstants;
* <P> * <P>
* Be careful when granting FilePermissions. Think about the implications * Be careful when granting FilePermissions. Think about the implications
* of granting read and especially write access to various files and * of granting read and especially write access to various files and
* directories. The "&lt;&lt;ALL FILES>>" permission with write action is * directories. The "&lt;&lt;ALL FILES&gt;&gt;" permission with write action is
* especially dangerous. This grants permission to write to the entire * especially dangerous. This grants permission to write to the entire
* file system. One thing this effectively allows is replacement of the * file system. One thing this effectively allows is replacement of the
* system binary, including the JVM runtime environment. * system binary, including the JVM runtime environment.
@ -180,9 +180,7 @@ public final class FilePermission extends Permission implements Serializable {
* @param mask the actions mask to use. * @param mask the actions mask to use.
* *
*/ */
private void init(int mask) private void init(int mask) {
{
if ((mask & ALL) != mask) if ((mask & ALL) != mask)
throw new IllegalArgumentException("invalid actions mask"); throw new IllegalArgumentException("invalid actions mask");
@ -274,9 +272,7 @@ public final class FilePermission extends Permission implements Serializable {
* If actions is <code>null</code>, empty or contains an action * If actions is <code>null</code>, empty or contains an action
* other than the specified possible actions. * other than the specified possible actions.
*/ */
public FilePermission(String path, String actions) {
public FilePermission(String path, String actions)
{
super(path); super(path);
init(getMask(actions)); init(getMask(actions));
} }
@ -293,8 +289,7 @@ public final class FilePermission extends Permission implements Serializable {
*/ */
// package private for use by the FilePermissionCollection add method // package private for use by the FilePermissionCollection add method
FilePermission(String path, int mask) FilePermission(String path, int mask) {
{
super(path); super(path);
init(mask); init(mask);
} }
@ -337,7 +332,6 @@ public final class FilePermission extends Permission implements Serializable {
* this FilePermission's path also implies that FilePermission's path. * this FilePermission's path also implies that FilePermission's path.
* *
* @param that the FilePermission to check against. * @param that the FilePermission to check against.
* @param exact return immediately if the masks are not equal
* @return the effective mask * @return the effective mask
*/ */
boolean impliesIgnoreMask(FilePermission that) { boolean impliesIgnoreMask(FilePermission that) {
@ -412,7 +406,6 @@ public final class FilePermission extends Permission implements Serializable {
* *
* @return a hash code value for this object. * @return a hash code value for this object.
*/ */
public int hashCode() { public int hashCode() {
return this.cpath.hashCode(); return this.cpath.hashCode();
} }
@ -424,7 +417,6 @@ public final class FilePermission extends Permission implements Serializable {
* @return the actions mask. * @return the actions mask.
*/ */
private static int getMask(String actions) { private static int getMask(String actions) {
int mask = NONE; int mask = NONE;
// Null action valid? // Null action valid?
@ -552,7 +544,6 @@ public final class FilePermission extends Permission implements Serializable {
* *
* @return the actions mask. * @return the actions mask.
*/ */
int getMask() { int getMask() {
return mask; return mask;
} }
@ -564,8 +555,7 @@ public final class FilePermission extends Permission implements Serializable {
* *
* @return the canonical string representation of the actions. * @return the canonical string representation of the actions.
*/ */
private static String getActions(int mask) private static String getActions(int mask) {
{
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();
boolean comma = false; boolean comma = false;
@ -610,15 +600,13 @@ public final class FilePermission extends Permission implements Serializable {
* *
* @return the canonical string representation of the actions. * @return the canonical string representation of the actions.
*/ */
public String getActions() public String getActions() {
{
if (actions == null) if (actions == null)
actions = getActions(this.mask); actions = getActions(this.mask);
return actions; return actions;
} }
/** /**
* Returns a new PermissionCollection object for storing FilePermission * Returns a new PermissionCollection object for storing FilePermission
* objects. * objects.
@ -650,7 +638,6 @@ public final class FilePermission extends Permission implements Serializable {
* @return a new PermissionCollection object suitable for storing * @return a new PermissionCollection object suitable for storing
* FilePermissions. * FilePermissions.
*/ */
public PermissionCollection newPermissionCollection() { public PermissionCollection newPermissionCollection() {
return new FilePermissionCollection(); return new FilePermissionCollection();
} }
@ -712,22 +699,20 @@ public final class FilePermission extends Permission implements Serializable {
*/ */
final class FilePermissionCollection extends PermissionCollection final class FilePermissionCollection extends PermissionCollection
implements Serializable { implements Serializable
{
// Not serialized; see serialization section at end of class // Not serialized; see serialization section at end of class
private transient List<Permission> perms; private transient List<Permission> perms;
/** /**
* Create an empty FilePermissions object. * Create an empty FilePermissionCollection object.
*
*/ */
public FilePermissionCollection() { public FilePermissionCollection() {
perms = new ArrayList<>(); 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. * permission.path.
* *
* @param permission the Permission object to add. * @param permission the Permission object to add.
@ -738,9 +723,7 @@ implements Serializable {
* @exception SecurityException - if this FilePermissionCollection object * @exception SecurityException - if this FilePermissionCollection object
* has been marked readonly * has been marked readonly
*/ */
public void add(Permission permission) {
public void add(Permission permission)
{
if (! (permission instanceof FilePermission)) if (! (permission instanceof FilePermission))
throw new IllegalArgumentException("invalid permission: "+ throw new IllegalArgumentException("invalid permission: "+
permission); permission);
@ -757,16 +740,14 @@ implements Serializable {
* Check and see if this set of permissions implies the permissions * Check and see if this set of permissions implies the permissions
* expressed in "permission". * 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 * @return true if "permission" is a proper subset of a permission in
* the set, false if not. * the set, false if not.
*/ */
public boolean implies(Permission permission) {
public boolean implies(Permission permission)
{
if (! (permission instanceof FilePermission)) if (! (permission instanceof FilePermission))
return false; return false;
FilePermission fp = (FilePermission) permission; FilePermission fp = (FilePermission) permission;
@ -795,7 +776,6 @@ implements Serializable {
* *
* @return an enumeration of all the FilePermission objects. * @return an enumeration of all the FilePermission objects.
*/ */
public Enumeration<Permission> elements() { public Enumeration<Permission> elements() {
// Convert Iterator into Enumeration // Convert Iterator into Enumeration
synchronized (this) { synchronized (this) {
@ -841,8 +821,9 @@ implements Serializable {
/* /*
* Reads in a Vector of FilePermissions and saves them in the perms field. * Reads in a Vector of FilePermissions and saves them in the perms field.
*/ */
private void readObject(ObjectInputStream in) throws IOException, private void readObject(ObjectInputStream in)
ClassNotFoundException { throws IOException, ClassNotFoundException
{
// Don't call defaultReadObject() // Don't call defaultReadObject()
// Read in serialized fields // Read in serialized fields

8
jdk/src/share/classes/java/io/PrintWriter.java
View File

@ -784,7 +784,7 @@ public class PrintWriter extends Writer {
* <tt>null</tt> argument depends on the <a * <tt>null</tt> argument depends on the <a
* href="../util/Formatter.html#syntax">conversion</a>. * href="../util/Formatter.html#syntax">conversion</a>.
* *
* @throws IllegalFormatException * @throws java.util.IllegalFormatException
* If a format string contains an illegal syntax, a format * If a format string contains an illegal syntax, a format
* specifier that is incompatible with the given arguments, * specifier that is incompatible with the given arguments,
* insufficient arguments given the format string, or other * insufficient arguments given the format string, or other
@ -835,7 +835,7 @@ public class PrintWriter extends Writer {
* <tt>null</tt> argument depends on the <a * <tt>null</tt> argument depends on the <a
* href="../util/Formatter.html#syntax">conversion</a>. * href="../util/Formatter.html#syntax">conversion</a>.
* *
* @throws IllegalFormatException * @throws java.util.IllegalFormatException
* If a format string contains an illegal syntax, a format * If a format string contains an illegal syntax, a format
* specifier that is incompatible with the given arguments, * specifier that is incompatible with the given arguments,
* insufficient arguments given the format string, or other * insufficient arguments given the format string, or other
@ -879,7 +879,7 @@ public class PrintWriter extends Writer {
* <tt>null</tt> argument depends on the <a * <tt>null</tt> argument depends on the <a
* href="../util/Formatter.html#syntax">conversion</a>. * href="../util/Formatter.html#syntax">conversion</a>.
* *
* @throws IllegalFormatException * @throws java.util.IllegalFormatException
* If a format string contains an illegal syntax, a format * If a format string contains an illegal syntax, a format
* specifier that is incompatible with the given arguments, * specifier that is incompatible with the given arguments,
* insufficient arguments given the format string, or other * insufficient arguments given the format string, or other
@ -939,7 +939,7 @@ public class PrintWriter extends Writer {
* <tt>null</tt> argument depends on the <a * <tt>null</tt> argument depends on the <a
* href="../util/Formatter.html#syntax">conversion</a>. * href="../util/Formatter.html#syntax">conversion</a>.
* *
* @throws IllegalFormatException * @throws java.util.IllegalFormatException
* If a format string contains an illegal syntax, a format * If a format string contains an illegal syntax, a format
* specifier that is incompatible with the given arguments, * specifier that is incompatible with the given arguments,
* insufficient arguments given the format string, or other * insufficient arguments given the format string, or other

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

@ -91,7 +91,7 @@ public abstract class Reader implements Readable, Closeable {
* -1 if this source of characters is at its end * -1 if this source of characters is at its end
* @throws IOException if an I/O error occurs * @throws IOException if an I/O error occurs
* @throws NullPointerException if target is null * @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 * @since 1.5
*/ */
public int read(java.nio.CharBuffer target) throws IOException { public int read(java.nio.CharBuffer target) throws IOException {

2
jdk/src/share/classes/java/lang/Class.java
View File

@ -2970,7 +2970,7 @@ public final
/** /**
* Returns a map from simple name to enum constant. This package-private * Returns a map from simple name to enum constant. This package-private
* method is used internally by Enum to implement * 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 * efficiently. Note that the map is returned by this method is
* created lazily on first use. Typically it won't ever get created. * created lazily on first use. Typically it won't ever get created.
*/ */

1
jdk/src/share/classes/java/lang/InheritableThreadLocal.java
View File

@ -76,7 +76,6 @@ public class InheritableThreadLocal<T> extends ThreadLocal<T> {
* *
* @param t the current thread * @param t the current thread
* @param firstValue value for the initial entry of the table. * @param firstValue value for the initial entry of the table.
* @param map the map to store.
*/ */
void createMap(Thread t, T firstValue) { void createMap(Thread t, T firstValue) {
t.inheritableThreadLocals = new ThreadLocalMap(this, firstValue); t.inheritableThreadLocals = new ThreadLocalMap(this, firstValue);

2
jdk/src/share/classes/java/lang/Integer.java
View File

@ -752,7 +752,7 @@ public final class Integer extends Number implements Comparable<Integer> {
* -128 and 127 (inclusive) as required by JLS. * -128 and 127 (inclusive) as required by JLS.
* *
* The cache is initialized on first usage. The size of the cache * 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 * During VM initialization, java.lang.Integer.IntegerCache.high property
* may be set and saved in the private system properties in the * may be set and saved in the private system properties in the
* sun.misc.VM class. * sun.misc.VM class.

5
jdk/src/share/classes/java/lang/Package.java
View File

@ -316,7 +316,7 @@ public class Package implements java.lang.reflect.AnnotatedElement {
* attributes are defined in the manifests that accompany * attributes are defined in the manifests that accompany
* the classes. * 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 * @return the package of the class. It may be null if no package
* information is available from the archive or codebase. */ * information is available from the archive or codebase. */
static Package getPackage(Class<?> c) { static Package getPackage(Class<?> c) {
@ -411,14 +411,13 @@ public class Package implements java.lang.reflect.AnnotatedElement {
/** /**
* Construct a package instance with the specified version * Construct a package instance with the specified version
* information. * information.
* @param pkgName the name of the package * @param name the name of the package
* @param spectitle the title of the specification * @param spectitle the title of the specification
* @param specversion the version of the specification * @param specversion the version of the specification
* @param specvendor the organization that maintains the specification * @param specvendor the organization that maintains the specification
* @param impltitle the title of the implementation * @param impltitle the title of the implementation
* @param implversion the version of the implementation * @param implversion the version of the implementation
* @param implvendor the organization that maintains the implementation * @param implvendor the organization that maintains the implementation
* @return a new package for containing the specified information.
*/ */
Package(String name, Package(String name,
String spectitle, String specversion, String specvendor, String spectitle, String specversion, String specvendor,

4
jdk/src/share/classes/java/lang/StrictMath.java
View File

@ -365,7 +365,7 @@ public final class StrictMath {
* @param a the value to be floored or ceiled * @param a the value to be floored or ceiled
* @param negativeBoundary result for values in (-1, 0) * @param negativeBoundary result for values in (-1, 0)
* @param positiveBoundary result for values in (0, 1) * @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, private static double floorOrCeil(double a,
double negativeBoundary, double negativeBoundary,
@ -811,7 +811,7 @@ public final class StrictMath {
* @param value the long value * @param value the long value
* @return the argument as an int * @return the argument as an int
* @throws ArithmeticException if the {@code argument} overflows an int * @throws ArithmeticException if the {@code argument} overflows an int
* @see Math#toIntExact(int) * @see Math#toIntExact(long)
* @since 1.8 * @since 1.8
*/ */
public static int toIntExact(long value) { public static int toIntExact(long value) {

4
jdk/src/share/classes/java/lang/String.java
View File

@ -2782,7 +2782,7 @@ public final class String
* <tt>null</tt> argument depends on the <a * <tt>null</tt> argument depends on the <a
* href="../util/Formatter.html#syntax">conversion</a>. * href="../util/Formatter.html#syntax">conversion</a>.
* *
* @throws IllegalFormatException * @throws java.util.IllegalFormatException
* If a format string contains an illegal syntax, a format * If a format string contains an illegal syntax, a format
* specifier that is incompatible with the given arguments, * specifier that is incompatible with the given arguments,
* insufficient arguments given the format string, or other * insufficient arguments given the format string, or other
@ -2826,7 +2826,7 @@ public final class String
* <tt>null</tt> argument depends on the <a * <tt>null</tt> argument depends on the <a
* href="../util/Formatter.html#syntax">conversion</a>. * href="../util/Formatter.html#syntax">conversion</a>.
* *
* @throws IllegalFormatException * @throws java.util.IllegalFormatException
* If a format string contains an illegal syntax, a format * If a format string contains an illegal syntax, a format
* specifier that is incompatible with the given arguments, * specifier that is incompatible with the given arguments,
* insufficient arguments given the format string, or other * insufficient arguments given the format string, or other

2
jdk/src/share/classes/java/lang/System.java
View File

@ -545,7 +545,7 @@ public final class System {
* <tr><td><code>java.version</code></td> * <tr><td><code>java.version</code></td>
* <td>Java Runtime Environment version</td></tr> * <td>Java Runtime Environment version</td></tr>
* <tr><td><code>java.vendor</code></td> * <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> * <tr><td><code>java.vendor.url</code></td>
* <td>Java vendor URL</td></tr> * <td>Java vendor URL</td></tr>
* <tr><td><code>java.home</code></td> * <tr><td><code>java.home</code></td>

3
jdk/src/share/classes/java/lang/ThreadGroup.java
View File

@ -918,9 +918,6 @@ class ThreadGroup implements Thread.UncaughtExceptionHandler {
* *
* @param t * @param t
* the Thread whose start method was invoked * the Thread whose start method was invoked
*
* @param failed
* true if the thread could not be started successfully
*/ */
void threadStartFailed(Thread t) { void threadStartFailed(Thread t) {
synchronized(this) { synchronized(this) {

5
jdk/src/share/classes/java/lang/ThreadLocal.java
View File

@ -47,8 +47,8 @@ import java.util.concurrent.atomic.AtomicInteger;
* private static final AtomicInteger nextId = new AtomicInteger(0); * private static final AtomicInteger nextId = new AtomicInteger(0);
* *
* // Thread local variable containing each thread's ID * // Thread local variable containing each thread's ID
* private static final ThreadLocal&lt;Integer> threadId = * private static final ThreadLocal&lt;Integer&gt; threadId =
* new ThreadLocal&lt;Integer>() { * new ThreadLocal&lt;Integer&gt;() {
* &#64;Override protected Integer initialValue() { * &#64;Override protected Integer initialValue() {
* return nextId.getAndIncrement(); * return nextId.getAndIncrement();
* } * }
@ -222,7 +222,6 @@ public class ThreadLocal<T> {
* *
* @param t the current thread * @param t the current thread
* @param firstValue value for the initial entry of the map * @param firstValue value for the initial entry of the map
* @param map the map to store.
*/ */
void createMap(Thread t, T firstValue) { void createMap(Thread t, T firstValue) {
t.threadLocals = new ThreadLocalMap(this, firstValue); t.threadLocals = new ThreadLocalMap(this, firstValue);

5
jdk/src/share/classes/java/lang/management/ThreadInfo.java
View File

@ -147,8 +147,9 @@ public class ThreadInfo {
* @param waitedCount Number of times waited on a lock * @param waitedCount Number of times waited on a lock
* @param waitedTime Approx time waited on a lock * @param waitedTime Approx time waited on a lock
* @param stackTrace Thread stack trace * @param stackTrace Thread stack trace
* @param lockedMonitors List of locked monitors * @param monitors List of locked monitors
* @param lockedSynchronizers List of locked synchronizers * @param stackDepths List of stack depths
* @param synchronizers List of locked synchronizers
*/ */
private ThreadInfo(Thread t, int state, Object lockObj, Thread lockOwner, private ThreadInfo(Thread t, int state, Object lockObj, Thread lockOwner,
long blockedCount, long blockedTime, long blockedCount, long blockedTime,

18
jdk/src/share/classes/java/net/AbstractPlainDatagramSocketImpl.java
View File

@ -99,7 +99,7 @@ abstract class AbstractPlainDatagramSocketImpl extends DatagramSocketImpl
/** /**
* Sends a datagram packet. The packet contains the data and the * Sends a datagram packet. The packet contains the data and the
* destination address to send the packet to. * 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; protected abstract void send(DatagramPacket p) throws IOException;
@ -130,13 +130,13 @@ abstract class AbstractPlainDatagramSocketImpl extends DatagramSocketImpl
/** /**
* Peek at the packet to see who it is from. * 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 peek(InetAddress i) throws IOException;
protected abstract int peekData(DatagramPacket p) throws IOException; protected abstract int peekData(DatagramPacket p) throws IOException;
/** /**
* Receive the datagram packet. * Receive the datagram packet.
* @param Packet Received. * @param p the packet to receive into
*/ */
protected synchronized void receive(DatagramPacket p) protected synchronized void receive(DatagramPacket p)
throws IOException { throws IOException {
@ -148,7 +148,7 @@ abstract class AbstractPlainDatagramSocketImpl extends DatagramSocketImpl
/** /**
* Set the TTL (time-to-live) option. * 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; protected abstract void setTimeToLive(int ttl) throws IOException;
@ -159,7 +159,7 @@ abstract class AbstractPlainDatagramSocketImpl extends DatagramSocketImpl
/** /**
* Set the TTL (time-to-live) option. * Set the TTL (time-to-live) option.
* @param TTL to be set. * @param ttl TTL to be set.
*/ */
@Deprecated @Deprecated
protected abstract void setTTL(byte ttl) throws IOException; protected abstract void setTTL(byte ttl) throws IOException;
@ -172,7 +172,7 @@ abstract class AbstractPlainDatagramSocketImpl extends DatagramSocketImpl
/** /**
* Join the multicast group. * Join the multicast group.
* @param multicast address to join. * @param inetaddr multicast address to join.
*/ */
protected void join(InetAddress inetaddr) throws IOException { protected void join(InetAddress inetaddr) throws IOException {
join(inetaddr, null); join(inetaddr, null);
@ -180,14 +180,14 @@ abstract class AbstractPlainDatagramSocketImpl extends DatagramSocketImpl
/** /**
* Leave the multicast group. * Leave the multicast group.
* @param multicast address to leave. * @param inetaddr multicast address to leave.
*/ */
protected void leave(InetAddress inetaddr) throws IOException { protected void leave(InetAddress inetaddr) throws IOException {
leave(inetaddr, null); leave(inetaddr, null);
} }
/** /**
* Join the multicast group. * Join the multicast group.
* @param multicast address to join. * @param mcastaddr multicast address to join.
* @param netIf specifies the local interface to receive multicast * @param netIf specifies the local interface to receive multicast
* datagram packets * datagram packets
* @throws IllegalArgumentException if mcastaddr is null or is a * @throws IllegalArgumentException if mcastaddr is null or is a
@ -207,7 +207,7 @@ abstract class AbstractPlainDatagramSocketImpl extends DatagramSocketImpl
/** /**
* Leave the multicast group. * 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 * @param netIf specified the local interface to leave the group at
* @throws IllegalArgumentException if mcastaddr is null or is a * @throws IllegalArgumentException if mcastaddr is null or is a
* SocketAddress subclass not supported by this socket * SocketAddress subclass not supported by this socket

2
jdk/src/share/classes/java/net/AbstractPlainSocketImpl.java
View File

@ -368,7 +368,7 @@ abstract class AbstractPlainSocketImpl extends SocketImpl
/** /**
* Binds the socket to the specified address of the specified local port. * Binds the socket to the specified address of the specified local port.
* @param address the address * @param address the address
* @param port the port * @param lport the port
*/ */
protected synchronized void bind(InetAddress address, int lport) protected synchronized void bind(InetAddress address, int lport)
throws IOException throws IOException

2
jdk/src/share/classes/java/net/DatagramSocket.java
View File

@ -105,7 +105,7 @@ class DatagramSocket implements java.io.Closeable {
* Connects this socket to a remote socket address (IP address + port number). * Connects this socket to a remote socket address (IP address + port number).
* Binds socket if not already bound. * Binds socket if not already bound.
* <p> * <p>
* @param addr The remote address. * @param address The remote address.
* @param port The remote port * @param port The remote port
* @throws SocketException if binding the socket fails. * @throws SocketException if binding the socket fails.
*/ */

1
jdk/src/share/classes/java/net/Inet4Address.java
View File

@ -177,7 +177,6 @@ class Inet4Address extends InetAddress {
* a loopback address; or false otherwise. * a loopback address; or false otherwise.
* @since 1.4 * @since 1.4
*/ */
private static final int loopback = 2130706433; /* 127.0.0.1 */
public boolean isLoopbackAddress() { public boolean isLoopbackAddress() {
/* 127.x.x.x */ /* 127.x.x.x */
byte[] byteAddr = getAddress(); byte[] byteAddr = getAddress();

4
jdk/src/share/classes/java/net/SocketInputStream.java
View File

@ -112,7 +112,7 @@ class SocketInputStream extends FileInputStream
* <i>length</i> bytes of data. * <i>length</i> bytes of data.
* @param b the buffer into which the data is read * @param b the buffer into which the data is read
* @param off the start offset of the data * @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 * @return the actual number of bytes read, -1 is
* returned when the end of the stream is reached. * returned when the end of the stream is reached.
* @exception IOException If an I/O error has occurred. * @exception IOException If an I/O error has occurred.
@ -209,7 +209,7 @@ class SocketInputStream extends FileInputStream
/** /**
* Skips n bytes of input. * 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. * @return the actual number of bytes skipped.
* @exception IOException If an I/O error has occurred. * @exception IOException If an I/O error has occurred.
*/ */

33
jdk/src/share/classes/java/net/SocketPermission.java
View File

@ -138,7 +138,7 @@ import sun.security.util.Debug;
*/ */
public final class SocketPermission extends Permission public final class SocketPermission extends Permission
implements java.io.Serializable implements java.io.Serializable
{ {
private static final long serialVersionUID = -7204263841984476862L; private static final long serialVersionUID = -7204263841984476862L;
@ -232,8 +232,7 @@ implements java.io.Serializable
trustNameService = tmp.booleanValue(); trustNameService = tmp.booleanValue();
} }
private static synchronized Debug getDebug() private static synchronized Debug getDebug() {
{
if (!debugInit) { if (!debugInit) {
debug = Debug.getInstance("access"); debug = Debug.getInstance("access");
debugInit = true; debugInit = true;
@ -288,8 +287,7 @@ implements java.io.Serializable
defaultDeny = true; defaultDeny = true;
} }
private static String getHost(String host) private static String getHost(String host) {
{
if (host.equals("")) { if (host.equals("")) {
return "localhost"; return "localhost";
} else { } else {
@ -679,8 +677,8 @@ implements java.io.Serializable
} }
private boolean authorizedIPv4(String cname, byte[] addr) { private boolean authorizedIPv4(String cname, byte[] addr) {
String authHost = ""; String authHost = "";
InetAddress auth; InetAddress auth;
try { try {
authHost = "auth." + authHost = "auth." +
@ -708,8 +706,8 @@ implements java.io.Serializable
} }
private boolean authorizedIPv6(String cname, byte[] addr) { private boolean authorizedIPv6(String cname, byte[] addr) {
String authHost = ""; String authHost = "";
InetAddress auth; InetAddress auth;
try { try {
StringBuffer sb = new StringBuffer(39); StringBuffer sb = new StringBuffer(39);
@ -810,7 +808,6 @@ implements java.io.Serializable
* @return true if the specified permission is implied by this object, * @return true if the specified permission is implied by this object,
* false if not. * false if not.
*/ */
public boolean implies(Permission p) { public boolean implies(Permission p) {
int i,j; int i,j;
@ -844,12 +841,11 @@ implements java.io.Serializable
* to find a match based on the IP addresses in both objects. * to find a match based on the IP addresses in both objects.
* <li> Attempt to match on the canonical hostnames of both objects. * <li> Attempt to match on the canonical hostnames of both objects.
* </ul> * </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, * @return true if "permission" is a proper subset of the current object,
* false if not. * false if not.
*/ */
boolean impliesIgnoreMask(SocketPermission that) { boolean impliesIgnoreMask(SocketPermission that) {
int i,j; int i,j;
@ -1229,7 +1225,7 @@ else its the cname?
*/ */
final class SocketPermissionCollection extends PermissionCollection final class SocketPermissionCollection extends PermissionCollection
implements Serializable implements Serializable
{ {
// Not serialized; see serialization section at end of class // Not serialized; see serialization section at end of class
private transient List<SocketPermission> perms; private transient List<SocketPermission> perms;
@ -1255,9 +1251,7 @@ implements Serializable
* @exception SecurityException - if this SocketPermissionCollection object * @exception SecurityException - if this SocketPermissionCollection object
* has been marked readonly * has been marked readonly
*/ */
public void add(Permission permission) {
public void add(Permission permission)
{
if (! (permission instanceof SocketPermission)) if (! (permission instanceof SocketPermission))
throw new IllegalArgumentException("invalid permission: "+ throw new IllegalArgumentException("invalid permission: "+
permission); permission);
@ -1276,7 +1270,7 @@ implements Serializable
* Check and see if this collection of permissions implies the permissions * Check and see if this collection of permissions implies the permissions
* expressed in "permission". * 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 * @return true if "permission" is a proper subset of a permission in
* the collection, false if not. * the collection, false if not.
@ -1369,8 +1363,9 @@ implements Serializable
/* /*
* Reads in a Vector of SocketPermissions and saves them in the perms field. * Reads in a Vector of SocketPermissions and saves them in the perms field.
*/ */
private void readObject(ObjectInputStream in) throws IOException, private void readObject(ObjectInputStream in)
ClassNotFoundException { throws IOException, ClassNotFoundException
{
// Don't call in.defaultReadObject() // Don't call in.defaultReadObject()
// Read in serialized fields // Read in serialized fields

2
jdk/src/share/classes/java/net/SocksSocketImpl.java
View File

@ -644,7 +644,7 @@ class SocksSocketImpl extends PlainSocketImpl implements SocksConsts {
* means "accept incoming connection from", so the SocketAddress is the * means "accept incoming connection from", so the SocketAddress is the
* the one of the host we do accept connection from. * 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. * @exception IOException if an I/O error occurs when binding this socket.
*/ */
protected synchronized void socksBind(InetSocketAddress saddr) throws IOException { protected synchronized void socksBind(InetSocketAddress saddr) throws IOException {

3
jdk/src/share/classes/java/net/URLConnection.java
View File

@ -1241,10 +1241,9 @@ public abstract class URLConnection {
/** /**
* Gets the Content Handler appropriate for this connection. * Gets the Content Handler appropriate for this connection.
* @param connection the connection to use.
*/ */
synchronized ContentHandler getContentHandler() synchronized ContentHandler getContentHandler()
throws UnknownServiceException throws UnknownServiceException
{ {
String contentType = stripOffParameters(getContentType()); String contentType = stripOffParameters(getContentType());
ContentHandler handler = null; ContentHandler handler = null;

2
jdk/src/share/classes/java/nio/channels/Channels.java
View File

@ -84,7 +84,7 @@ public final class Channels {
/** /**
* Write all remaining bytes in buffer to the given channel. * Write all remaining bytes in buffer to the given channel.
* *
* @throws IllegalBlockingException * @throws IllegalBlockingModeException
* If the channel is selectable and configured non-blocking. * If the channel is selectable and configured non-blocking.
*/ */
private static void writeFully(WritableByteChannel ch, ByteBuffer bb) private static void writeFully(WritableByteChannel ch, ByteBuffer bb)

2
jdk/src/share/classes/java/nio/file/FileSystem.java
View File

@ -347,7 +347,7 @@ public abstract class FileSystem
* <td><tt>C:&#92;&#92;*</tt> * <td><tt>C:&#92;&#92;*</tt>
* <td>Matches <tt>C:&#92;foo</tt> and <tt>C:&#92;bar</tt> on the Windows * <td>Matches <tt>C:&#92;foo</tt> and <tt>C:&#92;bar</tt> on the Windows
* platform (note that the backslash is escaped; as a string literal in the * platform (note that the backslash is escaped; as a string literal in the
* Java Language the pattern would be <tt>"C:&#92;&#92;&#92;&#92*"</tt>) </td> * Java Language the pattern would be <tt>"C:&#92;&#92;&#92;&#92;*"</tt>) </td>
* </tr> * </tr>
* *
* </table> * </table>

4
jdk/src/share/classes/java/nio/file/Files.java
View File

@ -510,7 +510,7 @@ public final class Files {
* <pre> * <pre>
* DirectoryStream.Filter&lt;Path&gt; filter = new DirectoryStream.Filter&lt;Path&gt;() { * DirectoryStream.Filter&lt;Path&gt; filter = new DirectoryStream.Filter&lt;Path&gt;() {
* public boolean accept(Path file) throws IOException { * public boolean accept(Path file) throws IOException {
* return (Files.size(file) > 8192L); * return (Files.size(file) &gt; 8192L);
* } * }
* }; * };
* Path dir = ... * Path dir = ...
@ -1592,7 +1592,7 @@ public final class Files {
* Path path = ... * Path path = ...
* AclFileAttributeView view = Files.getFileAttributeView(path, AclFileAttributeView.class); * AclFileAttributeView view = Files.getFileAttributeView(path, AclFileAttributeView.class);
* if (view != null) { * if (view != null) {
* List&lt;AclEntry&gt acl = view.getAcl(); * List&lt;AclEntry&gt; acl = view.getAcl();
* : * :
* } * }
* </pre> * </pre>

2
jdk/src/share/classes/java/nio/file/Path.java
View File

@ -522,7 +522,7 @@ public interface Path
* *
* @return a {@code Path} object representing the absolute path * @return a {@code Path} object representing the absolute path
* *
* @throws IOError * @throws java.io.IOError
* if an I/O error occurs * if an I/O error occurs
* @throws SecurityException * @throws SecurityException
* In the case of the default provider, a security manager * In the case of the default provider, a security manager

2
jdk/src/share/classes/java/nio/file/attribute/AclFileAttributeView.java
View File

@ -85,7 +85,7 @@ import java.io.IOException;
* .build(); * .build();
* *
* // read ACL, insert ACE, re-write ACL * // read ACL, insert ACE, re-write ACL
* List&lt;AclEntry&gt acl = view.getAcl(); * List&lt;AclEntry&gt; acl = view.getAcl();
* acl.add(0, entry); // insert before any DENY entries * acl.add(0, entry); // insert before any DENY entries
* view.setAcl(acl); * view.setAcl(acl);
* </pre> * </pre>

2
jdk/src/share/classes/java/nio/file/attribute/FileTime.java
View File

@ -310,7 +310,7 @@ public final class FileTime
private final long days; private final long days;
/** /**
* The excess (in nanoseconds); can be negative if days <= 0. * The excess (in nanoseconds); can be negative if days &lt;= 0.
*/ */
private final long excessNanos; private final long excessNanos;

26
jdk/src/share/classes/java/security/AllPermission.java
View File

@ -62,9 +62,7 @@ public final class AllPermission extends Permission {
/** /**
* Creates a new AllPermission object. * Creates a new AllPermission object.
*/ */
public AllPermission() {
public AllPermission()
{
super("<all permissions>"); super("<all permissions>");
} }
@ -77,8 +75,7 @@ public final class AllPermission extends Permission {
* @param name ignored * @param name ignored
* @param actions ignored. * @param actions ignored.
*/ */
public AllPermission(String name, String actions) public AllPermission(String name, String actions) {
{
this(); this();
} }
@ -120,8 +117,7 @@ public final class AllPermission extends Permission {
* *
* @return the actions. * @return the actions.
*/ */
public String getActions() public String getActions() {
{
return "<all actions>"; return "<all actions>";
} }
@ -133,7 +129,6 @@ public final class AllPermission extends Permission {
* @return a new PermissionCollection object suitable for * @return a new PermissionCollection object suitable for
* storing AllPermissions. * storing AllPermissions.
*/ */
public PermissionCollection newPermissionCollection() { public PermissionCollection newPermissionCollection() {
return new AllPermissionCollection(); return new AllPermissionCollection();
} }
@ -157,8 +152,8 @@ public final class AllPermission extends Permission {
*/ */
final class AllPermissionCollection final class AllPermissionCollection
extends PermissionCollection extends PermissionCollection
implements java.io.Serializable implements java.io.Serializable
{ {
// use serialVersionUID from JDK 1.2.2 for interoperability // use serialVersionUID from JDK 1.2.2 for interoperability
@ -188,8 +183,7 @@ implements java.io.Serializable
* has been marked readonly * has been marked readonly
*/ */
public void add(Permission permission) public void add(Permission permission) {
{
if (! (permission instanceof AllPermission)) if (! (permission instanceof AllPermission))
throw new IllegalArgumentException("invalid permission: "+ throw new IllegalArgumentException("invalid permission: "+
permission); permission);
@ -203,13 +197,12 @@ implements java.io.Serializable
* Check and see if this set of permissions implies the permissions * Check and see if this set of permissions implies the permissions
* expressed in "permission". * expressed in "permission".
* *
* @param p the Permission object to compare * @param permission the Permission object to compare
* *
* @return always returns true. * @return always returns true.
*/ */
public boolean implies(Permission permission) public boolean implies(Permission permission) {
{
return all_allowed; // No sync; staleness OK return all_allowed; // No sync; staleness OK
} }
@ -219,8 +212,7 @@ implements java.io.Serializable
* *
* @return an enumeration of all the AllPermission objects. * @return an enumeration of all the AllPermission objects.
*/ */
public Enumeration<Permission> elements() public Enumeration<Permission> elements() {
{
return new Enumeration<Permission>() { return new Enumeration<Permission>() {
private boolean hasMore = all_allowed; private boolean hasMore = all_allowed;

34
jdk/src/share/classes/java/security/BasicPermission.java
View File

@ -68,7 +68,7 @@ import java.io.IOException;
*/ */
public abstract class BasicPermission extends Permission public abstract class BasicPermission extends Permission
implements java.io.Serializable implements java.io.Serializable
{ {
private static final long serialVersionUID = 6279438298436773498L; private static final long serialVersionUID = 6279438298436773498L;
@ -84,10 +84,8 @@ implements java.io.Serializable
/** /**
* initialize a BasicPermission object. Common to all constructors. * initialize a BasicPermission object. Common to all constructors.
*
*/ */
private void init(String name) private void init(String name) {
{
if (name == null) if (name == null)
throw new NullPointerException("name can't be null"); throw new NullPointerException("name can't be null");
@ -129,9 +127,7 @@ implements java.io.Serializable
* @throws NullPointerException if <code>name</code> is <code>null</code>. * @throws NullPointerException if <code>name</code> is <code>null</code>.
* @throws IllegalArgumentException if <code>name</code> is empty. * @throws IllegalArgumentException if <code>name</code> is empty.
*/ */
public BasicPermission(String name) {
public BasicPermission(String name)
{
super(name); super(name);
init(name); init(name);
} }
@ -148,8 +144,7 @@ implements java.io.Serializable
* @throws NullPointerException if <code>name</code> is <code>null</code>. * @throws NullPointerException if <code>name</code> is <code>null</code>.
* @throws IllegalArgumentException if <code>name</code> is empty. * @throws IllegalArgumentException if <code>name</code> is empty.
*/ */
public BasicPermission(String name, String actions) public BasicPermission(String name, String actions) {
{
super(name); super(name);
init(name); init(name);
} }
@ -238,8 +233,7 @@ implements java.io.Serializable
* *
* @return the empty string "". * @return the empty string "".
*/ */
public String getActions() public String getActions() {
{
return ""; return "";
} }
@ -296,7 +290,6 @@ implements java.io.Serializable
* *
* @see java.security.Permission * @see java.security.Permission
* @see java.security.Permissions * @see java.security.Permissions
* @see java.security.PermissionsImpl
* *
* *
* @author Roland Schemers * @author Roland Schemers
@ -305,8 +298,8 @@ implements java.io.Serializable
*/ */
final class BasicPermissionCollection final class BasicPermissionCollection
extends PermissionCollection extends PermissionCollection
implements java.io.Serializable implements java.io.Serializable
{ {
private static final long serialVersionUID = 739301742472979399L; private static final long serialVersionUID = 739301742472979399L;
@ -360,9 +353,7 @@ implements java.io.Serializable
* @exception SecurityException - if this BasicPermissionCollection object * @exception SecurityException - if this BasicPermissionCollection object
* has been marked readonly * has been marked readonly
*/ */
public void add(Permission permission) {
public void add(Permission permission)
{
if (! (permission instanceof BasicPermission)) if (! (permission instanceof BasicPermission))
throw new IllegalArgumentException("invalid permission: "+ throw new IllegalArgumentException("invalid permission: "+
permission); permission);
@ -398,16 +389,14 @@ implements java.io.Serializable
* Check and see if this set of permissions implies the permissions * Check and see if this set of permissions implies the permissions
* expressed in "permission". * 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 * @return true if "permission" is a proper subset of a permission in
* the set, false if not. * the set, false if not.
*/ */
public boolean implies(Permission permission) {
public boolean implies(Permission permission)
{
if (! (permission instanceof BasicPermission)) if (! (permission instanceof BasicPermission))
return false; return false;
BasicPermission bp = (BasicPermission) permission; BasicPermission bp = (BasicPermission) permission;
@ -468,7 +457,6 @@ implements java.io.Serializable
* *
* @return an enumeration of all the BasicPermission objects. * @return an enumeration of all the BasicPermission objects.
*/ */
public Enumeration<Permission> elements() { public Enumeration<Permission> elements() {
// Convert Iterator of Map values into an Enumeration // Convert Iterator of Map values into an Enumeration
synchronized (this) { synchronized (this) {

2
jdk/src/share/classes/java/security/CodeSource.java
View File

@ -207,7 +207,7 @@ public class CodeSource implements java.io.Serializable {
* Returns the code signers associated with this CodeSource. * Returns the code signers associated with this CodeSource.
* <p> * <p>
* If this CodeSource object was created using the * 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 * constructor then its certificate chains are extracted and used to
* create an array of CodeSigner objects. Note that only X.509 certificates * create an array of CodeSigner objects. Note that only X.509 certificates
* are examined - all other certificate types are ignored. * are examined - all other certificate types are ignored.

4
jdk/src/share/classes/java/security/KeyStore.java
View File

@ -32,6 +32,7 @@ import java.security.cert.CertificateException;
import java.util.*; import java.util.*;
import javax.crypto.SecretKey; import javax.crypto.SecretKey;
import javax.security.auth.DestroyFailedException;
import javax.security.auth.callback.*; import javax.security.auth.callback.*;
/** /**
@ -278,8 +279,7 @@ public class KeyStore {
* @exception DestroyFailedException if this method was unable * @exception DestroyFailedException if this method was unable
* to clear the password * to clear the password
*/ */
public synchronized void destroy() public synchronized void destroy() throws DestroyFailedException {
throws javax.security.auth.DestroyFailedException {
destroyed = true; destroyed = true;
if (password != null) { if (password != null) {
Arrays.fill(password, ' '); Arrays.fill(password, ' ');

2
jdk/src/share/classes/java/security/cert/PKIXRevocationChecker.java
View File

@ -50,7 +50,7 @@ import java.util.Set;
* status of certificates with OCSP and CRLs. By default, OCSP is the * status of certificates with OCSP and CRLs. By default, OCSP is the
* preferred mechanism for checking revocation status, with CRLs as the * preferred mechanism for checking revocation status, with CRLs as the
* fallback mechanism. However, this preference can be switched to CRLs with * 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 * <p>A {@code PKIXRevocationChecker} is obtained by calling the
* {@link CertPathValidator#getRevocationChecker getRevocationChecker} method * {@link CertPathValidator#getRevocationChecker getRevocationChecker} method

2
jdk/src/share/classes/java/sql/CallableStatement.java
View File

@ -1562,7 +1562,7 @@ public interface CallableStatement extends PreparedStatement {
* @param parameterName the name of the parameter * @param parameterName the name of the parameter
* @return the parameter value in full precision. If the value is * @return the parameter value in full precision. If the value is
* SQL <code>NULL</code>, the result is <code>null</code>. * 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 * parameter; if a database access error occurs or
* this method is called on a closed <code>CallableStatement</code> * this method is called on a closed <code>CallableStatement</code>
* @exception SQLFeatureNotSupportedException if the JDBC driver does not support * @exception SQLFeatureNotSupportedException if the JDBC driver does not support

4
jdk/src/share/classes/java/text/CollationElementIterator.java
View File

@ -119,7 +119,7 @@ public final class CollationElementIterator
* on the predefined collation rules. If the source string is empty, * on the predefined collation rules. If the source string is empty,
* NULLORDER will be returned on the calls to next(). * NULLORDER will be returned on the calls to next().
* @param sourceText the source string. * @param sourceText the source string.
* @param order the collation object. * @param owner the collation object.
*/ */
CollationElementIterator(String sourceText, RuleBasedCollator owner) { CollationElementIterator(String sourceText, RuleBasedCollator owner) {
this.owner = owner; this.owner = owner;
@ -137,7 +137,7 @@ public final class CollationElementIterator
* on the predefined collation rules. If the source string is empty, * on the predefined collation rules. If the source string is empty,
* NULLORDER will be returned on the calls to next(). * NULLORDER will be returned on the calls to next().
* @param sourceText the source string. * @param sourceText the source string.
* @param order the collation object. * @param owner the collation object.
*/ */
CollationElementIterator(CharacterIterator sourceText, RuleBasedCollator owner) { CollationElementIterator(CharacterIterator sourceText, RuleBasedCollator owner) {
this.owner = owner; this.owner = owner;

2
jdk/src/share/classes/java/text/DigitList.java
View File

@ -62,7 +62,7 @@ import java.math.RoundingMode;
* derived by placing all the digits of the list to the right of the * derived by placing all the digits of the list to the right of the
* decimal point, by 10^exponent. * decimal point, by 10^exponent.
* *
* @see Locale * @see java.util.Locale
* @see Format * @see Format
* @see NumberFormat * @see NumberFormat
* @see DecimalFormat * @see DecimalFormat

2
jdk/src/share/classes/java/text/Format.java
View File

@ -370,7 +370,7 @@ public abstract class Format implements Serializable, Cloneable {
* Delegates should NOT assume that the <code>Format</code> will notify * Delegates should NOT assume that the <code>Format</code> will notify
* the delegate of fields in any particular order. * the delegate of fields in any particular order.
* *
* @see FieldPosition.Delegate * @see FieldPosition#getFieldDelegate
* @see CharacterIteratorFieldDelegate * @see CharacterIteratorFieldDelegate
*/ */
interface FieldDelegate { interface FieldDelegate {

22
jdk/src/share/classes/java/text/RBCollationTables.java
View File

@ -192,13 +192,12 @@ final class RBCollationTables {
* *
* @see CollationElementIterator#getMaxExpansion * @see CollationElementIterator#getMaxExpansion
*/ */
int getMaxExpansion(int order) int getMaxExpansion(int order) {
{
int result = 1; int result = 1;
if (expandTable != null) { if (expandTable != null) {
// Right now this does a linear search through the entire // 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 // this could cause a performance problem, but in practise that
// rarely happens // rarely happens
for (int i = 0; i < expandTable.size(); i++) { for (int i = 0; i < expandTable.size(); i++) {
@ -215,20 +214,19 @@ final class RBCollationTables {
} }
/** /**
* Get the entry of hash table of the expanding string in the collation * Get the entry of hash table of the expanding string in the collation
* table. * table.
* @param idx the index of the expanding string value list * @param idx the index of the expanding string value list
*/ */
final int[] getExpandValueList(int order) { final int[] getExpandValueList(int idx) {
return expandTable.elementAt(order - EXPANDCHARINDEX); return expandTable.elementAt(idx - EXPANDCHARINDEX);
} }
/** /**
* Get the comarison order of a character from the collation table. * Get the comarison order of a character from the collation table.
* @return the comparison order of a character. * @return the comparison order of a character.
*/ */
int getUnicodeOrder(int ch) int getUnicodeOrder(int ch) {
{
return mapping.elementAt(ch); return mapping.elementAt(ch);
} }

2
jdk/src/share/classes/java/text/RBTableBuilder.java
View File

@ -71,7 +71,7 @@ final class RBTableBuilder {
* This is the main function that actually builds the tables and * This is the main function that actually builds the tables and
* stores them back in the RBCollationTables object. It is called * stores them back in the RBCollationTables object. It is called
* ONLY by the RBCollationTables constructor. * ONLY by the RBCollationTables constructor.
* @see java.util.RuleBasedCollator#RuleBasedCollator * @see RuleBasedCollator#RuleBasedCollator
* @exception ParseException If the rules format is incorrect. * @exception ParseException If the rules format is incorrect.
*/ */

2
jdk/src/share/classes/java/text/SimpleDateFormat.java
View File

@ -1787,7 +1787,7 @@ public class SimpleDateFormat extends DateFormat {
* timeFields. Returns -start (for ParsePosition) if failed. * timeFields. Returns -start (for ParsePosition) if failed.
* @param text the time text to be parsed. * @param text the time text to be parsed.
* @param start where to start parsing. * @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 count the count of a pattern character.
* @param obeyCount if true, then the next field directly abuts this one, * @param obeyCount if true, then the next field directly abuts this one,
* and we should use the count to know when to stop parsing. * and we should use the count to know when to stop parsing.

1
jdk/src/share/classes/java/util/Calendar.java
View File

@ -1788,7 +1788,6 @@ public abstract class Calendar implements Serializable, Cloneable, Comparable<Ca
* *
* @return a bit mask of selected fields * @return a bit mask of selected fields
* @see #isExternallySet(int) * @see #isExternallySet(int)
* @see #setInternallySetState(int)
*/ */
final int selectFields() { final int selectFields() {
// This implementation has been taken from the GregorianCalendar class. // This implementation has been taken from the GregorianCalendar class.

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

@ -665,7 +665,7 @@ public final class Currency implements Serializable {
* *
* @param pattern regex pattern for the properties * @param pattern regex pattern for the properties
* @param ctry country code * @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", * consists of "three-letter alphabet code", "three-digit numeric code",
* and "one-digit (0,1,2, or 3) default fraction digit". * and "one-digit (0,1,2, or 3) default fraction digit".
* For example, "JPZ,392,0". * For example, "JPZ,392,0".

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

@ -918,7 +918,7 @@ import sun.misc.FormattedFloatingDecimal;
* <p> If the {@code '0'} flag is given then the output will be padded * <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. * with leading zeros to the field width following any indication of sign.
* *
* <p> If {@code '('}, {@code '+'}, '&nbsp&nbsp;', or {@code ','} flags * <p> If {@code '('}, {@code '+'}, '&nbsp;&nbsp;', or {@code ','} flags
* are given then a {@link FormatFlagsConversionMismatchException} will be * are given then a {@link FormatFlagsConversionMismatchException} will be
* thrown. * thrown.
* *

6
jdk/src/share/classes/java/util/JapaneseImperialCalendar.java
View File

@ -1932,7 +1932,7 @@ class JapaneseImperialCalendar extends Calendar {
* Computes the fixed date under either the Gregorian or the * Computes the fixed date under either the Gregorian or the
* Julian calendar, using the given year and the specified calendar fields. * 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 * @param year the normalized year number, with 0 indicating the
* year 1 BCE, -1 indicating 2 BCE, etc. * year 1 BCE, -1 indicating 2 BCE, etc.
* @param fieldMask the calendar fields to be used for the date calculation * @param fieldMask the calendar fields to be used for the date calculation
@ -2141,7 +2141,7 @@ class JapaneseImperialCalendar extends Calendar {
* Returns the length of the specified month in the specified * Returns the length of the specified month in the specified
* Gregorian year. The year number must be normalized. * Gregorian year. The year number must be normalized.
* *
* @see #isLeapYear(int) * @see GregorianCalendar#isLeapYear(int)
*/ */
private int monthLength(int month, int gregorianYear) { private int monthLength(int month, int gregorianYear) {
return CalendarUtils.isGregorianLeapYear(gregorianYear) ? return CalendarUtils.isGregorianLeapYear(gregorianYear) ?
@ -2152,7 +2152,7 @@ class JapaneseImperialCalendar extends Calendar {
* Returns the length of the specified month in the year provided * Returns the length of the specified month in the year provided
* by internalGet(YEAR). * by internalGet(YEAR).
* *
* @see #isLeapYear(int) * @see GregorianCalendar#isLeapYear(int)
*/ */
private int monthLength(int month) { private int monthLength(int month) {
assert jdate.isNormalized(); assert jdate.isNormalized();

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

@ -345,7 +345,7 @@ class JumboEnumSet<E extends Enum<E>> extends EnumSet<E> {
* the same size, and every member of the given set is contained in * the same size, and every member of the given set is contained in
* this set. * 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 * @return <tt>true</tt> if the specified object is equal to this set
*/ */
public boolean equals(Object o) { public boolean equals(Object o) {

4
jdk/src/share/classes/java/util/Locale.java
View File

@ -1492,7 +1492,7 @@ public final class Locale implements Cloneable, Serializable {
* // returns "ja-JP-u-ca-japanese-x-lvariant-JP" * // returns "ja-JP-u-ca-japanese-x-lvariant-JP"
* Locale.forLanguageTag("th-TH-x-lvariant-TH").toLanguageTag(); * Locale.forLanguageTag("th-TH-x-lvariant-TH").toLanguageTag();
* // returns "th-TH-u-nu-thai-x-lvariant-TH" * // returns "th-TH-u-nu-thai-x-lvariant-TH"
* <pre></ul> * </pre></ul>
* *
* <p>This implements the 'Language-Tag' production of BCP47, and * <p>This implements the 'Language-Tag' production of BCP47, and
* so supports grandfathered (regular and irregular) as well as * so supports grandfathered (regular and irregular) as well as
@ -2143,7 +2143,7 @@ public final class Locale implements Cloneable, Serializable {
* @param in the <code>ObjectInputStream</code> to read * @param in the <code>ObjectInputStream</code> to read
* @throws IOException * @throws IOException
* @throws ClassNotFoundException * @throws ClassNotFoundException
* @throws IllformdLocaleException * @throws IllformedLocaleException
* @since 1.7 * @since 1.7
*/ */
private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException { private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {

49
jdk/src/share/classes/java/util/PropertyPermission.java
View File

@ -130,18 +130,15 @@ public final class PropertyPermission extends BasicPermission {
* @param mask the actions mask to use. * @param mask the actions mask to use.
* *
*/ */
private void init(int mask) {
private void init(int mask)
{
if ((mask & ALL) != mask) if ((mask & ALL) != mask)
throw new IllegalArgumentException("invalid actions mask"); throw new IllegalArgumentException("invalid actions mask");
if (mask == NONE) if (mask == NONE)
throw new IllegalArgumentException("invalid actions mask"); throw new IllegalArgumentException("invalid actions mask");
if (getName() == null) if (getName() == null)
throw new NullPointerException("name can't be null"); throw new NullPointerException("name can't be null");
this.mask = mask; this.mask = mask;
} }
@ -160,9 +157,7 @@ public final class PropertyPermission extends BasicPermission {
* @throws IllegalArgumentException if <code>name</code> is empty or if * @throws IllegalArgumentException if <code>name</code> is empty or if
* <code>actions</code> is invalid. * <code>actions</code> is invalid.
*/ */
public PropertyPermission(String name, String actions) {
public PropertyPermission(String name, String actions)
{
super(name,actions); super(name,actions);
init(getMask(actions)); init(getMask(actions));
} }
@ -196,7 +191,6 @@ public final class PropertyPermission extends BasicPermission {
return ((this.mask & that.mask) == that.mask) && super.implies(that); return ((this.mask & that.mask) == that.mask) && super.implies(that);
} }
/** /**
* Checks two PropertyPermission objects for equality. Checks that <i>obj</i> is * Checks two PropertyPermission objects for equality. Checks that <i>obj</i> is
* a PropertyPermission, and has the same name and actions as this object. * a PropertyPermission, and has the same name and actions as this object.
@ -226,16 +220,14 @@ public final class PropertyPermission extends BasicPermission {
* *
* @return a hash code value for this object. * @return a hash code value for this object.
*/ */
public int hashCode() { public int hashCode() {
return this.getName().hashCode(); return this.getName().hashCode();
} }
/** /**
* Converts an actions String to an actions mask. * Converts an actions String to an actions mask.
* *
* @param action the action string. * @param actions the action string.
* @return the actions mask. * @return the actions mask.
*/ */
private static int getMask(String actions) { private static int getMask(String actions) {
@ -332,8 +324,7 @@ public final class PropertyPermission extends BasicPermission {
* *
* @return the canonical string representation of the actions. * @return the canonical string representation of the actions.
*/ */
static String getActions(int mask) static String getActions(int mask) {
{
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();
boolean comma = false; boolean comma = false;
@ -359,8 +350,7 @@ public final class PropertyPermission extends BasicPermission {
* *
* @return the canonical string representation of the actions. * @return the canonical string representation of the actions.
*/ */
public String getActions() public String getActions() {
{
if (actions == null) if (actions == null)
actions = getActions(this.mask); actions = getActions(this.mask);
@ -373,7 +363,6 @@ public final class PropertyPermission extends BasicPermission {
* *
* @return the actions mask. * @return the actions mask.
*/ */
int getMask() { int getMask() {
return mask; return mask;
} }
@ -386,7 +375,6 @@ public final class PropertyPermission extends BasicPermission {
* @return a new PermissionCollection object suitable for storing * @return a new PermissionCollection object suitable for storing
* PropertyPermissions. * PropertyPermissions.
*/ */
public PermissionCollection newPermissionCollection() { public PermissionCollection newPermissionCollection() {
return new PropertyPermissionCollection(); return new PropertyPermissionCollection();
} }
@ -436,7 +424,7 @@ public final class PropertyPermission extends BasicPermission {
* @serial include * @serial include
*/ */
final class PropertyPermissionCollection extends PermissionCollection final class PropertyPermissionCollection extends PermissionCollection
implements Serializable implements Serializable
{ {
/** /**
@ -454,10 +442,8 @@ implements Serializable
private boolean all_allowed; private boolean all_allowed;
/** /**
* Create an empty PropertyPermissions object. * Create an empty PropertyPermissionCollection object.
*
*/ */
public PropertyPermissionCollection() { public PropertyPermissionCollection() {
perms = new HashMap<>(32); // Capacity for default policy perms = new HashMap<>(32); // Capacity for default policy
all_allowed = false; all_allowed = false;
@ -475,9 +461,7 @@ implements Serializable
* @exception SecurityException - if this PropertyPermissionCollection * @exception SecurityException - if this PropertyPermissionCollection
* object has been marked readonly * object has been marked readonly
*/ */
public void add(Permission permission) {
public void add(Permission permission)
{
if (! (permission instanceof PropertyPermission)) if (! (permission instanceof PropertyPermission))
throw new IllegalArgumentException("invalid permission: "+ throw new IllegalArgumentException("invalid permission: "+
permission); permission);
@ -514,14 +498,12 @@ implements Serializable
* Check and see if this set of permissions implies the permissions * Check and see if this set of permissions implies the permissions
* expressed in "permission". * 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 * @return true if "permission" is a proper subset of a permission in
* the set, false if not. * the set, false if not.
*/ */
public boolean implies(Permission permission) {
public boolean implies(Permission permission)
{
if (! (permission instanceof PropertyPermission)) if (! (permission instanceof PropertyPermission))
return false; return false;
@ -655,8 +637,9 @@ implements Serializable
* Reads in a Hashtable of PropertyPermissions and saves them in the * Reads in a Hashtable of PropertyPermissions and saves them in the
* perms field. Reads in all_allowed. * perms field. Reads in all_allowed.
*/ */
private void readObject(ObjectInputStream in) throws IOException, private void readObject(ObjectInputStream in)
ClassNotFoundException { throws IOException, ClassNotFoundException
{
// Don't call defaultReadObject() // Don't call defaultReadObject()
// Read in serialized fields // Read in serialized fields

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

@ -289,7 +289,7 @@ class RegularEnumSet<E extends Enum<E>> extends EnumSet<E> {
* the same size, and every member of the given set is contained in * the same size, and every member of the given set is contained in
* this set. * 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 * @return <tt>true</tt> if the specified object is equal to this set
*/ */
public boolean equals(Object o) { public boolean equals(Object o) {

3
jdk/src/share/classes/java/util/Scanner.java
View File

@ -568,9 +568,8 @@ public final class Scanner implements Iterator<String>, Closeable {
* Constructs a <code>Scanner</code> that returns values scanned * Constructs a <code>Scanner</code> that returns values scanned
* from the specified source delimited by the specified pattern. * 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 * @param pattern A delimiting pattern
* @return A scanner with the specified source and pattern
*/ */
private Scanner(Readable source, Pattern pattern) { private Scanner(Readable source, Pattern pattern) {
assert source != null : "source should not be null"; assert source != null : "source should not be null";

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

@ -221,7 +221,7 @@ abstract public class TimeZone implements Serializable, Cloneable {
* @param date the milliseconds (since January 1, 1970, * @param date the milliseconds (since January 1, 1970,
* 00:00:00.000 GMT) at which the time zone offset and daylight * 00:00:00.000 GMT) at which the time zone offset and daylight
* saving amount are found * 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, * (offset[0]) and daylight saving amount (offset[1]) are stored,
* or null if those values are not needed. The method assumes that * or null if those values are not needed. The method assumes that
* the length of the given array is two or larger. * the length of the given array is two or larger.

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

@ -41,8 +41,8 @@ import java.util.ArrayList;
* @since 1.5 * @since 1.5
* *
* @see javax.management * @see javax.management
* @see java.util.Logger * @see Logger
* @see java.util.LogManager * @see LogManager
*/ */
class Logging implements LoggingMXBean { class Logging implements LoggingMXBean {

2
jdk/src/share/classes/java/util/prefs/XmlSupport.java
View File

@ -92,7 +92,7 @@ class XmlSupport {
* @throws BackingStoreException if preference data cannot be read from * @throws BackingStoreException if preference data cannot be read from
* backing store. * backing store.
* @throws IllegalStateException if this node (or an ancestor) has been * @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) static void export(OutputStream os, final Preferences p, boolean subTree)
throws IOException, BackingStoreException { throws IOException, BackingStoreException {

8
jdk/src/share/classes/javax/crypto/CryptoAllPermission.java
View File

@ -136,8 +136,7 @@ final class CryptoAllPermissionCollection extends PermissionCollection
* @exception SecurityException - if this CryptoAllPermissionCollection * @exception SecurityException - if this CryptoAllPermissionCollection
* object has been marked readonly * object has been marked readonly
*/ */
public void add(Permission permission) public void add(Permission permission) {
{
if (isReadOnly()) if (isReadOnly())
throw new SecurityException("attempt to add a Permission to " + throw new SecurityException("attempt to add a Permission to " +
"a readonly PermissionCollection"); "a readonly PermissionCollection");
@ -152,13 +151,12 @@ final class CryptoAllPermissionCollection extends PermissionCollection
* Check and see if this set of permissions implies the permissions * Check and see if this set of permissions implies the permissions
* expressed in "permission". * 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 * @return true if the given permission is implied by this
* CryptoAllPermissionCollection. * CryptoAllPermissionCollection.
*/ */
public boolean implies(Permission permission) public boolean implies(Permission permission) {
{
if (!(permission instanceof CryptoPermission)) { if (!(permission instanceof CryptoPermission)) {
return false; return false;
} }

16
jdk/src/share/classes/javax/crypto/CryptoPermission.java
View File

@ -471,8 +471,8 @@ class CryptoPermission extends java.security.Permission {
* @author Sharon Liu * @author Sharon Liu
*/ */
final class CryptoPermissionCollection extends PermissionCollection final class CryptoPermissionCollection extends PermissionCollection
implements Serializable { implements Serializable
{
private static final long serialVersionUID = -511215555898802763L; private static final long serialVersionUID = -511215555898802763L;
private Vector<Permission> permissions; private Vector<Permission> permissions;
@ -493,8 +493,7 @@ implements Serializable {
* @exception SecurityException - if this CryptoPermissionCollection * @exception SecurityException - if this CryptoPermissionCollection
* object has been marked <i>readOnly</i>. * object has been marked <i>readOnly</i>.
*/ */
public void add(Permission permission) public void add(Permission permission) {
{
if (isReadOnly()) if (isReadOnly())
throw new SecurityException("attempt to add a Permission " + throw new SecurityException("attempt to add a Permission " +
"to a readonly PermissionCollection"); "to a readonly PermissionCollection");
@ -506,10 +505,10 @@ implements Serializable {
} }
/** /**
* Check and see if this CryptoPermission object implies * Check and see if this CryptoPermission object implies
* the given Permission object. * 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 * @return true if the given permission is implied by this
* CryptoPermissionCollection, false if not. * CryptoPermissionCollection, false if not.
@ -538,8 +537,7 @@ implements Serializable {
* @return an enumeration of all the CryptoPermission objects. * @return an enumeration of all the CryptoPermission objects.
*/ */
public Enumeration<Permission> elements() public Enumeration<Permission> elements() {
{
return permissions.elements(); return permissions.elements();
} }
} }

2
jdk/src/share/classes/javax/crypto/CryptoPolicyParser.java
View File

@ -54,7 +54,7 @@ import java.lang.reflect.*;
* @author Sharon Liu * @author Sharon Liu
* *
* @see java.security.Permissions * @see java.security.Permissions
* @see java.security.spec.AlgrithomParameterSpec * @see java.security.spec.AlgorithmParameterSpec
* @see javax.crypto.CryptoPermission * @see javax.crypto.CryptoPermission
* @see javax.crypto.CryptoAllPermission * @see javax.crypto.CryptoAllPermission
* @see javax.crypto.CryptoPermissions * @see javax.crypto.CryptoPermissions

2
jdk/src/share/classes/javax/crypto/NullCipherSpi.java
View File

@ -33,7 +33,7 @@ import java.security.spec.*;
* tranform the plaintext. * tranform the plaintext.
* *
* @author Li Gong * @author Li Gong
* @see Nullcipher * @see NullCipher
* *
* @since 1.4 * @since 1.4
*/ */

2
jdk/src/share/classes/javax/management/loading/MLet.java
View File

@ -798,7 +798,7 @@ public class MLet extends java.net.URLClassLoader
* Allows the m-let to perform any operations it needs before being unregistered * Allows the m-let to perform any operations it needs before being unregistered
* by the MBean server. * 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 * by the MBean server and re-thrown as an
* MBeanRegistrationException. * MBeanRegistrationException.
*/ */

4
jdk/src/share/classes/javax/management/modelmbean/ModelMBeanAttributeInfo.java
View File

@ -189,7 +189,7 @@ public class ModelMBeanAttributeInfo
* May be null if the property is write-only. * May be null if the property is write-only.
* @param setter The method used for writing the attribute value. * @param setter The method used for writing the attribute value.
* May be null if the attribute is read-only. * 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. * problem in the definition of this attribute.
* *
*/ */
@ -233,7 +233,7 @@ public class ModelMBeanAttributeInfo
* it is null, then a default descriptor will be created. If * it is null, then a default descriptor will be created. If
* the descriptor does not contain the field "displayName" this field is added * the descriptor does not contain the field "displayName" this field is added
* in the descriptor with its default value. * 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. * problem in the definition of this attribute.
* @exception RuntimeOperationsException Wraps an * @exception RuntimeOperationsException Wraps an
* IllegalArgumentException. The descriptor is invalid, or descriptor * IllegalArgumentException. The descriptor is invalid, or descriptor

5
jdk/src/share/classes/javax/management/openmbean/CompositeDataInvocationHandler.java
View File

@ -124,11 +124,6 @@ public class CompositeDataInvocationHandler implements InvocationHandler {
<p>Construct a handler backed by the given {@code <p>Construct a handler backed by the given {@code
CompositeData}.</p> 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 @param compositeData the {@code CompositeData} that will supply
information to getters. information to getters.

2
jdk/src/share/classes/javax/naming/spi/NamingManager.java
View File

@ -416,7 +416,7 @@ public class NamingManager {
* specified. * specified.
* See the <code>getObjectInstance</code> method for * See the <code>getObjectInstance</code> method for
* details. * 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. * specified, or null for the default initial context.
* See the <code>getObjectInstance</code> method for * See the <code>getObjectInstance</code> method for
* details. * details.

11
jdk/src/share/classes/javax/security/auth/kerberos/DelegationPermission.java
View File

@ -178,7 +178,6 @@ public final class DelegationPermission extends BasicPermission
* *
* @return a hash code value for this object. * @return a hash code value for this object.
*/ */
public int hashCode() { public int hashCode() {
return getName().hashCode(); return getName().hashCode();
} }
@ -278,12 +277,11 @@ final class KrbDelegationPermissionCollection extends PermissionCollection
* Check and see if this collection of permissions implies the permissions * Check and see if this collection of permissions implies the permissions
* expressed in "permission". * 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 * @return true if "permission" is a proper subset of a permission in
* the collection, false if not. * the collection, false if not.
*/ */
public boolean implies(Permission permission) { public boolean implies(Permission permission) {
if (! (permission instanceof DelegationPermission)) if (! (permission instanceof DelegationPermission))
return false; return false;
@ -310,7 +308,6 @@ final class KrbDelegationPermissionCollection extends PermissionCollection
* @exception SecurityException - if this PermissionCollection object * @exception SecurityException - if this PermissionCollection object
* has been marked readonly * has been marked readonly
*/ */
public void add(Permission permission) { public void add(Permission permission) {
if (! (permission instanceof DelegationPermission)) if (! (permission instanceof DelegationPermission))
throw new IllegalArgumentException("invalid permission: "+ throw new IllegalArgumentException("invalid permission: "+
@ -329,7 +326,6 @@ final class KrbDelegationPermissionCollection extends PermissionCollection
* *
* @return an enumeration of all the DelegationPermission objects. * @return an enumeration of all the DelegationPermission objects.
*/ */
public Enumeration<Permission> elements() { public Enumeration<Permission> elements() {
// Convert Iterator into Enumeration // Convert Iterator into Enumeration
synchronized (this) { synchronized (this) {
@ -376,8 +372,9 @@ final class KrbDelegationPermissionCollection extends PermissionCollection
* Reads in a Vector of DelegationPermissions and saves them in the perms field. * Reads in a Vector of DelegationPermissions and saves them in the perms field.
*/ */
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
private void readObject(ObjectInputStream in) throws IOException, private void readObject(ObjectInputStream in)
ClassNotFoundException { throws IOException, ClassNotFoundException
{
// Don't call defaultReadObject() // Don't call defaultReadObject()
// Read in serialized fields // Read in serialized fields

13
jdk/src/share/classes/javax/security/auth/kerberos/ServicePermission.java
View File

@ -259,7 +259,6 @@ public final class ServicePermission extends Permission
* Always returns present actions in the following order: * Always returns present actions in the following order:
* initiate, accept. * initiate, accept.
*/ */
public String getActions() { public String getActions() {
if (actions == null) if (actions == null)
actions = getActions(this.mask); actions = getActions(this.mask);
@ -280,7 +279,6 @@ public final class ServicePermission extends Permission
* @return a new PermissionCollection object suitable for storing * @return a new PermissionCollection object suitable for storing
* ServicePermissions. * ServicePermissions.
*/ */
public PermissionCollection newPermissionCollection() { public PermissionCollection newPermissionCollection() {
return new KrbServicePermissionCollection(); return new KrbServicePermissionCollection();
} }
@ -290,7 +288,6 @@ public final class ServicePermission extends Permission
* *
* @return the actions mask. * @return the actions mask.
*/ */
int getMask() { int getMask() {
return mask; return mask;
} }
@ -301,7 +298,6 @@ public final class ServicePermission extends Permission
* @param action the action string * @param action the action string
* @return the action mask * @return the action mask
*/ */
private static int getMask(String action) { private static int getMask(String action) {
if (action == null) { if (action == null) {
@ -468,12 +464,11 @@ final class KrbServicePermissionCollection extends PermissionCollection
* Check and see if this collection of permissions implies the permissions * Check and see if this collection of permissions implies the permissions
* expressed in "permission". * 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 * @return true if "permission" is a proper subset of a permission in
* the collection, false if not. * the collection, false if not.
*/ */
public boolean implies(Permission permission) { public boolean implies(Permission permission) {
if (! (permission instanceof ServicePermission)) if (! (permission instanceof ServicePermission))
return false; return false;
@ -517,7 +512,6 @@ final class KrbServicePermissionCollection extends PermissionCollection
* @exception SecurityException - if this PermissionCollection object * @exception SecurityException - if this PermissionCollection object
* has been marked readonly * has been marked readonly
*/ */
public void add(Permission permission) { public void add(Permission permission) {
if (! (permission instanceof ServicePermission)) if (! (permission instanceof ServicePermission))
throw new IllegalArgumentException("invalid permission: "+ throw new IllegalArgumentException("invalid permission: "+
@ -584,8 +578,9 @@ final class KrbServicePermissionCollection extends PermissionCollection
* Reads in a Vector of ServicePermissions and saves them in the perms field. * Reads in a Vector of ServicePermissions and saves them in the perms field.
*/ */
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
private void readObject(ObjectInputStream in) throws IOException, private void readObject(ObjectInputStream in)
ClassNotFoundException { throws IOException, ClassNotFoundException
{
// Don't call defaultReadObject() // Don't call defaultReadObject()
// Read in serialized fields // Read in serialized fields

4
jdk/src/share/classes/javax/sql/ConnectionPoolDataSource.java
View File

@ -48,7 +48,7 @@ public interface ConnectionPoolDataSource extends CommonDataSource {
* connection to the database that this * connection to the database that this
* <code>ConnectionPoolDataSource</code> object represents * <code>ConnectionPoolDataSource</code> object represents
* @exception SQLException if a database access error occurs * @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 * this method
* @since 1.4 * @since 1.4
*/ */
@ -64,7 +64,7 @@ public interface ConnectionPoolDataSource extends CommonDataSource {
* connection to the database that this * connection to the database that this
* <code>ConnectionPoolDataSource</code> object represents * <code>ConnectionPoolDataSource</code> object represents
* @exception SQLException if a database access error occurs * @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 * this method
* @since 1.4 * @since 1.4
*/ */

4
jdk/src/share/classes/javax/sql/PooledConnection.java
View File

@ -102,7 +102,7 @@ public interface PooledConnection {
* @return a <code>Connection</code> object that is a handle to * @return a <code>Connection</code> object that is a handle to
* this <code>PooledConnection</code> object * this <code>PooledConnection</code> object
* @exception SQLException if a database access error occurs * @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 * this method
* @since 1.4 * @since 1.4
*/ */
@ -117,7 +117,7 @@ public interface PooledConnection {
* information. * information.
* *
* @exception SQLException if a database access error occurs * @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 * this method
* @since 1.4 * @since 1.4
*/ */

2
jdk/src/share/classes/javax/sql/rowset/spi/SyncProvider.java
View File

@ -293,7 +293,7 @@ public abstract class SyncProvider {
* SyncProvider.DATASOURCE_TABLE_LOCK, * SyncProvider.DATASOURCE_TABLE_LOCK,
* SyncProvider.DATASOURCE_DB_LOCK * SyncProvider.DATASOURCE_DB_LOCK
* </pre> * </pre>
* @throws SyncProviderExceptiom if an error occurs determining the data * @throws SyncProviderException if an error occurs determining the data
* source locking level. * source locking level.
* @see #setDataSourceLock * @see #setDataSourceLock