From bc6ccd33161419ac05ed369d874a9d697805bcaa Mon Sep 17 00:00:00 2001 From: Warren Levy Date: Fri, 8 Sep 2000 19:37:09 +0000 Subject: PropertyChangeEvent.java (serialVersionUID): Added. * 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 --- libjava/java/lang/Boolean.java | 4 +++- libjava/java/lang/Byte.java | 4 +++- libjava/java/lang/Character.java | 3 ++- libjava/java/lang/Double.java | 2 ++ libjava/java/lang/Float.java | 4 +++- libjava/java/lang/Integer.java | 4 +++- libjava/java/lang/Long.java | 4 +++- libjava/java/lang/Number.java | 4 +++- libjava/java/lang/Short.java | 4 +++- libjava/java/lang/String.java | 4 ++++ libjava/java/lang/ThreadDeath.java | 7 +------ libjava/java/lang/reflect/InvocationTargetException.java | 4 +++- 12 files changed, 33 insertions(+), 15 deletions(-) (limited to 'libjava/java/lang') diff --git a/libjava/java/lang/Boolean.java b/libjava/java/lang/Boolean.java index 041f725..027fd24 100644 --- a/libjava/java/lang/Boolean.java +++ b/libjava/java/lang/Boolean.java @@ -1,4 +1,4 @@ -/* Copyright (C) 1998, 1999 Free Software Foundation +/* Copyright (C) 1998, 1999, 2000 Free Software Foundation This file is part of libgcj. @@ -32,6 +32,8 @@ public final class Boolean extends Object implements Serializable /* The boolean value of the instance. */ private boolean value; + private static final long serialVersionUID = -3665804199014368530L; + public Boolean(boolean boolVal) { value = boolVal; diff --git a/libjava/java/lang/Byte.java b/libjava/java/lang/Byte.java index 95db094..78f34aa 100644 --- a/libjava/java/lang/Byte.java +++ b/libjava/java/lang/Byte.java @@ -1,4 +1,4 @@ -/* Copyright (C) 1998, 1999 Free Software Foundation +/* Copyright (C) 1998, 1999, 2000 Free Software Foundation This file is part of libgcj. @@ -29,6 +29,8 @@ public final class Byte extends Number implements Comparable // by javac, and is handled specially by gcc. public static final Class TYPE = byte.class; + private static final long serialVersionUID = -7183698231559129828L; + public Byte(byte value) { this.value = value; diff --git a/libjava/java/lang/Character.java b/libjava/java/lang/Character.java index 4306afb..2695b04 100644 --- a/libjava/java/lang/Character.java +++ b/libjava/java/lang/Character.java @@ -1,6 +1,6 @@ // Character.java - Character class. -/* Copyright (C) 1998, 1999 Free Software Foundation +/* Copyright (C) 1998, 1999, 2000 Free Software Foundation This file is part of libgcj. @@ -83,6 +83,7 @@ public final class Character implements Serializable, Comparable public static final byte PRIVATE_USE = 18; public static final byte SURROGATE = 19; + private static final long serialVersionUID = 3786198910865385080L; public Character (char ch) { diff --git a/libjava/java/lang/Double.java b/libjava/java/lang/Double.java index cb8fd95..10e9093 100644 --- a/libjava/java/lang/Double.java +++ b/libjava/java/lang/Double.java @@ -32,6 +32,8 @@ public final class Double extends Number private double value; + private static final long serialVersionUID = -9172774392245257468L; + public native static double parseDouble (String s) throws NumberFormatException; diff --git a/libjava/java/lang/Float.java b/libjava/java/lang/Float.java index 63c6fa1..b5939de 100644 --- a/libjava/java/lang/Float.java +++ b/libjava/java/lang/Float.java @@ -1,4 +1,4 @@ -/* Copyright (C) 1998, 1999 Free Software Foundation +/* Copyright (C) 1998, 1999, 2000 Free Software Foundation This file is part of libgcj. @@ -32,6 +32,8 @@ public final class Float extends Number private float value; + private static final long serialVersionUID = -2671257302660747028L; + public Float (float value) { this.value = value; diff --git a/libjava/java/lang/Integer.java b/libjava/java/lang/Integer.java index feb7785..163c850 100644 --- a/libjava/java/lang/Integer.java +++ b/libjava/java/lang/Integer.java @@ -1,4 +1,4 @@ -/* Copyright (C) 1998, 1999 Free Software Foundation +/* Copyright (C) 1998, 1999, 2000 Free Software Foundation This file is part of libgcj. @@ -30,6 +30,8 @@ public final class Integer extends Number implements Comparable /* The int value of the instance. */ private int value; + private static final long serialVersionUID = 1360826667806852920L; + public Integer(int val) { value = val; diff --git a/libjava/java/lang/Long.java b/libjava/java/lang/Long.java index 95f426d..e6872db 100644 --- a/libjava/java/lang/Long.java +++ b/libjava/java/lang/Long.java @@ -1,4 +1,4 @@ -/* Copyright (C) 1998, 1999 Free Software Foundation +/* Copyright (C) 1998, 1999, 2000 Free Software Foundation This file is part of libgcj. @@ -30,6 +30,8 @@ public final class Long extends Number implements Comparable /* The long value of the instance. */ private long value; + private static final long serialVersionUID = 4290774380558885855L; + public Long(long val) { value = val; diff --git a/libjava/java/lang/Number.java b/libjava/java/lang/Number.java index 9fa0566..92d98af 100644 --- a/libjava/java/lang/Number.java +++ b/libjava/java/lang/Number.java @@ -1,4 +1,4 @@ -/* Copyright (C) 1998, 1999 Free Software Foundation +/* Copyright (C) 1998, 1999, 2000 Free Software Foundation This file is part of libgcj. @@ -36,4 +36,6 @@ public abstract class Number implements Serializable { return (short) intValue(); } + + private static final long serialVersionUID = -8742448824652078965L; } diff --git a/libjava/java/lang/Short.java b/libjava/java/lang/Short.java index a8bd965..6733607 100644 --- a/libjava/java/lang/Short.java +++ b/libjava/java/lang/Short.java @@ -1,4 +1,4 @@ -/* Copyright (C) 1998, 1999 Free Software Foundation +/* Copyright (C) 1998, 1999, 2000 Free Software Foundation This file is part of libgcj. @@ -29,6 +29,8 @@ public final class Short extends Number implements Comparable // 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; diff --git a/libjava/java/lang/String.java b/libjava/java/lang/String.java index 12f8789..9937374 100644 --- a/libjava/java/lang/String.java +++ b/libjava/java/lang/String.java @@ -26,6 +26,10 @@ public final class String implements Serializable, Comparable private int boffset; // Note this is a byte offset - don't use in Java code! private int count; + // This is probably not necessary because this class is special cased already + // but it will avoid showing up as a discrepancy when comparing SUIDs. + private static final long serialVersionUID = -6849794470754667710L; + public String () { init(); diff --git a/libjava/java/lang/ThreadDeath.java b/libjava/java/lang/ThreadDeath.java index d02c2fc..ae0e3fb 100644 --- a/libjava/java/lang/ThreadDeath.java +++ b/libjava/java/lang/ThreadDeath.java @@ -1,6 +1,6 @@ // ThreadDeath.java - Special exception registering Thread death. -/* Copyright (C) 1998, 1999 Free Software Foundation +/* Copyright (C) 1998, 1999, 2000 Free Software Foundation This file is part of libgcj. @@ -27,9 +27,4 @@ public class ThreadDeath extends Error { super (); } - - public ThreadDeath (String message) - { - super (message); - } } diff --git a/libjava/java/lang/reflect/InvocationTargetException.java b/libjava/java/lang/reflect/InvocationTargetException.java index 3d59506..0152a7b 100644 --- a/libjava/java/lang/reflect/InvocationTargetException.java +++ b/libjava/java/lang/reflect/InvocationTargetException.java @@ -1,6 +1,6 @@ // InvocationTargetException.java - Wrapper exception for reflection. -/* Copyright (C) 1998, 1999 Free Software Foundation +/* Copyright (C) 1998, 1999, 2000 Free Software Foundation This file is part of libgcj. @@ -70,4 +70,6 @@ public class InvocationTargetException extends Exception // The wrapped exception. The name is specified by the // serialization spec. private Throwable target; + + private static final long serialVersionUID = 4085088731926701167L; } -- cgit v1.1