summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew John Hughes <gnu_andrew@member.fsf.org>2006-03-27 21:49:03 +0000
committerAndrew John Hughes <gnu_andrew@member.fsf.org>2006-03-27 21:49:03 +0000
commitff0b1e662a68d26250e8b17785782123fde6da61 (patch)
treedbd25c62c4c93a20403730bbaf655e88364bbac4
parent26bfeabb500f2be87b5ed4d9e252b1143dd0cc23 (diff)
downloadclasspath-ff0b1e662a68d26250e8b17785782123fde6da61.tar.gz
2006-03-27 Andrew John Hughes <gnu_andrew@member.fsf.org>
* java/math/RoundingMode.java: Fixed serialization UID. * java/net/Proxy.java: (Type): Likewise.
-rw-r--r--ChangeLog7
-rw-r--r--java/math/RoundingMode.java5
-rw-r--r--java/net/Proxy.java10
3 files changed, 21 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index f284214d3..0ba59e9c3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
2006-03-27 Andrew John Hughes <gnu_andrew@member.fsf.org>
+ * java/math/RoundingMode.java:
+ Fixed serialization UID.
+ * java/net/Proxy.java:
+ (Type): Likewise.
+
+2006-03-27 Andrew John Hughes <gnu_andrew@member.fsf.org>
+
* java/io/CharArrayWriter.java:
(append(char)): Documented.
(append(CharSequence)): Likewise.
diff --git a/java/math/RoundingMode.java b/java/math/RoundingMode.java
index 263fafd88..c85bf4ff5 100644
--- a/java/math/RoundingMode.java
+++ b/java/math/RoundingMode.java
@@ -47,6 +47,11 @@ package java.math;
public enum RoundingMode
{
UP, DOWN, CEILING, FLOOR, HALF_UP, HALF_DOWN, HALF_EVEN, UNNECESSARY;
+
+ /**
+ * For compatability with Sun's JDK
+ */
+ private static final long serialVersionUID = 432302042773881265L;
/**
* Returns the RoundingMode object corresponding to the legacy rounding modes
diff --git a/java/net/Proxy.java b/java/net/Proxy.java
index 0d5a17037..4fef7d815 100644
--- a/java/net/Proxy.java
+++ b/java/net/Proxy.java
@@ -49,7 +49,15 @@ public class Proxy
/**
* Represents the proxy type.
*/
- public enum Type { DIRECT, HTTP, SOCKS };
+ public enum Type
+ {
+ DIRECT, HTTP, SOCKS
+
+ /**
+ * For compatability with Sun's JDK
+ */
+ private static final long serialVersionUID = -2231209257930100533L;
+ };
public static final Proxy NO_PROXY = new Proxy(Type.DIRECT, null);