mirror of
git://gcc.gnu.org/git/gcc.git
synced 2024-12-22 22:40:25 +08:00
bc6ccd3316
* java/beans/PropertyChangeEvent.java (serialVersionUID): Added. * java/beans/PropertyVetoException.java (serialVersionUID): Added. * java/io/File.java (writeObject): Added. (readObject): Added. (serialVersionUID): Added. * java/io/ObjectOutputStream.java (writeObject): Initialized fieldsAlreadyWritten before recursion rather than after. * java/io/ObjectStreamClass.java (serialVersionUID): Added. * java/io/OptionalDataException.java (serialVersionUID): Added. (OptionalDataException): Made package private. * java/io/SyncFailedException.java (SyncFailedException): Removed default constructor to match spec. * java/lang/Boolean.java (serialVersionUID): Added. * java/lang/Byte.java (serialVersionUID): Added. * java/lang/Character.java (serialVersionUID): Added. * java/lang/Double.java (serialVersionUID): Added. * java/lang/Float.java (serialVersionUID): Added. * java/lang/Integer.java (serialVersionUID): Added. * java/lang/Long.java (serialVersionUID): Added. * java/lang/Number.java (serialVersionUID): Added. * java/lang/Short.java (serialVersionUID): Added. * java/lang/String.java (serialVersionUID): Added. * java/lang/ThreadDeath.java (ThreadDeath): Removed constructor to match spec. * java/lang/reflect/InvocationTargetException.java (serialVersionUID): Added. * java/net/URL.java (handler): Made transient. (hashCode): Added field for serialization, per spec. and use cached value if available. (serialVersionUID): Added. (URL): Initialize hashCode. (set): Adjust hashCode. (readObject): New Method to initialize the protocol handler when deserializing. (writeObject): New method. * java/text/BreakIterator.java: Removed 'implements Serializable'. * java/text/Collator.java: Removed 'implements Serializable'. * java/util/GregorianCalendar.java (serialVersionUID): Added. * java/util/Properties.java (serialVersionUID): Added. * java/util/Random.java (serialVersionUID): Added. (seed): Made private. (nextNextGaussian): Made private. (haveNextNextGaussian): Made private. * java/util/Stack.java (serialVersionUID): Added. * java/util/TimeZone.java (serialVersionUID): Added. * java/util/Vector.java (serialVersionUID): Added. Serialization mods. From-SVN: r36272
148 lines
3.0 KiB
Java
148 lines
3.0 KiB
Java
/* Copyright (C) 1998, 1999, 2000 Free Software Foundation
|
|
|
|
This file is part of libgcj.
|
|
|
|
This software is copyrighted work licensed under the terms of the
|
|
Libgcj License. Please consult the file "LIBGCJ_LICENSE" for
|
|
details. */
|
|
|
|
package java.lang;
|
|
|
|
/**
|
|
* @author Per Bothner <bothner@cygnus.com>
|
|
* @date April 17, 1998.
|
|
*/
|
|
/* 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.
|
|
* Includes JDK 1.2 methods.
|
|
*/
|
|
|
|
public final class Short extends Number implements Comparable
|
|
{
|
|
short value;
|
|
|
|
public final static short MIN_VALUE = -32768;
|
|
public final static short MAX_VALUE = 32767;
|
|
|
|
// This initialization is seemingly circular, but it is accepted
|
|
// by javac, and is handled specially by gcc.
|
|
public static final Class TYPE = short.class;
|
|
|
|
private static final long serialVersionUID = 7515723908773894738L;
|
|
|
|
public Short(short value)
|
|
{
|
|
this.value = value;
|
|
}
|
|
|
|
public Short(String str)
|
|
throws NumberFormatException
|
|
{
|
|
this.value = parseShort(str, 10);
|
|
}
|
|
|
|
public byte byteValue()
|
|
{
|
|
return (byte) value;
|
|
}
|
|
|
|
public short shortValue()
|
|
{
|
|
return value;
|
|
}
|
|
|
|
public int intValue()
|
|
{
|
|
return value;
|
|
}
|
|
|
|
public long longValue ()
|
|
{
|
|
return value;
|
|
}
|
|
|
|
public float floatValue ()
|
|
{
|
|
return (float) value;
|
|
}
|
|
|
|
public double doubleValue ()
|
|
{
|
|
return (double) value;
|
|
}
|
|
|
|
public static Short decode(String str)
|
|
throws NumberFormatException
|
|
{
|
|
int i = (Integer.decode(str)).intValue();
|
|
if (i < MIN_VALUE || i > MAX_VALUE)
|
|
throw new NumberFormatException();
|
|
return new Short((short) i);
|
|
}
|
|
|
|
public static short parseShort(String str, int radix)
|
|
throws NumberFormatException
|
|
{
|
|
int i = Integer.parseInt(str, radix);
|
|
if (i < MIN_VALUE || i > MAX_VALUE)
|
|
throw new NumberFormatException();
|
|
return (short) i;
|
|
}
|
|
|
|
public static short parseShort(String str)
|
|
throws NumberFormatException
|
|
{
|
|
return parseShort(str, 10);
|
|
}
|
|
|
|
public static Short valueOf(String str, int radix)
|
|
throws NumberFormatException
|
|
{
|
|
return new Short(parseShort(str, radix));
|
|
}
|
|
|
|
public static Short valueOf(String str)
|
|
throws NumberFormatException
|
|
{
|
|
return valueOf(str, 10);
|
|
}
|
|
|
|
// Added in JDK 1.2
|
|
public int compareTo(Short anotherShort)
|
|
{
|
|
return this.value - anotherShort.value;
|
|
}
|
|
|
|
// Added in JDK 1.2
|
|
public int compareTo(Object o) throws ClassCastException
|
|
{
|
|
if (o instanceof Short)
|
|
return this.value - ((Short) o).value;
|
|
else
|
|
throw new ClassCastException();
|
|
}
|
|
|
|
public boolean equals(Object obj)
|
|
{
|
|
return (obj != null && (obj instanceof Short)
|
|
&& ((Short) obj).value == value);
|
|
}
|
|
|
|
// Verified that hashCode is returns plain value (see Short_1 test).
|
|
public int hashCode()
|
|
{
|
|
return value;
|
|
}
|
|
|
|
public String toString()
|
|
{
|
|
return Integer.toString((int) value);
|
|
}
|
|
|
|
public static String toString(short value)
|
|
{
|
|
return Integer.toString((int) value);
|
|
}
|
|
}
|