From a17c9f2ea1ecec71169eff40c591ca3bf8307a32 Mon Sep 17 00:00:00 2001 From: Michael Koch Date: Tue, 20 Apr 2004 14:45:10 +0000 Subject: [PATCH] MarshalledObject.java, [...]: Fixed javadoc, coding style and argument names all over. 2004-04-20 Michael Koch * java/rmi/MarshalledObject.java, java/rmi/Naming.java, java/rmi/RemoteException.java, java/rmi/activation/ActivationException.java, java/rmi/server/ServerCloneException.java, java/security/AccessController.java, java/security/AlgorithmParameterGenerator.java, java/security/AlgorithmParameters.java, java/security/CodeSource.java, java/security/Identity.java, java/security/IdentityScope.java, java/security/KeyPairGenerator.java, java/security/KeyStore.java, java/security/Security.java, java/security/Signature.java, java/security/SignatureSpi.java, java/security/SignedObject.java, java/security/spec/DSAParameterSpec.java, java/security/spec/DSAPrivateKeySpec.java, java/security/spec/DSAPublicKeySpec.java, java/sql/Array.java, java/sql/DatabaseMetaData.java, java/sql/ResultSet.java, java/text/ChoiceFormat.java, java/text/CollationElementIterator.java, java/text/CollationKey.java, java/text/Collator.java, java/text/DateFormat.java, java/text/DateFormatSymbols.java, java/text/DecimalFormatSymbols.java, java/text/Format.java, java/text/ParsePosition.java, java/text/RuleBasedCollator.java, java/text/SimpleDateFormat.java, java/text/StringCharacterIterator.java, java/util/Collections.java, java/util/PropertyResourceBundle.java, java/util/ResourceBundle.java, java/util/StringTokenizer.java, java/util/jar/Attributes.java, java/util/logging/ConsoleHandler.java, java/util/logging/LogManager.java, java/util/logging/MemoryHandler.java, java/util/logging/SocketHandler.java, javax/naming/NamingException.java: Fixed javadoc, coding style and argument names all over. From-SVN: r80906 --- libjava/ChangeLog | 49 +++ libjava/java/rmi/MarshalledObject.java | 5 +- libjava/java/rmi/Naming.java | 10 +- libjava/java/rmi/RemoteException.java | 2 +- .../rmi/activation/ActivationException.java | 2 +- .../java/rmi/server/ServerCloneException.java | 2 +- libjava/java/security/AccessController.java | 10 +- .../security/AlgorithmParameterGenerator.java | 2 +- .../java/security/AlgorithmParameters.java | 2 +- libjava/java/security/CodeSource.java | 23 +- libjava/java/security/Identity.java | 2 +- libjava/java/security/IdentityScope.java | 4 +- libjava/java/security/KeyPairGenerator.java | 69 ++-- libjava/java/security/KeyStore.java | 2 +- libjava/java/security/Security.java | 6 +- libjava/java/security/Signature.java | 30 +- libjava/java/security/SignatureSpi.java | 2 +- libjava/java/security/SignedObject.java | 2 +- .../java/security/spec/DSAParameterSpec.java | 4 +- .../java/security/spec/DSAPrivateKeySpec.java | 4 +- .../java/security/spec/DSAPublicKeySpec.java | 4 +- libjava/java/sql/Array.java | 8 +- libjava/java/sql/DatabaseMetaData.java | 360 +++++++++--------- libjava/java/sql/ResultSet.java | 14 +- libjava/java/text/ChoiceFormat.java | 8 +- .../java/text/CollationElementIterator.java | 2 +- libjava/java/text/CollationKey.java | 8 +- libjava/java/text/Collator.java | 6 +- libjava/java/text/DateFormat.java | 6 +- libjava/java/text/DateFormatSymbols.java | 30 +- libjava/java/text/DecimalFormatSymbols.java | 6 +- libjava/java/text/Format.java | 2 +- libjava/java/text/ParsePosition.java | 6 +- libjava/java/text/RuleBasedCollator.java | 26 +- libjava/java/text/SimpleDateFormat.java | 12 +- .../java/text/StringCharacterIterator.java | 8 +- libjava/java/util/Collections.java | 2 +- libjava/java/util/PropertyResourceBundle.java | 2 +- libjava/java/util/ResourceBundle.java | 25 +- libjava/java/util/StringTokenizer.java | 4 +- libjava/java/util/jar/Attributes.java | 27 +- libjava/java/util/logging/ConsoleHandler.java | 2 +- libjava/java/util/logging/LogManager.java | 10 +- libjava/java/util/logging/MemoryHandler.java | 11 +- libjava/java/util/logging/SocketHandler.java | 2 +- libjava/javax/naming/NamingException.java | 4 +- 46 files changed, 441 insertions(+), 386 deletions(-) diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 84a66b1392c..e53db66f8ba 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,52 @@ +2004-04-20 Michael Koch + + * java/rmi/MarshalledObject.java, + java/rmi/Naming.java, + java/rmi/RemoteException.java, + java/rmi/activation/ActivationException.java, + java/rmi/server/ServerCloneException.java, + java/security/AccessController.java, + java/security/AlgorithmParameterGenerator.java, + java/security/AlgorithmParameters.java, + java/security/CodeSource.java, + java/security/Identity.java, + java/security/IdentityScope.java, + java/security/KeyPairGenerator.java, + java/security/KeyStore.java, + java/security/Security.java, + java/security/Signature.java, + java/security/SignatureSpi.java, + java/security/SignedObject.java, + java/security/spec/DSAParameterSpec.java, + java/security/spec/DSAPrivateKeySpec.java, + java/security/spec/DSAPublicKeySpec.java, + java/sql/Array.java, + java/sql/DatabaseMetaData.java, + java/sql/ResultSet.java, + java/text/ChoiceFormat.java, + java/text/CollationElementIterator.java, + java/text/CollationKey.java, + java/text/Collator.java, + java/text/DateFormat.java, + java/text/DateFormatSymbols.java, + java/text/DecimalFormatSymbols.java, + java/text/Format.java, + java/text/ParsePosition.java, + java/text/RuleBasedCollator.java, + java/text/SimpleDateFormat.java, + java/text/StringCharacterIterator.java, + java/util/Collections.java, + java/util/PropertyResourceBundle.java, + java/util/ResourceBundle.java, + java/util/StringTokenizer.java, + java/util/jar/Attributes.java, + java/util/logging/ConsoleHandler.java, + java/util/logging/LogManager.java, + java/util/logging/MemoryHandler.java, + java/util/logging/SocketHandler.java, + javax/naming/NamingException.java: + Fixed javadoc, coding style and argument names all over. + 2004-04-20 Jeroen Frijters * java/io/FileDescriptor.java: (FileDescriptor) Added public diff --git a/libjava/java/rmi/MarshalledObject.java b/libjava/java/rmi/MarshalledObject.java index 0ba91580d1a..ef22310c7b1 100644 --- a/libjava/java/rmi/MarshalledObject.java +++ b/libjava/java/rmi/MarshalledObject.java @@ -1,5 +1,5 @@ /* - Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc. + Copyright (c) 1996, 1997, 1998, 1999, 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -46,8 +46,7 @@ import gnu.java.rmi.RMIMarshalledObjectOutputStream; /** * FIXME - doc missing */ -public final class MarshalledObject - extends Object implements Serializable +public final class MarshalledObject implements Serializable { //The following fields are from Java API Documentation "Serialized form" diff --git a/libjava/java/rmi/Naming.java b/libjava/java/rmi/Naming.java index 1d2e68b982f..1a30c1f2c07 100644 --- a/libjava/java/rmi/Naming.java +++ b/libjava/java/rmi/Naming.java @@ -44,14 +44,16 @@ import java.rmi.registry.LocateRegistry; public final class Naming { -/** 
+/**
  * Looks for the remote object that is associated with the named service.
  * Name and location is given in form of a URL without a scheme:
- * 
- *   //host:port/service-name
+ *
+ * 
+ * //host:port/service-name
+ * 

  *  
  * The port is optional.
- *
+ * * @param name the service name and location * @return Remote-object that implements the named service * @throws NotBoundException if no object implements the service diff --git a/libjava/java/rmi/RemoteException.java b/libjava/java/rmi/RemoteException.java index 17e38b30bd7..b28f0709099 100644 --- a/libjava/java/rmi/RemoteException.java +++ b/libjava/java/rmi/RemoteException.java @@ -99,7 +99,7 @@ public class RemoteException extends IOException * This method returns a message indicating what went wrong, in this * format: * super.getMessage() + (detail == null ? "" - * : "; nested exception is:\n\t" + detail). + * : "; nested exception is:\n\t" + detail). * * @return the chained message */ diff --git a/libjava/java/rmi/activation/ActivationException.java b/libjava/java/rmi/activation/ActivationException.java index a1ac7bd6a28..a335142ce47 100644 --- a/libjava/java/rmi/activation/ActivationException.java +++ b/libjava/java/rmi/activation/ActivationException.java @@ -94,7 +94,7 @@ public class ActivationException extends Exception * This method returns a message indicating what went wrong, in this * format: * super.getMessage() + (detail == null ? "" - * : "; nested exception is:\n\t" + detail). + * : "; nested exception is:\n\t" + detail). * * @return the chained message */ diff --git a/libjava/java/rmi/server/ServerCloneException.java b/libjava/java/rmi/server/ServerCloneException.java index faf43c8e29c..3334c8d95b2 100644 --- a/libjava/java/rmi/server/ServerCloneException.java +++ b/libjava/java/rmi/server/ServerCloneException.java @@ -89,7 +89,7 @@ public class ServerCloneException extends CloneNotSupportedException * This method returns a message indicating what went wrong, in this * format: * super.getMessage() + (detail == null ? "" - * : "; nested exception is:\n\t" + detail). + * : "; nested exception is:\n\t" + detail). * * @return the chained message */ diff --git a/libjava/java/security/AccessController.java b/libjava/java/security/AccessController.java index 41ca1cec5fb..66aed9e3898 100644 --- a/libjava/java/security/AccessController.java +++ b/libjava/java/security/AccessController.java @@ -1,5 +1,5 @@ /* AccessController.java --- Access control context and permission checker - Copyright (C) 2001 Free Software Foundation, Inc. + Copyright (C) 2001, 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -91,7 +91,7 @@ public final class AccessController * * @param action the PrivilegedAction whose run() * should be be called. - * @returns the result of the action.run() method. + * @return the result of the action.run() method. */ public static Object doPrivileged(PrivilegedAction action) { @@ -110,7 +110,7 @@ public final class AccessController * should be be called. * @param context the AccessControlContext whose protection * domains should be added to the protection domain of the calling class. - * @returns the result of the action.run() method. + * @return the result of the action.run() method. */ public static Object doPrivileged(PrivilegedAction action, AccessControlContext context) @@ -130,7 +130,7 @@ public final class AccessController * * @param action the PrivilegedExceptionAction whose * run() should be be called. - * @returns the result of the action.run() method. + * @return the result of the action.run() method. * @exception PrivilegedActionException wrapped around any exception that * is thrown in the run() method. */ @@ -162,7 +162,7 @@ public final class AccessController * run() should be be called. * @param context the AccessControlContext whose protection * domains should be added to the protection domain of the calling class. - * @returns the result of the action.run() method. + * @return the result of the action.run() method. * @exception PrivilegedActionException wrapped around any exception that * is thrown in the run() method. */ diff --git a/libjava/java/security/AlgorithmParameterGenerator.java b/libjava/java/security/AlgorithmParameterGenerator.java index 26a7790d37a..034302504f0 100644 --- a/libjava/java/security/AlgorithmParameterGenerator.java +++ b/libjava/java/security/AlgorithmParameterGenerator.java @@ -67,7 +67,7 @@ import gnu.java.security.Engine; * system parameters, for example, the parameter generation values usually * consist of the size of the prime modulus and the size of the random * exponent, both specified in number of bits. - *
    + *
* *

In case the client does not explicitly initialize the * AlgorithmParameterGenerator (via a call to an init() diff --git a/libjava/java/security/AlgorithmParameters.java b/libjava/java/security/AlgorithmParameters.java index 07d76bb7bab..86298b9ea93 100644 --- a/libjava/java/security/AlgorithmParameters.java +++ b/libjava/java/security/AlgorithmParameters.java @@ -71,7 +71,7 @@ import gnu.java.security.Engine; * parameter specification or parameter encoding.

* *

A transparent parameter specification is obtained from an - * AlgorithmParameters object via a call to + * AlgorithmParameters object via a call to * getParameterSpec(), and a byte encoding of the parameters is * obtained via a call to getEncoded().

* diff --git a/libjava/java/security/CodeSource.java b/libjava/java/security/CodeSource.java index 36ee734efd3..35ec573cd9b 100644 --- a/libjava/java/security/CodeSource.java +++ b/libjava/java/security/CodeSource.java @@ -159,17 +159,22 @@ public class CodeSource implements Serializable * object must have all the certifcates this object has (but may have more), * and must have a location that is a subset of this object's. In order * for this object to imply the specified object, the following must be - * true:
    + * true: + * + *
      *
    1. codesource must not be null.
      2. *
    2. If codesource has a certificate list, all of it's * certificates must be present in the certificate list of this * code source.
      3. *
    3. If this object does not have a null location, then - * the following addtional tests must be passed.
        + * the following addtional tests must be passed. + * + *
          *
        1. codesource must not have a null * location.
          2. *
        2. codesource's location must be equal to this object's - * location, or
            + * location, or + *
              *
            • codesource's location protocol, port, and ref (aka, * anchor) must equal this objects
              • *
            • codesource's location host must imply this object's @@ -183,19 +188,21 @@ public class CodeSource implements Serializable * location file must start with this object's location file * with the '/' character appended to it.
              • *
            - *
        + *
      4. *
    * *

    For example, each of these locations imply the location - * "http://java.sun.com/classes/foo.jar":

      + * "http://java.sun.com/classes/foo.jar":

      + * * 
          * http:
    * http://*.sun.com/classes/*
    * http://java.sun.com/classes/-
    * http://java.sun.com/classes/foo.jar
    *
      - * Note that the code source with null location and null certificates implies - * all other code sources. + * + *

      Note that the code source with null location and null certificates implies + * all other code sources.

      * * @param cs the CodeSource to test against this object * @return true if this specified CodeSource is implied @@ -245,7 +252,7 @@ public class CodeSource implements Serializable /** * This method returns a String that represents this object. * The result is in the format "(" + getLocation() followed - * by a space separated list of certificates (or ""), + * by a space separated list of certificates (or "<no certificates>"), * followed by ")". * * @return a String for this object diff --git a/libjava/java/security/Identity.java b/libjava/java/security/Identity.java index 57ccc83e056..2e9ddea1a29 100644 --- a/libjava/java/security/Identity.java +++ b/libjava/java/security/Identity.java @@ -151,7 +151,7 @@ public abstract class Identity implements Principal, Serializable * @throws KeyManagementException if another identity in the identity's scope * has the same public key, or if another exception occurs. * @throws SecurityException if a security manager exists and its - * checkSecurityAccess() method doesn't allow setting the public + * checkSecurityAccess() method doesn't allow setting the public * key. * @see #getPublicKey() * @see SecurityManager#checkSecurityAccess(String) diff --git a/libjava/java/security/IdentityScope.java b/libjava/java/security/IdentityScope.java index 88e00fc81c0..5965a00a122 100644 --- a/libjava/java/security/IdentityScope.java +++ b/libjava/java/security/IdentityScope.java @@ -123,7 +123,7 @@ public abstract class IdentityScope extends Identity } /** - *

      Sets the system's identity scope.

      + * Sets the system's identity scope. * *

      First, if there is a security manager, its checkSecurityAccess() * method is called with "setSystemScope" as its argument @@ -131,7 +131,7 @@ public abstract class IdentityScope extends Identity * * @param scope the scope to set. * @throws SecurityException if a security manager exists and its - * checkSecurityAccess() method doesn't allow setting the + * checkSecurityAccess() method doesn't allow setting the * identity scope. * @see #getSystemScope() * @see SecurityManager#checkSecurityAccess(String) diff --git a/libjava/java/security/KeyPairGenerator.java b/libjava/java/security/KeyPairGenerator.java index b9b07852aa4..9a3a04d4ef8 100644 --- a/libjava/java/security/KeyPairGenerator.java +++ b/libjava/java/security/KeyPairGenerator.java @@ -56,43 +56,42 @@ import gnu.java.security.Engine; * two is the initialization of the object:

      * *
        - *
      • Algorithm-Independent Initialization
        - * All key pair generators share the concepts of a keysize and a - * source of randomness. The keysize is interpreted differently - * for different algorithms (e.g., in the case of the DSA algorithm, - * the keysize corresponds to the length of the modulus). There is an - * initialize() method in this KeyPairGenerator - * class that takes these two universally shared types of arguments. There - * is also one that takes just a keysize argument, and uses the - * {@link SecureRandom} implementation of the highest-priority installed - * provider as the source of randomness. (If none of the installed - * providers supply an implementation of {@link SecureRandom}, a - * system-provided source of randomness is used.)

        + *
      • Algorithm-Independent Initialization
        + * All key pair generators share the concepts of a keysize and a + * source of randomness. The keysize is interpreted differently + * for different algorithms (e.g., in the case of the DSA algorithm, + * the keysize corresponds to the length of the modulus). There is an + * initialize() method in this KeyPairGenerator + * class that takes these two universally shared types of arguments. There + * is also one that takes just a keysize argument, and uses the + * {@link SecureRandom} implementation of the highest-priority installed + * provider as the source of randomness. (If none of the installed + * providers supply an implementation of {@link SecureRandom}, a + * system-provided source of randomness is used.) * - * Since no other parameters are specified when you call the above - * algorithm-independent initialize methods, it is up to the provider what - * to do about the algorithm-specific parameters (if any) to be associated - * with each of the keys.

        + *

        Since no other parameters are specified when you call the above + * algorithm-independent initialize methods, it is up to the provider what + * to do about the algorithm-specific parameters (if any) to be associated + * with each of the keys.

        * - * If the algorithm is the DSA algorithm, and the keysize - * (modulus size) is 512, 768, or 1024, - * then the GNU provider uses a set of precomputed values for the - * p, q, and g parameters. If the - * modulus size is not one of the above values, the GNU - * provider creates a new set of parameters. Other providers might have - * precomputed parameter sets for more than just the three modulus sizes - * mentioned above. Still others might not have a list of precomputed - * parameters at all and instead always create new parameter sets.
        • - * - *
      • Algorithm-Specific Initialization
        - * For situations where a set of algorithm-specific parameters already - * exists (e.g., so-called community parameters in DSA), there - * are two initialize methods that have an {@link AlgorithmParameterSpec} - * argument. One also has a {@link SecureRandom} argument, while the the - * other uses the {@link SecureRandom} implementation of the highest-priority - * installed provider as the source of randomness. (If none of the installed - * providers supply an implementation of {@link SecureRandom}, a - * system-provided source of randomness is used.)
        • + *

        If the algorithm is the DSA algorithm, and the keysize + * (modulus size) is 512, 768, or 1024, + * then the GNU provider uses a set of precomputed values for the + * p, q, and g parameters. If the + * modulus size is not one of the above values, the GNU + * provider creates a new set of parameters. Other providers might have + * precomputed parameter sets for more than just the three modulus sizes + * mentioned above. Still others might not have a list of precomputed + * parameters at all and instead always create new parameter sets.

        + *
      • Algorithm-Specific Initialization
        + * For situations where a set of algorithm-specific parameters already + * exists (e.g., so-called community parameters in DSA), there + * are two initialize methods that have an {@link AlgorithmParameterSpec} + * argument. One also has a {@link SecureRandom} argument, while the the + * other uses the {@link SecureRandom} implementation of the highest-priority + * installed provider as the source of randomness. (If none of the installed + * providers supply an implementation of {@link SecureRandom}, a + * system-provided source of randomness is used.)
        • *
      * *

      In case the client does not explicitly initialize the diff --git a/libjava/java/security/KeyStore.java b/libjava/java/security/KeyStore.java index 5f0c159d7d2..4ca16a2290e 100644 --- a/libjava/java/security/KeyStore.java +++ b/libjava/java/security/KeyStore.java @@ -208,7 +208,7 @@ public class KeyStore /** * Returns the default KeyStore type. This method looks up the - * type in /lib/security/java.security with the + * type in <JAVA_HOME>/lib/security/java.security with the * property "keystore.type" or if that fails then "jks" . */ public static final String getDefaultType() diff --git a/libjava/java/security/Security.java b/libjava/java/security/Security.java index ef716150ab4..d7edf20656f 100644 --- a/libjava/java/security/Security.java +++ b/libjava/java/security/Security.java @@ -1,5 +1,5 @@ /* Security.java --- Java base security class implementation - Copyright (C) 1999, 2001, 2002, 2003, Free Software Foundation, Inc. + Copyright (C) 1999, 2001, 2002, 2003, 2004, Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -59,7 +59,7 @@ import java.util.Vector; * * @author Mark Benvenuto */ -public final class Security extends Object +public final class Security { private static final String ALG_ALIAS = "Alg.Alias."; @@ -670,7 +670,7 @@ public final class Security extends Object outer: for (int r = 0; r < 3; r++) // guard against circularity { serviceDotAlgorithm = (svc+"."+String.valueOf(algo)).trim(); - inner: for (it = p.keySet().iterator(); it.hasNext(); ) + for (it = p.keySet().iterator(); it.hasNext(); ) { key = (String) it.next(); if (key.equalsIgnoreCase(serviceDotAlgorithm)) // eureka diff --git a/libjava/java/security/Signature.java b/libjava/java/security/Signature.java index 1e99a7bb3e0..bf614e388b3 100644 --- a/libjava/java/security/Signature.java +++ b/libjava/java/security/Signature.java @@ -83,20 +83,20 @@ import gnu.java.security.Engine; * either signing data or verifying a signature:

      * *
        - *
      1. Initialization, with either - *
          - *
        • a public key, which initializes the signature for verification - * (see initVerify()), or
          • - *
        • a private key (and optionally a Secure Random Number Generator), - * which initializes the signature for signing (see - * {@link #initSign(PrivateKey)} and {@link #initSign(PrivateKey, SecureRandom)} - * ).
          • - *
        2. - *
      2. Updating
        - * Depending on the type of initialization, this will update the bytes to - * be signed or verified. See the update methods.
        3. - *
      3. Signing or Verifying a signature on all updated bytes. See the - * sign() methods and the verify() method.
        4. + *
      4. Initialization, with either + *
          + *
        • a public key, which initializes the signature for verification + * (see initVerify()), or
          • + *
        • a private key (and optionally a Secure Random Number Generator), + * which initializes the signature for signing (see + * {@link #initSign(PrivateKey)} and {@link #initSign(PrivateKey, SecureRandom)} + * ).
          • + *
        5. + *
      5. Updating
        + * Depending on the type of initialization, this will update the bytes to + * be signed or verified. See the update methods.
        6. + *
      6. Signing or Verifying a signature on all updated bytes. See the + * sign() methods and the verify() method.
        7. *
      * *

      Note that this class is abstract and extends from {@link SignatureSpi} for @@ -105,7 +105,7 @@ import gnu.java.security.Engine; * superclass are intended for cryptographic service providers who wish to * supply their own implementations of digital signature algorithms. * - * @author Mark Benvenuto + * @author Mark Benvenuto (ivymccough@worldnet.att.net) */ public abstract class Signature extends SignatureSpi { diff --git a/libjava/java/security/SignatureSpi.java b/libjava/java/security/SignatureSpi.java index 7deafd6b041..bf2382d8e40 100644 --- a/libjava/java/security/SignatureSpi.java +++ b/libjava/java/security/SignatureSpi.java @@ -279,7 +279,7 @@ public abstract class SignatureSpi * @param param the string name of the parameter. * @return the object that represents the parameter value, or null * if there is none. - * @throws InvalidParameterException if param is an invalid + * @throws InvalidParameterException if param is an invalid * parameter for this engine, or another exception occurs while trying to get * this parameter. * @deprecated diff --git a/libjava/java/security/SignedObject.java b/libjava/java/security/SignedObject.java index 270936ba686..0d9f733e70d 100644 --- a/libjava/java/security/SignedObject.java +++ b/libjava/java/security/SignedObject.java @@ -98,7 +98,7 @@ import java.io.Serializable; *

      The signature algorithm can be, among others, the NIST standard DSS, * using DSA and SHA-1. The algorithm is specified using the same * convention as that for signatures. The DSA algorithm using the - * SHA-1 message digest algorithm can be specified, for example, as + * SHA-1 message digest algorithm can be specified, for example, as * "SHA/DSA" or "SHA-1/DSA" (they are equivalent). In * the case of RSA, there are multiple choices for the message digest * algorithm, so the signing algorithm could be specified as, for example, diff --git a/libjava/java/security/spec/DSAParameterSpec.java b/libjava/java/security/spec/DSAParameterSpec.java index fa0ebce7a7a..5c7911f7420 100644 --- a/libjava/java/security/spec/DSAParameterSpec.java +++ b/libjava/java/security/spec/DSAParameterSpec.java @@ -1,5 +1,5 @@ /* DSAParameterSpec.java --- DSA Parameter Specificaton class - Copyright (C) 1999 Free Software Foundation, Inc. + Copyright (C) 1999, 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -48,7 +48,7 @@ import java.math.BigInteger; @author Mark Benvenuto */ -public class DSAParameterSpec extends Object implements AlgorithmParameterSpec, DSAParams +public class DSAParameterSpec implements AlgorithmParameterSpec, DSAParams { private BigInteger p = null; private BigInteger q = null; diff --git a/libjava/java/security/spec/DSAPrivateKeySpec.java b/libjava/java/security/spec/DSAPrivateKeySpec.java index b4025d61cb3..c148481ca50 100644 --- a/libjava/java/security/spec/DSAPrivateKeySpec.java +++ b/libjava/java/security/spec/DSAPrivateKeySpec.java @@ -1,5 +1,5 @@ /* DSAPrivateKeySpec.java --- DSA Private Key Specificaton class - Copyright (C) 1999 Free Software Foundation, Inc. + Copyright (C) 1999, 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -47,7 +47,7 @@ import java.math.BigInteger; @author Mark Benvenuto */ -public class DSAPrivateKeySpec extends Object implements KeySpec +public class DSAPrivateKeySpec implements KeySpec { private BigInteger x = null; private BigInteger p = null; diff --git a/libjava/java/security/spec/DSAPublicKeySpec.java b/libjava/java/security/spec/DSAPublicKeySpec.java index ef73371188a..687f8dd10fd 100644 --- a/libjava/java/security/spec/DSAPublicKeySpec.java +++ b/libjava/java/security/spec/DSAPublicKeySpec.java @@ -1,5 +1,5 @@ /* DSAPublicKeySpec.java --- DSA Public Key Specificaton class - Copyright (C) 1999 Free Software Foundation, Inc. + Copyright (C) 1999, 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -47,7 +47,7 @@ import java.math.BigInteger; @author Mark Benvenuto */ -public class DSAPublicKeySpec extends Object implements KeySpec +public class DSAPublicKeySpec implements KeySpec { private BigInteger y = null; private BigInteger p = null; diff --git a/libjava/java/sql/Array.java b/libjava/java/sql/Array.java index 0bb84cbe3d1..3246c86f8e8 100644 --- a/libjava/java/sql/Array.java +++ b/libjava/java/sql/Array.java @@ -165,13 +165,13 @@ public interface Array /** * This method returns a portion of the array as a ResultSet. * The returned portion will start at index into the - * array and up to count elements will be returned. - *

      - * Each row of the result set will have two columns. The first will be + * array and up to count elements will be returned. + * + *

      Each row of the result set will have two columns. The first will be * the index into the array of that row's contents. The second will be * the actual value of that array element. The specified Map * will be used to override selected default mappings of SQL types to - * Java classes. + * Java classes.

      * * @param offset The index into the array to start returning elements from. * @param length The requested number of elements to return. diff --git a/libjava/java/sql/DatabaseMetaData.java b/libjava/java/sql/DatabaseMetaData.java index d3cfd7c2e54..cd20691b7d7 100644 --- a/libjava/java/sql/DatabaseMetaData.java +++ b/libjava/java/sql/DatabaseMetaData.java @@ -412,7 +412,7 @@ public interface DatabaseMetaData * each table. * * @return true if the database uses a separate file for each - * table       false       otherwise. + * table false otherwise. * * @exception SQLException If an error occurs. */ @@ -433,8 +433,8 @@ public interface DatabaseMetaData * This method tests whether or not the database treats mixed case * identifiers as all upper case. * - * @exception true if the database treats all identifiers as - * upper case, false otherwise. + * @return true if the database treats all identifiers as + * upper case, false otherwise. * @exception SQLException If an error occurs. */ boolean storesUpperCaseIdentifiers() throws SQLException; @@ -443,8 +443,8 @@ public interface DatabaseMetaData * This method tests whether or not the database treats mixed case * identifiers as all lower case. * - * @exception true if the database treats all identifiers as - * lower case, false otherwise. + * @return true if the database treats all identifiers as + * lower case, false otherwise. * @exception SQLException If an error occurs. */ boolean storesLowerCaseIdentifiers() throws SQLException; @@ -473,8 +473,8 @@ public interface DatabaseMetaData * This method tests whether or not the database treats mixed case * quoted identifiers as all upper case. * - * @exception true if the database treats all quoted identifiers - * as upper case, false otherwise. + * @return true if the database treats all quoted identifiers + * as upper case, false otherwise. * @exception SQLException If an error occurs. */ boolean storesUpperCaseQuotedIdentifiers() throws SQLException; @@ -483,8 +483,8 @@ public interface DatabaseMetaData * This method tests whether or not the database treats mixed case * quoted identifiers as all lower case. * - * @exception true if the database treats all quoted identifiers - * as lower case, false otherwise. + * @return true if the database treats all quoted identifiers + * as lower case, false otherwise. * @exception SQLException If an error occurs. */ boolean storesLowerCaseQuotedIdentifiers() throws SQLException; @@ -1377,18 +1377,18 @@ public interface DatabaseMetaData *

      *

        *
      1. PROCEDURE_CAT - The catalog the procedure is in, which may be - * null. + * null.
        2. *
      2. PROCEDURE_SCHEM - The schema the procedures is in, which may be - * null. - *
      3. PROCEDURE_NAME - The name of the procedure. - *
      4. Unused - *
      5. Unused - *
      6. Unused - *
      7. REMARKS - A description of the procedure + * null.
        8. + *
      8. PROCEDURE_NAME - The name of the procedure.
        9. + *
      9. Unused
        10. + *
      10. Unused
        11. + *
      11. Unused
        12. + *
      12. REMARKS - A description of the procedure
        13. *
      13. PROCEDURE_TYPE - Indicates the return type of the procedure, which * is one of the contstants defined in this class * (procedureResultUnknown, procedureNoResult, or - * procedureReturnsResult). + * procedureReturnsResult).
        14. *
      * * @param catalog The name of the catalog to return stored procedured from, @@ -1409,27 +1409,27 @@ public interface DatabaseMetaData *

      *

        *
      1. PROCEDURE_CAT - The catalog the procedure is in, which may be - * null. + * null.
        2. *
      2. PROCEDURE_SCHEM - The schema the procedures is in, which may be - * null. - *
      3. PROCEDURE_NAME - The name of the procedure. - *
      4. COLUMN_NAME - The name of the column + * null.
        5. + *
      5. PROCEDURE_NAME - The name of the procedure.
        6. + *
      6. COLUMN_NAME - The name of the column
        7. *
      7. COLUMN_TYPE - The type of the column, which will be one of the * contants defined in this class (procedureColumnUnknown, * procedureColumnIn, procedureColumnInOut, * procedureColumnOut, procedureColumnReturn, - * or procedureColumnResult). + * or procedureColumnResult).
        8. *
      8. DATA_TYPE - The SQL type of the column. This is one of the constants - * defined in Types. - *
      9. TYPE_NAME - The string name of the data type for this column. - *
      10. PRECISION - The precision of the column. - *
      11. LENGTH - The length of the column in bytes - *
      12. SCALE - The scale of the column. - *
      13. RADIX - The radix of the column. + * defined in Types.
        14. + *
      14. TYPE_NAME - The string name of the data type for this column.
        15. + *
      15. PRECISION - The precision of the column.
        16. + *
      16. LENGTH - The length of the column in bytes
        17. + *
      17. SCALE - The scale of the column.
        18. + *
      18. RADIX - The radix of the column.
        19. *
      19. NULLABLE - Whether or not the column is NULLABLE. This is one of * the constants defined in this class (procedureNoNulls, - * procedureNullable, or procedureNullableUnknown) - *
      20. REMARKS - A description of the column. + * procedureNullable, or procedureNullableUnknown)
        21. + *
      21. REMARKS - A description of the column.
        22. *
      * * @param catalog The name of the catalog to return stored procedured from, @@ -1448,14 +1448,14 @@ public interface DatabaseMetaData /** * This method returns a list of the requested table as a * ResultSet with the following columns: - *

      + * *

        - *
      1. TABLE_CAT - The catalog the table is in, which may be null. - *
      2. TABLE_SCHEM - The schema the table is in, which may be null. - *
      3. TABLE_NAME - The name of the table. + *
      4. TABLE_CAT - The catalog the table is in, which may be null.
        5. + *
      5. TABLE_SCHEM - The schema the table is in, which may be null.
        6. + *
      6. TABLE_NAME - The name of the table.
        7. *
      7. TABLE_TYPE - A string describing the table type. This will be one - * of the values returned by the getTableTypes() method. - *
      8. REMARKS - Comments about the table. + * of the values returned by the getTableTypes() method.
        9. + *
      9. REMARKS - Comments about the table.
        10. *
      * * @param catalog The name of the catalog to return tables from, @@ -1507,29 +1507,29 @@ public interface DatabaseMetaData *

      *

        *
      1. TABLE_CAT - The catalog the table is in, which may be - * null. + * null.
        2. *
      2. TABLE_SCHEM - The schema the tables is in, which may be - * null. - *
      3. TABLE_NAME - The name of the table. - *
      4. COLUMN_NAME - The name of the column + * null.
        5. + *
      5. TABLE_NAME - The name of the table.
        6. + *
      6. COLUMN_NAME - The name of the column
        7. *
      7. DATA_TYPE - The SQL type of the column. This is one of the constants - * defined in Types. - *
      8. TYPE_NAME - The string name of the data type for this column. - *
      9. COLUMN_SIZE - The size of the column. - *
      10. Unused - *
      11. NUM_PREC_RADIX - The radix of the column. + * defined in Types.
        12. + *
      12. TYPE_NAME - The string name of the data type for this column.
        13. + *
      13. COLUMN_SIZE - The size of the column.
        14. + *
      14. Unused
        15. + *
      15. NUM_PREC_RADIX - The radix of the column.
        16. *
      16. NULLABLE - Whether or not the column is NULLABLE. This is one of * the constants defined in this class (tableNoNulls, - * tableNullable, or tableNullableUnknown) - *
      17. REMARKS - A description of the column. - *
      18. COLUMN_DEF - The default value for the column, may be null. - *
      19. SQL_DATA_TYPE - Unused - *
      20. SQL_DATETIME_SUB - Unused + * tableNullable, or tableNullableUnknown)
        21. + *
      21. REMARKS - A description of the column.
        22. + *
      22. COLUMN_DEF - The default value for the column, may be null.
        23. + *
      23. SQL_DATA_TYPE - Unused
        24. + *
      24. SQL_DATETIME_SUB - Unused
        25. *
      25. CHAR_OCTET_LENGTH - For character columns, the maximum number of bytes - * in the column. - *
      26. ORDINAL_POSITION - The index of the column in the table. + * in the column.
        27. + *
      27. ORDINAL_POSITION - The index of the column in the table.
        28. *
      28. IS_NULLABLE - "NO" means no, "YES" means maybe, and an empty string - * means unknown. + * means unknown.
        29. *
      * * @param catalog The name of the catalog to return table from, @@ -1548,19 +1548,19 @@ public interface DatabaseMetaData * This method returns the access rights that have been granted to the * requested columns. This information is returned as a ResultSet * with the following columns: - *

      + * *

        *
      1. TABLE_CAT - The catalog the table is in, which may be - * null. + * null.
        2. *
      2. TABLE_SCHEM - The schema the tables is in, which may be - * null. - *
      3. TABLE_NAME - The name of the table. - *
      4. COLUMN_NAME - The name of the column. - *
      5. GRANTOR - The entity that granted the access. - *
      6. GRANTEE - The entity granted the access. - *
      7. PRIVILEGE - The name of the privilege granted. + * null.
        8. + *
      8. TABLE_NAME - The name of the table.
        9. + *
      9. COLUMN_NAME - The name of the column.
        10. + *
      10. GRANTOR - The entity that granted the access.
        11. + *
      11. GRANTEE - The entity granted the access.
        12. + *
      12. PRIVILEGE - The name of the privilege granted.
        13. *
      13. IS_GRANTABLE - "YES" if the grantee can grant the privilege to - * others, "NO" if not, and null if unknown. + * others, "NO" if not, and null if unknown.
        14. *
      * * @param catalog The catalog to retrieve information from, or the empty string @@ -1580,18 +1580,18 @@ public interface DatabaseMetaData * This method returns the access rights that have been granted to the * requested tables. This information is returned as a ResultSet * with the following columns: - *

      + * *

        *
      1. TABLE_CAT - The catalog the table is in, which may be - * null. + * null.
        2. *
      2. TABLE_SCHEM - The schema the tables is in, which may be - * null. - *
      3. TABLE_NAME - The name of the table. - *
      4. GRANTOR - The entity that granted the access. - *
      5. GRANTEE - The entity granted the access. - *
      6. PRIVILEGE - The name of the privilege granted. + * null.
        7. + *
      7. TABLE_NAME - The name of the table.
        8. + *
      8. GRANTOR - The entity that granted the access.
        9. + *
      9. GRANTEE - The entity granted the access.
        10. + *
      10. PRIVILEGE - The name of the privilege granted.
        11. *
      11. IS_GRANTABLE - "YES" if the grantee can grant the privilege to - * others, "NO" if not, and null if unknown. + * others, "NO" if not, and null if unknown.
        12. *
      * * @param catalog The catalog to retrieve information from, or the empty string @@ -1611,22 +1611,22 @@ public interface DatabaseMetaData * This method returns the best set of columns for uniquely identifying * a row. It returns this information as a ResultSet with * the following columns: - *

      + * *

        *
      1. SCOPE - The scope of the results returned. This is one of the * constants defined in this class (bestRowTemporary, - * bestRowTransaction, or bestRowSession). - *
      2. COLUMN_NAME - The name of the column. + * bestRowTransaction, or bestRowSession).
        3. + *
      3. COLUMN_NAME - The name of the column.
        4. *
      4. DATA_TYPE - The SQL type of the column. This is one of the constants - * defined in Types. - *
      5. TYPE_NAME - The string name of the data type for this column. - *
      6. COLUMN_SIZE - The precision of the columns - *
      7. BUFFER_LENGTH - Unused - *
      8. DECIMAL_DIGITS - The scale of the column. + * defined in Types.
        9. + *
      9. TYPE_NAME - The string name of the data type for this column.
        10. + *
      10. COLUMN_SIZE - The precision of the columns
        11. + *
      11. BUFFER_LENGTH - Unused
        12. + *
      12. DECIMAL_DIGITS - The scale of the column.
        13. *
      13. PSEUDO_COLUMN - Whether or not the best row identifier is a * pseudo_column. This is one of the constants defined in this class * (bestRowUnknown, bestRowNotPseudo, or - * bestRowPseudo). + * bestRowPseudo).
        14. *
      * * @param catalog The catalog to retrieve information from, or the empty string @@ -1649,20 +1649,20 @@ public interface DatabaseMetaData * This method returns the set of columns that are automatically updated * when the row is update. It returns this information as a * ResultSet with the following columns: - *

      + * *

        - *
      1. SCOPE - Unused - *
      2. COLUMN_NAME - The name of the column. + *
      3. SCOPE - Unused
        4. + *
      4. COLUMN_NAME - The name of the column.
        5. *
      5. DATA_TYPE - The SQL type of the column. This is one of the constants - * defined in Types. - *
      6. TYPE_NAME - The string name of the data type for this column. - *
      7. COLUMN_SIZE - The precision of the columns - *
      8. BUFFER_LENGTH - Unused - *
      9. DECIMAL_DIGITS - The scale of the column. + * defined in Types.
        10. + *
      10. TYPE_NAME - The string name of the data type for this column.
        11. + *
      11. COLUMN_SIZE - The precision of the columns
        12. + *
      12. BUFFER_LENGTH - Unused
        13. + *
      13. DECIMAL_DIGITS - The scale of the column.
        14. *
      14. PSEUDO_COLUMN - Whether or not the best row identifier is a * pseudo_column. This is one of the constants defined in this class * (versionRowUnknown, versionRowNotPseudo, or - * versionRowPseudo). + * versionRowPseudo).
        15. *
      * * @param catalog The catalog to retrieve information from, or the empty string @@ -1681,14 +1681,14 @@ public interface DatabaseMetaData /** * This method returns a list of a table's primary key columns. These * are returned as a ResultSet with the following columns. - *

      + * *

        - *
      1. TABLE_CAT - The catalog of the table, which may be null. - *
      2. TABLE_SCHEM - The schema of the table, which may be null. - *
      3. TABLE_NAME - The name of the table. - *
      4. COLUMN_NAME - The name of the column. - *
      5. KEY_SEQ - The sequence number of the column within the primary key. - *
      6. PK_NAME - The name of the primary key, which may be null. + *
      7. TABLE_CAT - The catalog of the table, which may be null.
        8. + *
      8. TABLE_SCHEM - The schema of the table, which may be null.
        9. + *
      9. TABLE_NAME - The name of the table.
        10. + *
      10. COLUMN_NAME - The name of the column.
        11. + *
      11. KEY_SEQ - The sequence number of the column within the primary key.
        12. + *
      12. PK_NAME - The name of the primary key, which may be null.
        13. *
      * * @param catalog The catalog to retrieve information from, or the empty string @@ -1707,32 +1707,32 @@ public interface DatabaseMetaData /** * This method returns a list of the table's foreign keys. These are * returned as a ResultSet with the following columns: - *

      + * *

        - *
      1. PKTABLE_CAT - The catalog of the table the key was imported from. - *
      2. PKTABLE_SCHEM - The schema of the table the key was imported from. - *
      3. PKTABLE_NAME - The name of the table the key was imported from. - *
      4. PKCOLUMN_NAME - The name of the column that was imported. - *
      5. FKTABLE_CAT - The foreign key catalog name. - *
      6. FKTABLE_SCHEM - The foreign key schema name. - *
      7. FKTABLE_NAME - The foreign key table name. - *
      8. FKCOLUMN_NAME - The foreign key column name. - *
      9. KEY_SEQ - The sequence number of the column within the foreign key. + *
      10. PKTABLE_CAT - The catalog of the table the key was imported from.
        11. + *
      11. PKTABLE_SCHEM - The schema of the table the key was imported from.
        12. + *
      12. PKTABLE_NAME - The name of the table the key was imported from.
        13. + *
      13. PKCOLUMN_NAME - The name of the column that was imported.
        14. + *
      14. FKTABLE_CAT - The foreign key catalog name.
        15. + *
      15. FKTABLE_SCHEM - The foreign key schema name.
        16. + *
      16. FKTABLE_NAME - The foreign key table name.
        17. + *
      17. FKCOLUMN_NAME - The foreign key column name.
        18. + *
      18. KEY_SEQ - The sequence number of the column within the foreign key.
        19. *
      19. UPDATE_RULE - How the foreign key behaves when the primary key is * updated. This is one of the constants defined in this class * (importedNoAction, importedKeyCascade, * importedKeySetNull, importedKeySetDefault, or - * importedKeyRestrict). + * importedKeyRestrict).
        20. *
      20. DELETE_RULE - How the foreign key behaves when the primary key is * deleted. This is one of the constants defined in this class * (importedNoAction, importedKeyCascade, - * importedKeySetNull, or importedKeySetDefault) - *
      21. FK_NAME - The name of the foreign key. - *
      22. PK_NAME - The name of the primary key. + * importedKeySetNull, or importedKeySetDefault)
        23. + *
      23. FK_NAME - The name of the foreign key.
        24. + *
      24. PK_NAME - The name of the primary key.
        25. *
      25. DEFERRABILITY - The deferrability value. This is one of the * constants defined in this table (importedKeyInitiallyDeferred, * importedKeyInitiallyImmediate, or - * importedKeyNotDeferrable). + * importedKeyNotDeferrable).
        26. *
      * * @param catalog The catalog to retrieve information from, or the empty string @@ -1753,32 +1753,32 @@ public interface DatabaseMetaData * This method returns a list of the table's which use this table's * primary key as a foreign key. The information is * returned as a ResultSet with the following columns: - *

      + * *

        - *
      1. PKTABLE_CAT - The catalog of the table the key was imported from. - *
      2. PKTABLE_SCHEM - The schema of the table the key was imported from. - *
      3. PKTABLE_NAME - The name of the table the key was imported from. - *
      4. PKCOLUMN_NAME - The name of the column that was imported. - *
      5. FKTABLE_CAT - The foreign key catalog name. - *
      6. FKTABLE_SCHEM - The foreign key schema name. - *
      7. FKTABLE_NAME - The foreign key table name. - *
      8. FKCOLUMN_NAME - The foreign key column name. - *
      9. KEY_SEQ - The sequence number of the column within the foreign key. + *
      10. PKTABLE_CAT - The catalog of the table the key was imported from.
        11. + *
      11. PKTABLE_SCHEM - The schema of the table the key was imported from.
        12. + *
      12. PKTABLE_NAME - The name of the table the key was imported from.
        13. + *
      13. PKCOLUMN_NAME - The name of the column that was imported.
        14. + *
      14. FKTABLE_CAT - The foreign key catalog name.
        15. + *
      15. FKTABLE_SCHEM - The foreign key schema name.
        16. + *
      16. FKTABLE_NAME - The foreign key table name.
        17. + *
      17. FKCOLUMN_NAME - The foreign key column name.
        18. + *
      18. KEY_SEQ - The sequence number of the column within the foreign key.
        19. *
      19. UPDATE_RULE - How the foreign key behaves when the primary key is * updated. This is one of the constants defined in this class * (importedNoAction, importedKeyCascade, * importedKeySetNull, importedKeySetDefault, or - * importedKeyRestrict). + * importedKeyRestrict).
        20. *
      20. DELETE_RULE - How the foreign key behaves when the primary key is * deleted. This is one of the constants defined in this class * (importedNoAction, importedKeyCascade, - * importedKeySetNull, or importedKeySetDefault) - *
      21. FK_NAME - The name of the foreign key. - *
      22. PK_NAME - The name of the primary key. + * importedKeySetNull, or importedKeySetDefault)
        23. + *
      23. FK_NAME - The name of the foreign key.
        24. + *
      24. PK_NAME - The name of the primary key.
        25. *
      25. DEFERRABILITY - The deferrability value. This is one of the * constants defined in this table (importedKeyInitiallyDeferred, * importedKeyInitiallyImmediate, or - * importedKeyNotDeferrable). + * importedKeyNotDeferrable).
        26. *
      * * @param catalog The catalog to retrieve information from, or the empty string @@ -1797,32 +1797,32 @@ public interface DatabaseMetaData * This method returns a description of how one table imports another * table's primary key as a foreign key. The information is * returned as a ResultSet with the following columns: - *

      + * *

        - *
      1. PKTABLE_CAT - The catalog of the table the key was imported from. - *
      2. PKTABLE_SCHEM - The schema of the table the key was imported from. - *
      3. PKTABLE_NAME - The name of the table the key was imported from. - *
      4. PKCOLUMN_NAME - The name of the column that was imported. - *
      5. FKTABLE_CAT - The foreign key catalog name. - *
      6. FKTABLE_SCHEM - The foreign key schema name. - *
      7. FKTABLE_NAME - The foreign key table name. - *
      8. FKCOLUMN_NAME - The foreign key column name. - *
      9. KEY_SEQ - The sequence number of the column within the foreign key. + *
      10. PKTABLE_CAT - The catalog of the table the key was imported from.
        11. + *
      11. PKTABLE_SCHEM - The schema of the table the key was imported from.
        12. + *
      12. PKTABLE_NAME - The name of the table the key was imported from.
        13. + *
      13. PKCOLUMN_NAME - The name of the column that was imported.
        14. + *
      14. FKTABLE_CAT - The foreign key catalog name.
        15. + *
      15. FKTABLE_SCHEM - The foreign key schema name.
        16. + *
      16. FKTABLE_NAME - The foreign key table name.
        17. + *
      17. FKCOLUMN_NAME - The foreign key column name.
        18. + *
      18. KEY_SEQ - The sequence number of the column within the foreign key.
        19. *
      19. UPDATE_RULE - How the foreign key behaves when the primary key is * updated. This is one of the constants defined in this class * (importedNoAction, importedKeyCascade, * importedKeySetNull, importedKeySetDefault, or - * importedKeyRestrict). + * importedKeyRestrict).
        20. *
      20. DELETE_RULE - How the foreign key behaves when the primary key is * deleted. This is one of the constants defined in this class * (importedNoAction, importedKeyCascade, - * importedKeySetNull, or importedKeySetDefault) - *
      21. FK_NAME - The name of the foreign key. - *
      22. PK_NAME - The name of the primary key. + * importedKeySetNull, or importedKeySetDefault)
        23. + *
      23. FK_NAME - The name of the foreign key.
        24. + *
      24. PK_NAME - The name of the primary key.
        25. *
      25. DEFERRABILITY - The deferrability value. This is one of the * constants defined in this table (importedKeyInitiallyDeferred, * importedKeyInitiallyImmediate, or - * importedKeyNotDeferrable). + * importedKeyNotDeferrable).
        26. *
      * * @param primCatalog The catalog to retrieve information from, or the empty string @@ -1850,36 +1850,36 @@ public interface DatabaseMetaData * This method returns a list of the SQL types supported by this * database. The information is returned as a ResultSet * with the following columns: - *

      + * *

        - *
      1. TYPE_NAME - The name of the data type. + *
      2. TYPE_NAME - The name of the data type.
        3. *
      3. DATA_TYPE - A data type constant from Types for this - * type. - *
      4. PRECISION - The maximum precision of this type. + * type.
        5. + *
      5. PRECISION - The maximum precision of this type.
        6. *
      6. LITERAL_PREFIX - Prefix value used to quote a literal, which may be - * null. + * null.
        7. *
      7. LITERAL_SUFFIX - Suffix value used to quote a literal, which may be - * null. + * null.
        8. *
      8. CREATE_PARAMS - The parameters used to create the type, which may be - * null. + * null.
        9. *
      9. NULLABLE - Whether or not this type supports NULL values. This will * be one of the constants defined in this interface * (typeNoNulls, typeNullable, or - * typeNullableUnknown). - *
      10. CASE_SENSITIVE - Whether or not the value is case sensitive. + * typeNullableUnknown).
        11. + *
      11. CASE_SENSITIVE - Whether or not the value is case sensitive.
        12. *
      12. SEARCHABLE - Whether or not "LIKE" expressions are supported in * WHERE clauses for this type. This will be one of the constants defined * in this interface (typePredNone, typePredChar, - * typePredBasic, or typeSearchable). - *
      13. UNSIGNED_ATTRIBUTE - Is the value of this type unsigned. - *
      14. FIXED_PREC_SCALE - Whether or not this type can be used for money. - *
      15. AUTO_INCREMENT - Whether or not this type supports auto-incrementing. - *
      16. LOCAL_TYPE_NAME - A localized name for this data type. - *
      17. MINIMUM_SCALE - The minimum scale supported by this type. - *
      18. MAXIMUM_SCALE - The maximum scale supported by this type. - *
      19. SQL_DATA_TYPE - Unused. - *
      20. SQL_DATETIME_SUB - Unused. - *
      21. NUM_PREC_RADIX - The radix of this data type. + * typePredBasic, or typeSearchable).
        22. + *
      22. UNSIGNED_ATTRIBUTE - Is the value of this type unsigned.
        23. + *
      23. FIXED_PREC_SCALE - Whether or not this type can be used for money.
        24. + *
      24. AUTO_INCREMENT - Whether or not this type supports auto-incrementing.
        25. + *
      25. LOCAL_TYPE_NAME - A localized name for this data type.
        26. + *
      26. MINIMUM_SCALE - The minimum scale supported by this type.
        27. + *
      27. MAXIMUM_SCALE - The maximum scale supported by this type.
        28. + *
      28. SQL_DATA_TYPE - Unused.
        29. + *
      29. SQL_DATETIME_SUB - Unused.
        30. + *
      30. NUM_PREC_RADIX - The radix of this data type.
        31. *
      * * @return A ResultSet with the list of available data types. @@ -1890,30 +1890,30 @@ public interface DatabaseMetaData /** * This method returns information about a tables indices and statistics. * It is returned as a ResultSet with the following columns: - *

      + * *

        - *
      1. TABLE_CAT - The catalog of the table, which may be null. - *
      2. TABLE_SCHEM - The schema of the table, which may be null. - *
      3. TABLE_NAME - The name of the table. - *
      4. NON_UNIQUE - Are index values non-unique? - *
      5. INDEX_QUALIFIER The index catalog, which may be null - *
      6. INDEX_NAME - The name of the index. + *
      7. TABLE_CAT - The catalog of the table, which may be null.
        8. + *
      8. TABLE_SCHEM - The schema of the table, which may be null.
        9. + *
      9. TABLE_NAME - The name of the table.
        10. + *
      10. NON_UNIQUE - Are index values non-unique?
        11. + *
      11. INDEX_QUALIFIER The index catalog, which may be null
        12. + *
      12. INDEX_NAME - The name of the index.
        13. *
      13. TYPE - The type of index, which will be one of the constants defined * in this interface (tableIndexStatistic, * tableIndexClustered, tableIndexHashed, or - * tableIndexOther). + * tableIndexOther).
        14. *
      14. ORDINAL_POSITION - The sequence number of this column in the index. - * This will be 0 when the index type is tableIndexStatistic. - *
      15. COLUMN_NAME - The name of this column in the index. + * This will be 0 when the index type is tableIndexStatistic.
        16. + *
      16. COLUMN_NAME - The name of this column in the index.
        17. *
      17. ASC_OR_DESC - "A" for an ascending sort sequence, "D" for a * descending sort sequence or null if a sort sequence is not - * supported. + * supported.
        18. *
      18. CARDINALITY - The number of unique rows in the index, or the number - * of rows in the table if the index type is tableIndexStatistic. + * of rows in the table if the index type is tableIndexStatistic.
        19. *
      19. PAGES - The number of pages used for the index, or the number of pages - * in the table if the index type is tableIndexStatistic. + * in the table if the index type is tableIndexStatistic.
        20. *
      20. FILTER_CONDITION - The filter condition for this index, which may be - * null. + * null.
        21. *
      * * @param catalog The catalog to retrieve information from, or the empty string @@ -2093,16 +2093,16 @@ public interface DatabaseMetaData /** * This method returns the list of user defined data types in use. These * are returned as a ResultSet with the following columns: - *

      + * *

        - *
      1. TYPE_CAT - The catalog name, which may be null. - *
      2. TYPE_SCEHM - The schema name, which may be null. - *
      3. TYPE_NAME - The user defined data type name. - *
      4. CLASS_NAME - The Java class name this type maps to. + *
      5. TYPE_CAT - The catalog name, which may be null.
        6. + *
      6. TYPE_SCEHM - The schema name, which may be null.
        7. + *
      7. TYPE_NAME - The user defined data type name.
        8. + *
      8. CLASS_NAME - The Java class name this type maps to.
        9. *
      9. DATA_TYPE - A type identifier from Types for this type. * This will be one of JAVA_OBJECT, STRUCT, or - * DISTINCT. - *
      10. REMARKS - Comments about this data type. + * DISTINCT.
        11. + *
      11. REMARKS - Comments about this data type.
        12. *
      * * @param catalog The catalog to retrieve information from, or the empty string diff --git a/libjava/java/sql/ResultSet.java b/libjava/java/sql/ResultSet.java index 46a6c65c3f7..bbc2bae137d 100644 --- a/libjava/java/sql/ResultSet.java +++ b/libjava/java/sql/ResultSet.java @@ -48,14 +48,14 @@ import java.util.Map; /** * This interface provides access to the data set returned by a SQL * statement. An instance of this interface is returned by the various - * execution methods in the Statement - * This class models a cursor, which can be stepped through one row at a + * execution methods in the Statement. + * + *

      This class models a cursor, which can be stepped through one row at a * time. Methods are provided for accessing columns by column name or by - * index. - *

      - * Note that a result set is invalidated if the statement that returned - * it is closed. + * index.

      + * + *

      Note that a result set is invalidated if the statement that returned + * it is closed.

      * * @author Aaron M. Renn (arenn@urbanophile.com) */ diff --git a/libjava/java/text/ChoiceFormat.java b/libjava/java/text/ChoiceFormat.java index f7bdde1e294..f23bd128a5e 100644 --- a/libjava/java/text/ChoiceFormat.java +++ b/libjava/java/text/ChoiceFormat.java @@ -45,7 +45,7 @@ import java.util.Vector; * To use this class, first specify two lists of formats and range terminators. * These lists must be arrays of equal length. The format of index * i will be selected for value X if - * terminator[i] <= X < limit[i + 1]. If the value X is not + * terminator[i] <= X < limit[i + 1]. If the value X is not * included in any range, then either the first or last format will be * used depending on whether the value X falls outside the range. *

      @@ -196,10 +196,10 @@ public class ChoiceFormat extends NumberFormat * This method tests this object for equality with the specified * object. This will be true if and only if: *

        - *
      • The specified object is not null. - *
      • The specified object is an instance of ChoiceFormat. + *
      • The specified object is not null.
        • + *
      • The specified object is an instance of ChoiceFormat.
        • *
      • The termination ranges and format strings are identical to - * this object's. + * this object's.
        • *
      * * @param obj The object to test for equality against. diff --git a/libjava/java/text/CollationElementIterator.java b/libjava/java/text/CollationElementIterator.java index 691d943d21b..2377a09548b 100644 --- a/libjava/java/text/CollationElementIterator.java +++ b/libjava/java/text/CollationElementIterator.java @@ -129,7 +129,7 @@ public final class CollationElementIterator /** * This method resets the internal position pointer to read from the - * beginning of the String again. + * beginning of the String again. */ public void reset() { diff --git a/libjava/java/text/CollationKey.java b/libjava/java/text/CollationKey.java index 8859b320463..abc28b22ebb 100644 --- a/libjava/java/text/CollationKey.java +++ b/libjava/java/text/CollationKey.java @@ -140,12 +140,12 @@ public final class CollationKey implements Comparable * this object. This will be true if and only if: *

      *

        - *
      • The specified object must not be null - *
      • The specified object is an instance of CollationKey. + *
      • The specified object must not be null
        • + *
      • The specified object is an instance of CollationKey.
        • *
      • The specified object was created from the same Collator - * as this object. + * as this object.
        • *
      • The specified object has the same source string and bit key as - * this object. + * this object.
        • *
      * * @param obj The Object to test for equality. diff --git a/libjava/java/text/Collator.java b/libjava/java/text/Collator.java index bb5a3449139..907057eb0f9 100644 --- a/libjava/java/text/Collator.java +++ b/libjava/java/text/Collator.java @@ -183,10 +183,10 @@ public abstract class Collator implements Comparator, Cloneable * object. This will be true if and only if the following conditions are * met: *
        - *
      • The specified object is not null. - *
      • The specified object is an instance of Collator. + *
      • The specified object is not null.
        • + *
      • The specified object is an instance of Collator.
        • *
      • The specified object has the same strength and decomposition - * settings as this object. + * settings as this object.
        • *
      * * @param obj The Object to test for equality against diff --git a/libjava/java/text/DateFormat.java b/libjava/java/text/DateFormat.java index 745a16b3ec2..0947b8058ad 100644 --- a/libjava/java/text/DateFormat.java +++ b/libjava/java/text/DateFormat.java @@ -196,9 +196,9 @@ public abstract class DateFormat extends Format implements Cloneable * object: *

      *

        - *
      • Is not null. - *
      • Is an instance of DateFormat. - *
      • Has the same numberFormat field value as this object. + *
      • Is not null.
        • + *
      • Is an instance of DateFormat.
        • + *
      • Has the same numberFormat field value as this object.
        • *
      * * @param obj The object to test for equality against. diff --git a/libjava/java/text/DateFormatSymbols.java b/libjava/java/text/DateFormatSymbols.java index 526f7120bcc..33a541bd1b7 100644 --- a/libjava/java/text/DateFormatSymbols.java +++ b/libjava/java/text/DateFormatSymbols.java @@ -245,11 +245,12 @@ public class DateFormatSymbols implements java.io.Serializable, Cloneable * the array contains five values: *

      *

        - *
      • 0 - The non-localized time zone id string. - *
      • 1 - The long name of the time zone (standard time). - *
      • 2 - The short name of the time zone (standard time). - *
      • 3 - The long name of the time zone (daylight savings time). - *
      • 4 - the short name of the time zone (daylight savings time). + *
      • 0 - The non-localized time zone id string.
        • + *
      • 1 - The long name of the time zone (standard time).
        • + *
      • 2 - The short name of the time zone (standard time).
        • + *
      • 3 - The long name of the time zone (daylight savings time).
        • + *
      • 4 - the short name of the time zone (daylight savings time).
        • + *
      * * @return The list of time zone display strings. */ @@ -386,11 +387,12 @@ public class DateFormatSymbols implements java.io.Serializable, Cloneable * the array contains five values: *

      *

        - *
      • 0 - The non-localized time zone id string. - *
      • 1 - The long name of the time zone (standard time). - *
      • 2 - The short name of the time zone (standard time). - *
      • 3 - The long name of the time zone (daylight savings time). - *
      • 4 - the short name of the time zone (daylight savings time). + *
      • 0 - The non-localized time zone id string.
        • + *
      • 1 - The long name of the time zone (standard time).
        • + *
      • 2 - The short name of the time zone (standard time).
        • + *
      • 3 - The long name of the time zone (daylight savings time).
        • + *
      • 4 - the short name of the time zone (daylight savings time).
        • + *
      * * @return The list of time zone display strings. */ @@ -438,15 +440,15 @@ public class DateFormatSymbols implements java.io.Serializable, Cloneable * This will be true if and only if the specified object: *

      *

        - *
      • Is not null. - *
      • Is an instance of DateFormatSymbols. - *
      • Contains identical formatting symbols to this object. + *
      • Is not null.
        • + *
      • Is an instance of DateFormatSymbols.
        • + *
      • Contains identical formatting symbols to this object.
        • *
      * * @param obj The Object to test for equality against. * * @return true if the specified object is equal to this one, - *       false       otherwise. + * false otherwise. */ public boolean equals (Object obj) { diff --git a/libjava/java/text/DecimalFormatSymbols.java b/libjava/java/text/DecimalFormatSymbols.java index 268fe2cf987..35e75311eb0 100644 --- a/libjava/java/text/DecimalFormatSymbols.java +++ b/libjava/java/text/DecimalFormatSymbols.java @@ -167,9 +167,9 @@ public final class DecimalFormatSymbols implements Cloneable, Serializable * regard to the specified object: *

      *

        - *
      • It is not null. - *
      • It is an instance of DecimalFormatSymbols - *
      • All of its symbols are identical to the symbols in this object. + *
      • It is not null.
        • + *
      • It is an instance of DecimalFormatSymbols.
        • + *
      • All of its symbols are identical to the symbols in this object.
        • *
      * * @return true if the specified object is equal to this diff --git a/libjava/java/text/Format.java b/libjava/java/text/Format.java index f64951bb94c..d3b7fccce01 100644 --- a/libjava/java/text/Format.java +++ b/libjava/java/text/Format.java @@ -123,7 +123,7 @@ public abstract class Format implements Serializable, Cloneable * This method parses a String and converts the parsed * contents into an Object. * - * @param str The String to parse. + * @param str The String to parse. * * @return The resulting Object. * diff --git a/libjava/java/text/ParsePosition.java b/libjava/java/text/ParsePosition.java index 83e92689fd5..c6dffed8f59 100644 --- a/libjava/java/text/ParsePosition.java +++ b/libjava/java/text/ParsePosition.java @@ -116,10 +116,10 @@ public class ParsePosition * all of the following conditions are met. *

      *

        - *
      • The specified object is not null. - *
      • The specified object is an instance of ParsePosition. + *
      • The specified object is not null.
        • + *
      • The specified object is an instance of ParsePosition.
        • *
      • The specified object has the same index and error index as - * this object. + * this object.
        • *
      * * @param obj The Object to test for equality against diff --git a/libjava/java/text/RuleBasedCollator.java b/libjava/java/text/RuleBasedCollator.java index 5b1dc0cfbed..1c1feab4e3c 100644 --- a/libjava/java/text/RuleBasedCollator.java +++ b/libjava/java/text/RuleBasedCollator.java @@ -56,9 +56,9 @@ import java.util.Vector; *

      * Rules take the form of a String with the following syntax *

        - *
      • Modifier: '@' - *
      • Relation: '<' | ';' | ',' | '=' : - *
      • Reset: '&' : + *
      • Modifier: '@'
        • + *
      • Relation: '<' | ';' | ',' | '=' : <text>
        • + *
      • Reset: '&' : <text>
        • *
      * The modifier character indicates that accents sort backward as is the * case with French. The modifier applies to all rules after @@ -69,12 +69,12 @@ import java.util.Vector; * the following meanings: *
        *
      • '<' - The text argument is greater than the prior term at the primary - * difference level. + * difference level.
        • *
      • ';' - The text argument is greater than the prior term at the secondary - * difference level. + * difference level.
        • *
      • ',' - The text argument is greater than the prior term at the tertiary - * difference level. - *
      • '=' - The text argument is equal to the prior term + * difference level.
        • + *
      • '=' - The text argument is equal to the prior term
        • *
      *

      * As for the text argument itself, this is any sequence of Unicode @@ -131,15 +131,15 @@ import java.util.Vector; * A ParseException will be thrown for any of the following * conditions: *

        - *
      • Unquoted punctuation characters in a text argument. - *
      • A relational or reset operator not followed by a text argument + *
      • Unquoted punctuation characters in a text argument.
        • + *
      • A relational or reset operator not followed by a text argument
        • *
      • A reset operator where the text argument is not present in - * the previous rule string section. + * the previous rule string section.
        • *
      * - * @author Aaron M. Renn - * @author Tom Tromey - * @author Guilhem Lavaux + * @author Aaron M. Renn (arenn@urbanophile.com) + * @author Tom Tromey (tromey@cygnus.com) + * @author Guilhem Lavaux (guilhem@kaffe.org) */ public class RuleBasedCollator extends Collator { diff --git a/libjava/java/text/SimpleDateFormat.java b/libjava/java/text/SimpleDateFormat.java index 89f84dde5c6..69ce391db8d 100644 --- a/libjava/java/text/SimpleDateFormat.java +++ b/libjava/java/text/SimpleDateFormat.java @@ -358,13 +358,13 @@ public class SimpleDateFormat extends DateFormat * object. This will be true if and only if the specified object: *

      *

        - *
      • Is not null. - *
      • Is an instance of SimpleDateFormat. + *
      • Is not null.
        • + *
      • Is an instance of SimpleDateFormat.
        • *
      • Is equal to this object at the superclass (i.e., DateFormat) - * level. - *
      • Has the same formatting pattern. - *
      • Is using the same formatting symbols. - *
      • Is using the same century for two digit years. + * level.
        • + *
      • Has the same formatting pattern.
        • + *
      • Is using the same formatting symbols.
        • + *
      • Is using the same century for two digit years.
        • *
      * * @param obj The object to compare for equality against. diff --git a/libjava/java/text/StringCharacterIterator.java b/libjava/java/text/StringCharacterIterator.java index 7b7f46e7f59..44bac6b74a3 100644 --- a/libjava/java/text/StringCharacterIterator.java +++ b/libjava/java/text/StringCharacterIterator.java @@ -314,10 +314,10 @@ public final class StringCharacterIterator implements CharacterIterator * object. This will be true if and only if the specified object: *

      *

        - *
      • is not null. - *
      • is an instance of StringCharacterIterator - *
      • has the same text as this object - *
      • has the same beginning, ending, and current index as this object. + *
      • is not null.
        • + *
      • is an instance of StringCharacterIterator
        • + *
      • has the same text as this object
        • + *
      • has the same beginning, ending, and current index as this object.
        • *
      * * @param obj The object to test for equality against. diff --git a/libjava/java/util/Collections.java b/libjava/java/util/Collections.java index 815afccc807..7e5ac6ec2c1 100644 --- a/libjava/java/util/Collections.java +++ b/libjava/java/util/Collections.java @@ -54,7 +54,7 @@ import java.io.Serializable; * are not required, to throw the {@link UnsupportedOperationException} that * the underlying collection would throw during an attempt at modification. * For example, - * Collections.singleton("").addAll(Collections.EMPTY_SET) + * Collections.singleton("").addAll(Collections.EMPTY_SET) * does not throw a exception, even though addAll is an unsupported operation * on a singleton; the reason for this is that addAll did not attempt to * modify the set. diff --git a/libjava/java/util/PropertyResourceBundle.java b/libjava/java/util/PropertyResourceBundle.java index d873e134e62..9d556f2e4b6 100644 --- a/libjava/java/util/PropertyResourceBundle.java +++ b/libjava/java/util/PropertyResourceBundle.java @@ -54,7 +54,7 @@ import java.io.InputStream; * * If there is also a class for this resource and the same locale, the * class will be chosen. The properties file should have the name of the - * resource bundle, appended with the locale (e.g. _de_de and the * extension .properties. The file should have the same format * as for Properties.load() * diff --git a/libjava/java/util/ResourceBundle.java b/libjava/java/util/ResourceBundle.java index 7a4a282e773..6663bd4533e 100644 --- a/libjava/java/util/ResourceBundle.java +++ b/libjava/java/util/ResourceBundle.java @@ -51,7 +51,7 @@ import gnu.classpath.Configuration; * getObject or getString on that bundle. * *

      When a bundle is demanded for a specific locale, the ResourceBundle - * is searched in following order (def. language stands for the + * is searched in following order (def. language stands for the * two letter ISO language code of the default locale (see * Locale.getDefault()). * @@ -251,18 +251,22 @@ public abstract class ResourceBundle * *

      A sequence of candidate bundle names are generated, and tested in * this order, where the suffix 1 means the string from the specified - * locale, and the suffix 2 means the string from the default locale:

        + * locale, and the suffix 2 means the string from the default locale:

        + * + *
          *
        • baseName + "_" + language1 + "_" + country1 + "_" + variant1
          • *
        • baseName + "_" + language1 + "_" + country1
          • *
        • baseName + "_" + language1
          • *
        • baseName + "_" + language2 + "_" + country2 + "_" + variant2
          • *
        • baseName + "_" + language2 + "_" + country2
          • - *
        • baseName + "_" + language2
        • + *
        • baseName + "_" + language2
          • *
        • baseName
          • *
        * *

        In the sequence, entries with an empty string are ignored. Next, - * getBundle tries to instantiate the resource bundle:

          + * getBundle tries to instantiate the resource bundle:

          + * + *
            *
          • First, an attempt is made to load a class in the specified classloader * which is a subclass of ResourceBundle, and which has a public constructor * with no arguments, via reflection.
            • @@ -277,7 +281,7 @@ public abstract class ResourceBundle * in the above sequence are tested in a similar manner, and if any results * in a resource bundle, it is assigned as the parent of the first bundle * using the setParent method (unless the first bundle already - * has a parent). + * has a parent).

            * *

            For example, suppose the following class and property files are * provided: MyResources.class, MyResources_fr_CH.properties, @@ -286,10 +290,12 @@ public abstract class ResourceBundle * all files are valid (that is, public non-abstract subclasses of * ResourceBundle with public nullary constructors for the ".class" files, * syntactically correct ".properties" files). The default locale is - * Locale("en", "UK"). + * Locale("en", "UK").

            * *

            Calling getBundle with the shown locale argument values instantiates - * resource bundles from the following sources:

              + * resource bundles from the following sources:

              + * + *
                *
              • Locale("fr", "CH"): result MyResources_fr_CH.class, parent * MyResources_fr.properties, parent MyResources.class
                • *
              • Locale("fr", "FR"): result MyResources_fr.properties, parent @@ -301,8 +307,9 @@ public abstract class ResourceBundle *
              • Locale("es", "ES"): result MyResources_es_ES.class, parent * MyResources.class
                • *
              - * The file MyResources_fr_CH.properties is never used because it is hidden - * by MyResources_fr_CH.class. + * + *

              The file MyResources_fr_CH.properties is never used because it is hidden + * by MyResources_fr_CH.class.

              * * @param baseName the name of the ResourceBundle * @param locale A locale diff --git a/libjava/java/util/StringTokenizer.java b/libjava/java/util/StringTokenizer.java index e7fc6fd00d2..472d8951e5d 100644 --- a/libjava/java/util/StringTokenizer.java +++ b/libjava/java/util/StringTokenizer.java @@ -196,7 +196,7 @@ public class StringTokenizer implements Enumeration /** * This does the same as hasMoreTokens. This is the - * EnumerationEnumeration               interface method. * * @return true, if the next call of nextElement() will succeed * @see #hasMoreTokens() @@ -208,7 +208,7 @@ public class StringTokenizer implements Enumeration /** * This does the same as nextTokens. This is the - * EnumerationEnumeration               interface method. * * @return the next token with respect to the current delimiter characters * @throws NoSuchElementException if there are no more tokens diff --git a/libjava/java/util/jar/Attributes.java b/libjava/java/util/jar/Attributes.java index ea203446eaa..06dc4f89fc5 100644 --- a/libjava/java/util/jar/Attributes.java +++ b/libjava/java/util/jar/Attributes.java @@ -85,17 +85,18 @@ public class Attributes implements Cloneable, Map * attributes, applet attributes, extension identification attributes, * package versioning and sealing attributes, file contents attributes, * bean objects attribute and signing attributes. See the - *

              - * The characters of a Name must obey the following restrictions: + * + *

              The characters of a Name must obey the following restrictions:

              + * *
                - *
              • Must contain at least one character - *
              • The first character must be alphanumeric (a-z, A-Z, 0-9) - *
              • All other characters must be alphanumeric, a '-' or a '_' + *
              • Must contain at least one character
                • + *
              • The first character must be alphanumeric (a-z, A-Z, 0-9)
                • + *
              • All other characters must be alphanumeric, a '-' or a '_'
                • *
              - *

              - * When comparing Names (with equals) all characters are + * + *

              When comparing Names (with equals) all characters are * converted to lowercase. But you can get the original case sensitive - * string with the toString() method. + * string with the toString() method.

              * * @since 1.2 * @author Mark Wielaard (mark@klomp.org) @@ -145,15 +146,15 @@ public class Attributes implements Cloneable, Map * Manifest manifest file with the following Names: *
                *
              • <extension>-Extension-Name: - * unique name of the extension + * unique name of the extension
                • *
              • <extension>-Specification-Version: - * minimum specification version + * minimum specification version
                • *
              • <extension>-Implementation-Version: - * minimum implementation version + * minimum implementation version
                • *
              • <extension>-Implementation-Vendor-Id: - * unique id of implementation vendor + * unique id of implementation vendor
                • *
              • <extension>-Implementation-URL: - * where the latest version of the extension library can be found + * where the latest version of the extension library can be found
                • *
              */ public static final Name EXTENSION_LIST = new Name("Extension-List"); diff --git a/libjava/java/util/logging/ConsoleHandler.java b/libjava/java/util/logging/ConsoleHandler.java index dd519b682f4..6d79c1dbfca 100644 --- a/libjava/java/util/logging/ConsoleHandler.java +++ b/libjava/java/util/logging/ConsoleHandler.java @@ -67,7 +67,7 @@ package java.util.logging; * *
            • java.util.logging.ConsoleHandler.encoding - specifies * the name of the character encoding. Default value: - * the default platform encoding. + * the default platform encoding.
              • * *
            * diff --git a/libjava/java/util/logging/LogManager.java b/libjava/java/util/logging/LogManager.java index 36216bc408b..24757089410 100644 --- a/libjava/java/util/logging/LogManager.java +++ b/libjava/java/util/logging/LogManager.java @@ -67,13 +67,12 @@ import java.lang.ref.WeakReference; * java.util.logging.LogManager is initialized. * The configuration process includes the subsequent steps: * - *
              + *
                *
              • If the system property java.util.logging.manager * is set to the name of a subclass of * java.util.logging.LogManager, an instance of * that subclass is created and becomes the global LogManager. * Otherwise, a new instance of LogManager is created.
                • - * *
              • The LogManager constructor tries to create * a new instance of the class specified by the system * property java.util.logging.config.class. @@ -91,14 +90,13 @@ import java.lang.ref.WeakReference; * {@link #readConfiguration(java.io.InputStream)}. * The name and location of this file are specified by the system * property java.util.logging.config.file.
                • - * *
              • If the system property java.util.logging.config.file * is not set, however, the contents of the URL * "{gnu.classpath.home.url}/logging.properties" are passed to * {@link #readConfiguration(java.io.InputStream)}. * Here, "{gnu.classpath.home.url}" stands for the value of * the system property gnu.classpath.home.url.
                • - *
            + *
          * * @author Sascha Brawer (brawer@acm.org) */ @@ -259,10 +257,10 @@ public class LogManager * * @param logger the logger to be added. * - * @return trueif logger was added, + * @return trueif logger was added, * false otherwise. * - * @throws NullPointerException if name is + * @throws NullPointerException if name is * null. */ public synchronized boolean addLogger(Logger logger) diff --git a/libjava/java/util/logging/MemoryHandler.java b/libjava/java/util/logging/MemoryHandler.java index 825a6fa86d6..3c18b527d18 100644 --- a/libjava/java/util/logging/MemoryHandler.java +++ b/libjava/java/util/logging/MemoryHandler.java @@ -35,10 +35,7 @@ module. An independent module is a module which is not derived from or based on this library. If you modify this library, you may extend this exception to your version of the library, but you are not obligated to do so. If you do not wish to do so, delete this -exception statement from your version. - -*/ - +exception statement from your version. */ package java.util.logging; @@ -53,28 +50,22 @@ package java.util.logging; * value, a default is taken without an exception being thrown. * *
            - * *
          • java.util.MemoryHandler.level - specifies * the initial severity level threshold. Default value: * Level.ALL.
            • - * *
          • java.util.MemoryHandler.filter - specifies * the name of a Filter class. Default value: No Filter.
            • - * *
          • java.util.MemoryHandler.size - specifies the * maximum number of log records that are kept in the circular * buffer. Default value: 1000.
            • - * *
          • java.util.MemoryHandler.push - specifies the * pushLevel. Default value: * Level.SEVERE.
            • - * *
          • java.util.MemoryHandler.target - specifies the * name of a subclass of {@link Handler} that will be used as the * target handler. There is no default value for this property; * if it is not set, the no-argument MemoryHandler constructor * will throw an exception.
            • - * *
          * * @author Sascha Brawer (brawer@acm.org) diff --git a/libjava/java/util/logging/SocketHandler.java b/libjava/java/util/logging/SocketHandler.java index d9939a0f780..d4fc6e603c1 100644 --- a/libjava/java/util/logging/SocketHandler.java +++ b/libjava/java/util/logging/SocketHandler.java @@ -68,7 +68,7 @@ package java.util.logging; * *
        • java.util.SocketHandler.encoding - specifies * the name of the character encoding. Default value: - * the default platform encoding. + * the default platform encoding.
          • * *
        • java.util.SocketHandler.host - specifies * the name of the host to which records are published. diff --git a/libjava/javax/naming/NamingException.java b/libjava/javax/naming/NamingException.java index 0cb2d5547cd..e0aef0a5e2f 100644 --- a/libjava/javax/naming/NamingException.java +++ b/libjava/javax/naming/NamingException.java @@ -93,7 +93,7 @@ public class NamingException extends Exception /** * Creates a new NamingException without a message. Does not set any of the * rootException, resolvedName, - * resolvedObj or remainingObject, fields. + * resolvedObj or remainingObject fields. * These fields can be set later. */ public NamingException () @@ -104,7 +104,7 @@ public class NamingException extends Exception /** * Creates a new NamingException with a detailed message. Does not set * the rootException, resolvedName, - * resolvedObj or remainingObject, fields. + * resolvedObj or remainingObject, fields. * These fields can be set later. */ public NamingException (String msg) -- 2.30.2