diff options
| author | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 2002-11-10 22:06:49 +0000 |
|---|---|---|
| committer | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 2002-11-10 22:06:49 +0000 |
| commit | 467446aefa92bc79cb02e2bf8f313fcda742805d (patch) | |
| tree | b99c34071ce1e42a9742123fef03b7f802acd754 /libjava/java/io | |
| parent | 3ddd3d5d534607388e0e0478b9969eadd71ab8ec (diff) | |
| download | ppe42-gcc-467446aefa92bc79cb02e2bf8f313fcda742805d.tar.gz ppe42-gcc-467446aefa92bc79cb02e2bf8f313fcda742805d.zip | |
* java/io/Externalizable.java, java/io/FilePermission.java,
java/io/ObjectStreamConstants.java, java/io/Serializable.java,
java/io/SerializablePermission.java, java/text/Format.java,
java/util/AbstractMap.java, java/util/HashMap.java,
java/util/LinkedHashMap.java, javax/naming/BinaryRefAddr.java: New
versions from Classpath.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@58996 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/java/io')
| -rw-r--r-- | libjava/java/io/Externalizable.java | 1 | ||||
| -rw-r--r-- | libjava/java/io/FilePermission.java | 5 | ||||
| -rw-r--r-- | libjava/java/io/ObjectStreamConstants.java | 2 | ||||
| -rw-r--r-- | libjava/java/io/Serializable.java | 1 | ||||
| -rw-r--r-- | libjava/java/io/SerializablePermission.java | 3 |
5 files changed, 9 insertions, 3 deletions
diff --git a/libjava/java/io/Externalizable.java b/libjava/java/io/Externalizable.java index 4e3b1cabca3..83f1b653ec5 100644 --- a/libjava/java/io/Externalizable.java +++ b/libjava/java/io/Externalizable.java @@ -62,6 +62,7 @@ package java.io; */ public interface Externalizable extends Serializable { + static final long serialVersionUID = -282491828744381764L; /** * This method restores an object's state by reading in the instance data diff --git a/libjava/java/io/FilePermission.java b/libjava/java/io/FilePermission.java index a8cd3d44a4a..0fc06c91473 100644 --- a/libjava/java/io/FilePermission.java +++ b/libjava/java/io/FilePermission.java @@ -41,7 +41,10 @@ package java.io; import java.security.*; -public final class FilePermission extends Permission implements Serializable { +public final class FilePermission extends Permission implements Serializable +{ + static final long serialVersionUID = 7930732926638008763L; + private static final String CURRENT_DIRECTORY = System.getProperty("user.dir"); private boolean usingPerms = false; private boolean readPerm = false; diff --git a/libjava/java/io/ObjectStreamConstants.java b/libjava/java/io/ObjectStreamConstants.java index 111a0f3fa26..980b04de264 100644 --- a/libjava/java/io/ObjectStreamConstants.java +++ b/libjava/java/io/ObjectStreamConstants.java @@ -70,7 +70,7 @@ public interface ObjectStreamConstants final static byte TC_PROXYCLASSDESC = (byte)125; //0x7D final static byte TC_BASE = TC_NULL; - final static byte TC_MAX = TC_EXCEPTION; + final static byte TC_MAX = TC_PROXYCLASSDESC; final static int baseWireHandle = 0x7e0000; diff --git a/libjava/java/io/Serializable.java b/libjava/java/io/Serializable.java index 2afdff4669b..0d6310ce340 100644 --- a/libjava/java/io/Serializable.java +++ b/libjava/java/io/Serializable.java @@ -51,4 +51,5 @@ package java.io; */ public interface Serializable { + static final long serialVersionUID = 1196656838076753133L; } // interface Serializable diff --git a/libjava/java/io/SerializablePermission.java b/libjava/java/io/SerializablePermission.java index 12c2d762281..d9dc3dd924a 100644 --- a/libjava/java/io/SerializablePermission.java +++ b/libjava/java/io/SerializablePermission.java @@ -61,7 +61,8 @@ import java.security.BasicPermission; */ public final class SerializablePermission extends BasicPermission { - + static final long serialVersionUID = 8537212141160296410L; + /* * Class Variables */ |
