From 945dabcd7ac1a6b7aedb28b8e192aec12c601a85 Mon Sep 17 00:00:00 2001 From: Nathanael Nerode Date: Sat, 15 Jun 2002 18:38:00 +0000 Subject: [PATCH] ChoiceFormat.java: Update comments from Classpath. 2002-06-15 Nathanael Nerode * java/text/ChoiceFormat.java: Update comments from Classpath. * java/text/ParseException.java (serialVersionUID): New field from Classpath. * java/text/ParseException.java: Update formatting & comments from Classpath. From-SVN: r54654 --- libjava/ChangeLog | 8 ++ libjava/java/text/ChoiceFormat.java | 8 +- libjava/java/text/ParseException.java | 106 +++++++++++--------------- 3 files changed, 57 insertions(+), 65 deletions(-) diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 32955b51243..f3268e65f4b 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,11 @@ +2002-06-15 Nathanael Nerode + + * java/text/ChoiceFormat.java: Update comments from Classpath. + * java/text/ParseException.java (serialVersionUID): New + field from Classpath. + * java/text/ParseException.java: Update formatting & comments + from Classpath. + 2002-06-15 Tom Tromey * java/util/zip/InflaterInputStream.java (read): Loop if data has diff --git a/libjava/java/text/ChoiceFormat.java b/libjava/java/text/ChoiceFormat.java index 4bb123f3f28..710a725990e 100644 --- a/libjava/java/text/ChoiceFormat.java +++ b/libjava/java/text/ChoiceFormat.java @@ -52,10 +52,10 @@ import java.util.Vector; * This sounds complicated, but that is because I did a poor job of * explaining it. Consider the following example: *

- * 

- * terminators = { 1, ChoiceFormat.nextDouble(1) }
- * formats = { "file", "files" }
- *
+ * +
terminators = { 1, ChoiceFormat.nextDouble(1) }
+formats = { "file", "files" }
+ * *

* In this case if the actual number tested is one or less, then the word * "file" is used as the format value. If the number tested is greater than diff --git a/libjava/java/text/ParseException.java b/libjava/java/text/ParseException.java index 0bbc3d21cd9..20e828e18a7 100644 --- a/libjava/java/text/ParseException.java +++ b/libjava/java/text/ParseException.java @@ -1,5 +1,5 @@ -/* ParseException.java -- An error occurred while parsing. - Copyright (C) 1998, 1999, 2001 Free Software Foundation, Inc. +/* ParseException.java -- an error occurred while parsing + Copyright (C) 1998, 1999, 2001, 2002 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -38,65 +38,49 @@ exception statement from your version. */ package java.text; -/* Written using "Java Class Libraries", 2nd edition, plus online - * API docs for JDK 1.2 beta from http://www.javasoft.com. - * Status: Believed complete and correct. - */ - -/** - * This exception is thrown when an unexpected error occurs during parsing. - * - * @version 0.0 - * - * @author Aaron M. Renn (arenn@urbanophile.com) - * @author Per Bothner - * @date October 25, 1998. - */ -public class ParseException extends Exception -{ - -/* - * Instance Variables - */ - /** - * This is the position where the error was encountered. - */ -private int errorOffset; - -/*************************************************************************/ - -/* - * Constructors + * This exception is thrown when an unexpected error occurs during parsing. + * + * @author Aaron M. Renn (arenn@urbanophile.com) + * @author Per Bothner + * @see Format + * @see FieldPosition + * @status updated to 1.4 */ - -/** - * This method initializes a new instance of ParseException - * with a detailed error message and a error position. - * - * @param msg The descriptive message describing the error. - * @param offset The position where the error was encountered. - */ -public -ParseException(String s, int offset) -{ - super(s); - - errorOffset = offset; -} - -/*************************************************************************/ - -/** - * This method returns the position where the error occurred. - * - * @return The position where the error occurred. - */ -public int -getErrorOffset() +public class ParseException extends Exception { - return(errorOffset); -} - + /** + * Compatible with JDK 1.1+. + */ + private static final long serialVersionUID = 2703218443322787634L; + + /** + * This is the position where the error was encountered. + * + * @serial the zero-based offset in the string where the error occurred + */ + private final int errorOffset; + + /** + * This method initializes a new instance of ParseException + * with a detailed error message and a error position. + * + * @param msg the descriptive message describing the error + * @param offset the position where the error was encountered + */ + public ParseException(String s, int offset) + { + super(s); + errorOffset = offset; + } + + /** + * This method returns the position where the error occurred. + * + * @return the position where the error occurred + */ + public int getErrorOffset() + { + return errorOffset; + } } // class ParseException - -- 2.30.2