CVSROOT: /cvsroot/classpath Module name: classpath Branch: generics Changes by: Andrew John Hughes <gnu_andrew> 06/06/04 19:40:45
Modified files: . : ChangeLog java/util : DuplicateFormatFlagsException.java FormatFlagsConversionMismatchException.java FormatterClosedException.java IllegalFormatCodePointException.java IllegalFormatConversionException.java IllegalFormatException.java IllegalFormatFlagsException.java IllegalFormatPrecisionException.java IllegalFormatWidthException.java MissingFormatArgumentException.java MissingFormatWidthException.java UnknownFormatConversionException.java UnknownFormatFlagsException.java Log message: 2006-06-04 Andrew John Hughes <[EMAIL PROTECTED]> * java/util/DuplicateFormatFlagsException.java, * java/util/FormatFlagsConversionMismatchException.java, * java/util/FormatterClosedException.java, * java/util/IllegalFormatCodePointException.java, * java/util/IllegalFormatConversionException.java, * java/util/IllegalFormatException.java, * java/util/IllegalFormatFlagsException.java, * java/util/IllegalFormatPrecisionException.java, * java/util/IllegalFormatWidthException.java, * java/util/MissingFormatArgumentException.java, * java/util/MissingFormatWidthException.java, * java/util/UnknownFormatConversionException.java, * java/util/UnknownFormatFlagsException.java: Documented. CVSWeb URLs: http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&only_with_tag=generics&r1=1.2386.2.262&r2=1.2386.2.263 http://cvs.savannah.gnu.org/viewcvs/classpath/java/util/DuplicateFormatFlagsException.java?cvsroot=classpath&only_with_tag=generics&r1=1.1.2.3&r2=1.1.2.4 http://cvs.savannah.gnu.org/viewcvs/classpath/java/util/FormatFlagsConversionMismatchException.java?cvsroot=classpath&only_with_tag=generics&r1=1.1.2.4&r2=1.1.2.5 http://cvs.savannah.gnu.org/viewcvs/classpath/java/util/FormatterClosedException.java?cvsroot=classpath&only_with_tag=generics&r1=1.1.2.4&r2=1.1.2.5 http://cvs.savannah.gnu.org/viewcvs/classpath/java/util/IllegalFormatCodePointException.java?cvsroot=classpath&only_with_tag=generics&r1=1.1.2.3&r2=1.1.2.4 http://cvs.savannah.gnu.org/viewcvs/classpath/java/util/IllegalFormatConversionException.java?cvsroot=classpath&only_with_tag=generics&r1=1.1.2.3&r2=1.1.2.4 http://cvs.savannah.gnu.org/viewcvs/classpath/java/util/IllegalFormatException.java?cvsroot=classpath&only_with_tag=generics&r1=1.1.2.4&r2=1.1.2.5 http://cvs.savannah.gnu.org/viewcvs/classpath/java/util/IllegalFormatFlagsException.java?cvsroot=classpath&only_with_tag=generics&r1=1.1.2.3&r2=1.1.2.4 http://cvs.savannah.gnu.org/viewcvs/classpath/java/util/IllegalFormatPrecisionException.java?cvsroot=classpath&only_with_tag=generics&r1=1.1.2.3&r2=1.1.2.4 http://cvs.savannah.gnu.org/viewcvs/classpath/java/util/IllegalFormatWidthException.java?cvsroot=classpath&only_with_tag=generics&r1=1.1.2.3&r2=1.1.2.4 http://cvs.savannah.gnu.org/viewcvs/classpath/java/util/MissingFormatArgumentException.java?cvsroot=classpath&only_with_tag=generics&r1=1.1.2.3&r2=1.1.2.4 http://cvs.savannah.gnu.org/viewcvs/classpath/java/util/MissingFormatWidthException.java?cvsroot=classpath&only_with_tag=generics&r1=1.1.2.3&r2=1.1.2.4 http://cvs.savannah.gnu.org/viewcvs/classpath/java/util/UnknownFormatConversionException.java?cvsroot=classpath&only_with_tag=generics&r1=1.1.2.4&r2=1.1.2.5 http://cvs.savannah.gnu.org/viewcvs/classpath/java/util/UnknownFormatFlagsException.java?cvsroot=classpath&only_with_tag=generics&r1=1.1.2.3&r2=1.1.2.4 Patches: Index: ChangeLog =================================================================== RCS file: /cvsroot/classpath/classpath/ChangeLog,v retrieving revision 1.2386.2.262 retrieving revision 1.2386.2.263 diff -u -b -r1.2386.2.262 -r1.2386.2.263 --- ChangeLog 4 Jun 2006 15:56:53 -0000 1.2386.2.262 +++ ChangeLog 4 Jun 2006 19:40:43 -0000 1.2386.2.263 @@ -1,5 +1,22 @@ 2006-06-04 Andrew John Hughes <[EMAIL PROTECTED]> + * java/util/DuplicateFormatFlagsException.java, + * java/util/FormatFlagsConversionMismatchException.java, + * java/util/FormatterClosedException.java, + * java/util/IllegalFormatCodePointException.java, + * java/util/IllegalFormatConversionException.java, + * java/util/IllegalFormatException.java, + * java/util/IllegalFormatFlagsException.java, + * java/util/IllegalFormatPrecisionException.java, + * java/util/IllegalFormatWidthException.java, + * java/util/MissingFormatArgumentException.java, + * java/util/MissingFormatWidthException.java, + * java/util/UnknownFormatConversionException.java, + * java/util/UnknownFormatFlagsException.java: + Documented. + +2006-06-04 Andrew John Hughes <[EMAIL PROTECTED]> + * java/lang/System.java: (getenv()): Handle cases where split only returns an array of size 1. Index: java/util/DuplicateFormatFlagsException.java =================================================================== RCS file: /cvsroot/classpath/classpath/java/util/Attic/DuplicateFormatFlagsException.java,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -u -b -r1.1.2.3 -r1.1.2.4 --- java/util/DuplicateFormatFlagsException.java 21 Sep 2005 21:32:40 -0000 1.1.2.3 +++ java/util/DuplicateFormatFlagsException.java 4 Jun 2006 19:40:45 -0000 1.1.2.4 @@ -38,19 +38,49 @@ package java.util; -/** @since 1.5 */ -public class DuplicateFormatFlagsException extends IllegalFormatException +/** + * Thrown when the flags supplied to the [EMAIL PROTECTED] Formatter#format()} + * method of a [EMAIL PROTECTED] Formatter} contain duplicates. + * + * @author Tom Tromey ([EMAIL PROTECTED]) + * @author Andrew John Hughes ([EMAIL PROTECTED]) + * @since 1.5 + */ +public class DuplicateFormatFlagsException + extends IllegalFormatException { private static final long serialVersionUID = 18890531L; + /** + * The flags which contain a duplicate. + * + * @serial the flags containing a duplicate. + */ // Note: name fixed by serialization. private String flags; + /** + * Constructs a new <code>DuplicateFormatFlagsException</code> + * which specifies that the supplied set of flags contains a + * duplicate. + * + * @param flags the flags containing a duplicate. + * @throws NullPointerException if <code>flags</code> is null. + */ public DuplicateFormatFlagsException(String flags) { + super("Duplicate flag passed in " + flags); + if (flags == null) + throw new + NullPointerException("Null flags value passed to constructor."); this.flags = flags; } + /** + * Returns the flags which contain a duplicate. + * + * @return the flags. + */ public String getFlags() { return flags; Index: java/util/FormatFlagsConversionMismatchException.java =================================================================== RCS file: /cvsroot/classpath/classpath/java/util/Attic/FormatFlagsConversionMismatchException.java,v retrieving revision 1.1.2.4 retrieving revision 1.1.2.5 diff -u -b -r1.1.2.4 -r1.1.2.5 --- java/util/FormatFlagsConversionMismatchException.java 25 Sep 2005 02:55:13 -0000 1.1.2.4 +++ java/util/FormatFlagsConversionMismatchException.java 4 Jun 2006 19:40:45 -0000 1.1.2.5 @@ -38,29 +38,72 @@ package java.util; -/** @since 1.5 */ +/** + * Thrown when the flags supplied to the [EMAIL PROTECTED] Formatter#format()} + * method of a [EMAIL PROTECTED] Formatter} contains a flag that does not match + * the conversion character specified for it. + * + * @author Tom Tromey ([EMAIL PROTECTED]) + * @author Andrew John Hughes ([EMAIL PROTECTED]) + * @since 1.5 + */ public class FormatFlagsConversionMismatchException extends IllegalFormatException { private static final long serialVersionUID = 19120414L; + /** + * The mismatching flag. + * + * @serial the mismatching flag. + */ // Note: name fixed by serialization. private String f; + + /** + * The conversion character which doesn't match the + * appropriate flag. + * + * @serial the conversion character which doesn't match its flag. + */ // Note: name fixed by serialization. private char c; + /** + * Constructs a new <code>FormatFlagsConversionMismatchException</code> + * which specifies that the flag, <code>f</code>, does + * not match its appropriate conversion character, <code>c</code>. + * + * @param f the mismatching flag. + * @param c the conversion character which doesn't match its flag. + * @throws NullPointerException if <code>f</code> is null. + */ public FormatFlagsConversionMismatchException(String f, char c) { - super("invalid flag " + f + " for conversion " + c); + super("Invalid flag " + f + " for conversion " + c); + if (f == null) + throw new + NullPointerException("Null flag value passed to constructor."); this.f = f; this.c = c; } + /** + * Returns the conversion character which doesn't + * match the flag. + * + * @return the conversion character. + */ public char getConversion() { return c; } + /** + * Returns the mismatching flag. + * + * @return the mismatching flag. + */ public String getFlags() { return f; Index: java/util/FormatterClosedException.java =================================================================== RCS file: /cvsroot/classpath/classpath/java/util/Attic/FormatterClosedException.java,v retrieving revision 1.1.2.4 retrieving revision 1.1.2.5 diff -u -b -r1.1.2.4 -r1.1.2.5 --- java/util/FormatterClosedException.java 25 Sep 2005 02:55:13 -0000 1.1.2.4 +++ java/util/FormatterClosedException.java 4 Jun 2006 19:40:45 -0000 1.1.2.5 @@ -38,11 +38,22 @@ package java.util; -/** @since 1.5 */ -public class FormatterClosedException extends IllegalStateException +/** + * Thrown when a method is called on a [EMAIL PROTECTED] Formatter} but + * it has already been closed. + * + * @author Tom Tromey ([EMAIL PROTECTED]) + * @author Andrew John Hughes ([EMAIL PROTECTED]) + * @since 1.5 + */ +public class FormatterClosedException + extends IllegalStateException { private static final long serialVersionUID = 18111216L; + /** + * Constructs a new <code>FormatterClosedException</code>. + */ public FormatterClosedException() { } Index: java/util/IllegalFormatCodePointException.java =================================================================== RCS file: /cvsroot/classpath/classpath/java/util/Attic/IllegalFormatCodePointException.java,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -u -b -r1.1.2.3 -r1.1.2.4 --- java/util/IllegalFormatCodePointException.java 21 Sep 2005 21:32:40 -0000 1.1.2.3 +++ java/util/IllegalFormatCodePointException.java 4 Jun 2006 19:40:45 -0000 1.1.2.4 @@ -38,19 +38,46 @@ package java.util; -/** @since 1.5 */ -public class IllegalFormatCodePointException extends IllegalFormatException +/** + * Thrown when a [EMAIL PROTECTED] Formatter} receives a character with an + * invalid Unicode codepoint, as defined by + * [EMAIL PROTECTED] Character#isValidCodePoint(int)}. + * + * @author Tom Tromey ([EMAIL PROTECTED]) + * @author Andrew John Hughes ([EMAIL PROTECTED]) + * @since 1.5 + */ +public class IllegalFormatCodePointException + extends IllegalFormatException { private static final long serialVersionUID = 19080630L; + /** + * The character which is an invalid Unicode code point. + * + * @serial the invalid character. + */ // Note: name fixed by serialization. int c; + /** + * Constructs a new <code>IllegalFormatCodePointException</code> + * which specifies that the character, <code>c</code>, passed to + * a [EMAIL PROTECTED] Formatter} is an invalid Unicode code point. + * + * @param c the invalid character. + */ public IllegalFormatCodePointException(int c) { + super("An invalid Unicode code point was supplied."); this.c = c; } + /** + * Returns the invalid character. + * + * @return the invalid character. + */ public int getCodePoint() { return c; Index: java/util/IllegalFormatConversionException.java =================================================================== RCS file: /cvsroot/classpath/classpath/java/util/Attic/IllegalFormatConversionException.java,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -u -b -r1.1.2.3 -r1.1.2.4 --- java/util/IllegalFormatConversionException.java 21 Sep 2005 21:32:40 -0000 1.1.2.3 +++ java/util/IllegalFormatConversionException.java 4 Jun 2006 19:40:45 -0000 1.1.2.4 @@ -38,27 +38,71 @@ package java.util; -/** @since 1.5 */ -public class IllegalFormatConversionException extends IllegalFormatException +/** + * Thrown when the type of an argument supplied to the + * [EMAIL PROTECTED] Formatter#format()} method of a [EMAIL PROTECTED] Formatter} + * does not match the conversion character specified for it. + * + * @author Tom Tromey ([EMAIL PROTECTED]) + * @author Andrew John Hughes ([EMAIL PROTECTED]) + * @since 1.5 + */ +public class IllegalFormatConversionException + extends IllegalFormatException { private static final long serialVersionUID = 17000126L; + /** + * The conversion character which doesn't match + * the type of the argument. + * + * @serial the conversion character. + */ // Note: name fixed by serialization. char c; + + /** + * The type of the mismatching argument. + * + * @serial the mismatching argument type. + */ // Note: name fixed by serialization. Class<?> arg; + /** + * Constructs a new <code>IllegalFormatConversionException</code> + * which specifies that the argument of type <code>arg</code> does + * not match the conversion character, <code>c</code>. + * + * @param c the conversion character. + * @param arg the type which doesn't match the conversion character. + * @throws NullPointerException if <code>arg</code> is null. + */ public IllegalFormatConversionException(char c, Class<?> arg) { + super("The type, " + arg + ", is invalid for the conversion character, " + + c + "."); + if (arg == null) + throw new NullPointerException("The supplied type was null."); this.c = c; this.arg = arg; } + /** + * Returns the conversion character. + * + * @return the conversion character. + */ public char getConversion() { return c; } + /** + * Returns the type of the mismatched argument. + * + * @return the type of the mismatched argument. + */ public Class<?> getArgumentClass() { return arg; Index: java/util/IllegalFormatException.java =================================================================== RCS file: /cvsroot/classpath/classpath/java/util/Attic/IllegalFormatException.java,v retrieving revision 1.1.2.4 retrieving revision 1.1.2.5 diff -u -b -r1.1.2.4 -r1.1.2.5 --- java/util/IllegalFormatException.java 25 Sep 2005 02:55:13 -0000 1.1.2.4 +++ java/util/IllegalFormatException.java 4 Jun 2006 19:40:45 -0000 1.1.2.5 @@ -38,15 +38,36 @@ package java.util; -/** @since 1.5 */ -public class IllegalFormatException extends IllegalArgumentException +/** + * A general exception thrown when a format string is supplied + * to a [EMAIL PROTECTED] Formatter} that contains either invalid syntax + * or a mismatch between the format specification and the + * supplied arguments. This class is never instantiated; + * instead one of its subclasses is used to throw a more + * specific exception. + * + * @author Tom Tromey ([EMAIL PROTECTED]) + * @author Andrew John Hughes ([EMAIL PROTECTED]) + * @since 1.5 + */ +public class IllegalFormatException + extends IllegalArgumentException { private static final long serialVersionUID = 18830826L; + /** + * Constructs a new <code>IllegalFormatException</code>. + */ IllegalFormatException() { } + /** + * Constructs a new <code>IllegalFormatException</code> + * with the specified message. + * + * @param msg the error message for this exception. + */ IllegalFormatException(String msg) { super(msg); Index: java/util/IllegalFormatFlagsException.java =================================================================== RCS file: /cvsroot/classpath/classpath/java/util/Attic/IllegalFormatFlagsException.java,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -u -b -r1.1.2.3 -r1.1.2.4 --- java/util/IllegalFormatFlagsException.java 21 Sep 2005 21:32:40 -0000 1.1.2.3 +++ java/util/IllegalFormatFlagsException.java 4 Jun 2006 19:40:45 -0000 1.1.2.4 @@ -38,20 +38,47 @@ package java.util; -/** @since 1.5 */ -public class IllegalFormatFlagsException extends IllegalFormatException +/** + * Thrown when the flags supplied to the [EMAIL PROTECTED] Formatter#format()} + * method of a [EMAIL PROTECTED] Formatter} form an illegal combination. + * + * @author Tom Tromey ([EMAIL PROTECTED]) + * @author Andrew John Hughes ([EMAIL PROTECTED]) + * @since 1.5 + */ +public class IllegalFormatFlagsException + extends IllegalFormatException { private static final long serialVersionUID = 790824L; + /** + * The set of flags which forms an illegal combination. + * + * @serial the illegal set of flags. + */ // Note: name fixed by serialization. private String flags; + /** + * Constructs a new <code>IllegalFormatFlagsException</code> + * for the specified flags. + * + * @param flags the illegal set of flags. + * @throws NullPointerException if <code>flags</code> is null. + */ public IllegalFormatFlagsException(String flags) { - super(); + super("An illegal set of flags, " + flags + ", was supplied."); + if (flags == null) + throw new NullPointerException("The supplied flags are null."); this.flags = flags; } + /** + * Returns the illegal flags. + * + * @return the illegal flags. + */ public String getFlags() { return flags; Index: java/util/IllegalFormatPrecisionException.java =================================================================== RCS file: /cvsroot/classpath/classpath/java/util/Attic/IllegalFormatPrecisionException.java,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -u -b -r1.1.2.3 -r1.1.2.4 --- java/util/IllegalFormatPrecisionException.java 21 Sep 2005 21:32:40 -0000 1.1.2.3 +++ java/util/IllegalFormatPrecisionException.java 4 Jun 2006 19:40:45 -0000 1.1.2.4 @@ -38,20 +38,46 @@ package java.util; -/** @since 1.5 */ -public class IllegalFormatPrecisionException extends IllegalFormatException +/** + * Thrown when the specified precision for a [EMAIL PROTECTED] Formatter} + * argument is illegal. This may be because the number is + * a negative number (other than -1), the argument does not + * accept a precision or for some other reason. + * + * @author Tom Tromey ([EMAIL PROTECTED]) + * @author Andrew John Hughes ([EMAIL PROTECTED]) + * @since 1.5 + */ +public class IllegalFormatPrecisionException + extends IllegalFormatException { private static final long serialVersionUID = 18711008L; + /** + * The illegal precision value. + * + * @serial the illegal precision. + */ // Note: name fixed by serialization. private int p; + /** + * Constructs a new <code>IllegalFormatPrecisionException</code> + * for the precision, <code>p</code>. + * + * @param p the illegal precision. + */ public IllegalFormatPrecisionException(int p) { - super(); + super("The precision, " + p + ", is illegal."); this.p = p; } + /** + * Returns the illegal precision. + * + * @return the illegal precision. + */ public int getPrecision() { return p; Index: java/util/IllegalFormatWidthException.java =================================================================== RCS file: /cvsroot/classpath/classpath/java/util/Attic/IllegalFormatWidthException.java,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -u -b -r1.1.2.3 -r1.1.2.4 --- java/util/IllegalFormatWidthException.java 21 Sep 2005 21:32:40 -0000 1.1.2.3 +++ java/util/IllegalFormatWidthException.java 4 Jun 2006 19:40:45 -0000 1.1.2.4 @@ -38,20 +38,45 @@ package java.util; -/** @since 1.5 */ -public class IllegalFormatWidthException extends IllegalFormatException +/** + * Thrown when the specified width for a [EMAIL PROTECTED] Formatter} + * argument is illegal. This may be because the number is + * a negative number (other than -1) or for some other reason. + * + * @author Tom Tromey ([EMAIL PROTECTED]) + * @author Andrew John Hughes ([EMAIL PROTECTED]) + * @since 1.5 + */ +public class IllegalFormatWidthException + extends IllegalFormatException { private static final long serialVersionUID = 16660902L; + /** + * The illegal width value. + * + * @serial the illegal width. + */ // Note: name fixed by serialization. private int w; + /** + * Constructs a new <code>IllegalFormatWidthException</code> + * with the specified width, <code>w</code>. + * + * @param w the illegal width. + */ public IllegalFormatWidthException(int w) { - super(); + super("The width, " + w + ", is illegal."); this.w = w; } + /** + * Returns the illegal width. + * + * @return the illegal width. + */ public int getWidth() { return w; Index: java/util/MissingFormatArgumentException.java =================================================================== RCS file: /cvsroot/classpath/classpath/java/util/Attic/MissingFormatArgumentException.java,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -u -b -r1.1.2.3 -r1.1.2.4 --- java/util/MissingFormatArgumentException.java 21 Sep 2005 21:32:40 -0000 1.1.2.3 +++ java/util/MissingFormatArgumentException.java 4 Jun 2006 19:40:45 -0000 1.1.2.4 @@ -38,19 +38,51 @@ package java.util; -/** @since 1.5 */ -public class MissingFormatArgumentException extends IllegalFormatException +/** + * Thrown when the a format specification for a [EMAIL PROTECTED] Formatter} + * refers to an argument that is non-existent, or an argument index + * references a non-existent argument. + * + * @author Tom Tromey ([EMAIL PROTECTED]) + * @author Andrew John Hughes ([EMAIL PROTECTED]) + * @since 1.5 + */ +public class MissingFormatArgumentException + extends IllegalFormatException { private static final long serialVersionUID = 19190115L; + /** + * The format specification which contains the + * unmatched argument. + * + * @serial the format specification. + */ // Note: name fixed by serialization. private String s; + /** + * Constructs a new <code>MissingFormatArgumentException</code> + * for a format specification, <code>s</code>, which refers + * to a non-existent argument. + * + * @param s the format specification. + * @throws NullPointerException if <code>s</code> is null. + */ public MissingFormatArgumentException(String s) { + super("The specification, " + s + + ", refers to a non-existent argument."); + if (s == null) + throw new NullPointerException("The specification is null."); this.s = s; } + /** + * Returns the format specification. + * + * @return the format specification. + */ public String getFormatSpecifier() { return s; Index: java/util/MissingFormatWidthException.java =================================================================== RCS file: /cvsroot/classpath/classpath/java/util/Attic/MissingFormatWidthException.java,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -u -b -r1.1.2.3 -r1.1.2.4 --- java/util/MissingFormatWidthException.java 21 Sep 2005 21:32:40 -0000 1.1.2.3 +++ java/util/MissingFormatWidthException.java 4 Jun 2006 19:40:45 -0000 1.1.2.4 @@ -38,19 +38,49 @@ package java.util; -/** @since 1.5 */ -public class MissingFormatWidthException extends IllegalFormatException +/** + * Thrown when the a format specification for a [EMAIL PROTECTED] Formatter} + * does not include a width for a value where one is required. + * + * @author Tom Tromey ([EMAIL PROTECTED]) + * @author Andrew John Hughes ([EMAIL PROTECTED]) + * @since 1.5 + */ +public class MissingFormatWidthException + extends IllegalFormatException { private static final long serialVersionUID = 15560123L; + /** + * The format specification which contains the + * unmatched argument. + * + * @serial the format specification. + */ // Note: name fixed by serialization. private String s; + /** + * Constructs a new <code>MissingFormatWidthException</code> + * for a format specification, <code>s</code>, which excludes + * a required width argument. + * + * @param s the format specification. + * @throws NullPointerException if <code>s</code> is null. + */ public MissingFormatWidthException(String s) { + super("The specification, " + s + ", misses a required width."); + if (s == null) + throw new NullPointerException("The specification is null."); this.s = s; } + /** + * Returns the format specification. + * + * @return the format specification. + */ public String getFormatSpecifier() { return s; Index: java/util/UnknownFormatConversionException.java =================================================================== RCS file: /cvsroot/classpath/classpath/java/util/Attic/UnknownFormatConversionException.java,v retrieving revision 1.1.2.4 retrieving revision 1.1.2.5 diff -u -b -r1.1.2.4 -r1.1.2.5 --- java/util/UnknownFormatConversionException.java 25 Sep 2005 02:55:13 -0000 1.1.2.4 +++ java/util/UnknownFormatConversionException.java 4 Jun 2006 19:40:45 -0000 1.1.2.5 @@ -38,20 +38,47 @@ package java.util; -/** @since 1.5 */ -public class UnknownFormatConversionException extends IllegalFormatException +/** + * Thrown when a [EMAIL PROTECTED] Formatter} is supplied with an + * unknown conversion. + * + * @author Tom Tromey ([EMAIL PROTECTED]) + * @author Andrew John Hughes ([EMAIL PROTECTED]) + * @since 1.5 + */ +public class UnknownFormatConversionException + extends IllegalFormatException { private static final long serialVersionUID = 19060418L; + /** + * The unknown conversion. + * + * @serial the unknown conversion. + */ // Note: name fixed by serialization. private String s; + /** + * Constructs a new <code>UnknownFormatConversionException</code> + * for the specified conversion string. + * + * @param s the conversion string. + * @throws NullPointerException if the conversion string is null. + */ public UnknownFormatConversionException(String s) { - super("unknown format conversion: " + s); + super("Unknown format conversion: " + s); + if (s == null) + throw new NullPointerException("The conversion string is null."); this.s = s; } + /** + * Returns the conversion string. + * + * @return the conversion string. + */ public String getConversion() { return s; Index: java/util/UnknownFormatFlagsException.java =================================================================== RCS file: /cvsroot/classpath/classpath/java/util/Attic/UnknownFormatFlagsException.java,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -u -b -r1.1.2.3 -r1.1.2.4 --- java/util/UnknownFormatFlagsException.java 21 Sep 2005 21:32:40 -0000 1.1.2.3 +++ java/util/UnknownFormatFlagsException.java 4 Jun 2006 19:40:45 -0000 1.1.2.4 @@ -38,19 +38,49 @@ package java.util; -/** @since 1.5 */ -public class UnknownFormatFlagsException extends IllegalFormatException +/** + * Thrown when a [EMAIL PROTECTED] Formatter} is supplied with an + * unknown flag. + * + * @author Tom Tromey ([EMAIL PROTECTED]) + * @author Andrew John Hughes ([EMAIL PROTECTED]) + * @since 1.5 + */ +public class UnknownFormatFlagsException + extends IllegalFormatException { private static final long serialVersionUID = 19370506L; + /** + * The set of flags containing the unknown flag. + * + * @serial the unknown conversion. + */ // Note: name fixed by serialization. private String flags; + /** + * Constructs a new <code>UnknownFormatFlagsException</code> + * which specifies that the supplied set of flags contains a + * unknown. + * + * @param flags the flags containing a unknown. + * @throws NullPointerException if <code>flags</code> is null. + */ public UnknownFormatFlagsException(String s) { + super("Unknown flag passed in " + s); + if (s == null) + throw new + NullPointerException("Null flags value passed to constructor."); this.flags = s; } + /** + * Returns the flags which contain a unknown. + * + * @return the flags. + */ public String getFlags() { return flags;