This is the mail archive of the
java-patches@gcc.gnu.org
mailing list for the Java project.
[patch] Update some classes to newest Classpath version.
- From: Nathanael Nerode <neroden at doctormoo dot dyndns dot org>
- To: java-patches at gcc dot gnu dot org
- Date: Fri, 14 Jun 2002 12:13:47 -0400
- Subject: [patch] Update some classes to newest Classpath version.
Trivial Classpath merger change. java.text.ChoiceFormat and
java.text.ParseException will now be identical to current Classpath.
The changes are mostly content free, except for the addition of the
serialVersionUID field.
2002-06-14 Nathanael Nerode <neroden@twcny.rr.com>
* 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.
Index: ChoiceFormat.java
===================================================================
RCS file: /cvsroot/gcc/gcc/libjava/java/text/ChoiceFormat.java,v
retrieving revision 1.9
diff -c -3 -p -r1.9 ChoiceFormat.java
*** ChoiceFormat.java 22 Jan 2002 22:40:37 -0000 1.9
--- ChoiceFormat.java 14 Jun 2002 16:07:47 -0000
*************** import java.util.Vector;
*** 52,61 ****
* This sounds complicated, but that is because I did a poor job of
* explaining it. Consider the following example:
* <p>
! * <pre>
! * terminators = { 1, ChoiceFormat.nextDouble(1) }
! * formats = { "file", "files" }
! * </pre>
* <p>
* 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
--- 52,61 ----
* This sounds complicated, but that is because I did a poor job of
* explaining it. Consider the following example:
* <p>
! *
! <pre>terminators = { 1, ChoiceFormat.nextDouble(1) }
! formats = { "file", "files" }</pre>
! *
* <p>
* 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
Index: ParseException.java
===================================================================
RCS file: /cvsroot/gcc/gcc/libjava/java/text/ParseException.java,v
retrieving revision 1.5
diff -c -3 -p -r1.5 ParseException.java
*** ParseException.java 22 Jan 2002 22:40:37 -0000 1.5
--- ParseException.java 14 Jun 2002 16:07:48 -0000
***************
*** 1,5 ****
! /* ParseException.java -- An error occurred while parsing.
! Copyright (C) 1998, 1999, 2001 Free Software Foundation, Inc.
This file is part of GNU Classpath.
--- 1,5 ----
! /* ParseException.java -- an error occurred while parsing
! Copyright (C) 1998, 1999, 2001, 2002 Free Software Foundation, Inc.
This file is part of GNU Classpath.
*************** GNU Classpath is free software; you can
*** 7,13 ****
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
--- 7,13 ----
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
*************** exception statement from your version. *
*** 38,102 ****
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 <bothner@cygnus.com>
- * @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 method initializes a new instance of <code>ParseException</code>
! * 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
-
--- 38,86 ----
package java.text;
/**
! * This exception is thrown when an unexpected error occurs during parsing.
! *
! * @author Aaron M. Renn (arenn@urbanophile.com)
! * @author Per Bothner <bothner@cygnus.com>
! * @see Format
! * @see FieldPosition
! * @status updated to 1.4
*/
! public class ParseException extends Exception
{
! /**
! * 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 <code>ParseException</code>
! * 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