aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Koch <konqueror@gmx.de>2003-12-04 19:31:01 +0000
committerMichael Koch <mkoch@gcc.gnu.org>2003-12-04 19:31:01 +0000
commit02bec8cb64bb937b698eb5d5088a015537c7822e (patch)
tree62115325d0c7731b4bc4d09441e1e9c132a16f51
parent6938ec6c89dd1169db980b8ee53aedff1a8ffd84 (diff)
downloadgcc-02bec8cb64bb937b698eb5d5088a015537c7822e.zip
gcc-02bec8cb64bb937b698eb5d5088a015537c7822e.tar.gz
gcc-02bec8cb64bb937b698eb5d5088a015537c7822e.tar.bz2
MenuComponent.java: Import java.io.Serialization.
2003-12-04 Michael Koch <konqueror@gmx.de> * java/awt/MenuComponent.java: Import java.io.Serialization. * java/awt/MenuItem.java: Likewise. * java/awt/TextComponent.java: Likewise. * java/awt/image/ImagingOpException.java (serialVersionUID): Fixed. From-SVN: r74286
-rw-r--r--libjava/ChangeLog8
-rw-r--r--libjava/java/awt/MenuComponent.java7
-rw-r--r--libjava/java/awt/MenuItem.java6
-rw-r--r--libjava/java/awt/TextComponent.java6
-rw-r--r--libjava/java/awt/image/ImagingOpException.java4
5 files changed, 22 insertions, 9 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 99b9250..1cd7e2b 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,5 +1,13 @@
2003-12-04 Michael Koch <konqueror@gmx.de>
+ * java/awt/MenuComponent.java: Import java.io.Serialization.
+ * java/awt/MenuItem.java: Likewise.
+ * java/awt/TextComponent.java: Likewise.
+ * java/awt/image/ImagingOpException.java
+ (serialVersionUID): Fixed.
+
+2003-12-04 Michael Koch <konqueror@gmx.de>
+
* gnu/java/net/protocol/http/Connection.java
(sendRequest): Merged writing http headers with classpath.
(getInputStream): Merged documentation from classpath.
diff --git a/libjava/java/awt/MenuComponent.java b/libjava/java/awt/MenuComponent.java
index 7cd8532..91ef48f 100644
--- a/libjava/java/awt/MenuComponent.java
+++ b/libjava/java/awt/MenuComponent.java
@@ -1,5 +1,5 @@
/* MenuComponent.java -- Superclass of all AWT menu components
- Copyright (C) 1999, 2000, 2002 Free Software Foundation, Inc.
+ Copyright (C) 1999, 2000, 2002, 2003 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -39,6 +39,7 @@ exception statement from your version. */
package java.awt;
import java.awt.peer.MenuComponentPeer;
+import java.io.Serializable;
// FIXME: Java 1.0 event model unimplemented
@@ -47,7 +48,7 @@ import java.awt.peer.MenuComponentPeer;
*
* @author Aaron M. Renn (arenn@urbanophile.com)
*/
-public abstract class MenuComponent implements java.io.Serializable
+public abstract class MenuComponent implements Serializable
{
/*
@@ -55,7 +56,7 @@ public abstract class MenuComponent implements java.io.Serializable
*/
// Serialization Constant
-private static final long serialVersionUID = -4536902356223894379L;
+private static final long serialVersionUID = -4269533416223798698L;
/*************************************************************************/
diff --git a/libjava/java/awt/MenuItem.java b/libjava/java/awt/MenuItem.java
index 55e2666..02c4d0d 100644
--- a/libjava/java/awt/MenuItem.java
+++ b/libjava/java/awt/MenuItem.java
@@ -1,5 +1,5 @@
/* MenuItem.java -- An item in a menu
- Copyright (C) 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
+ Copyright (C) 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -41,6 +41,7 @@ package java.awt;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.peer.MenuItemPeer;
+import java.io.Serializable;
import java.lang.reflect.Array;
import java.util.EventListener;
@@ -49,7 +50,8 @@ import java.util.EventListener;
*
* @author Aaron M. Renn (arenn@urbanophile.com)
*/
-public class MenuItem extends MenuComponent implements java.io.Serializable
+public class MenuItem extends MenuComponent
+ implements Serializable
{
// FIXME: The enabled event mask is not used at this time.
diff --git a/libjava/java/awt/TextComponent.java b/libjava/java/awt/TextComponent.java
index c193b9e..f0c5d6f 100644
--- a/libjava/java/awt/TextComponent.java
+++ b/libjava/java/awt/TextComponent.java
@@ -1,5 +1,5 @@
/* TextComponent.java -- Widgets for entering text
- Copyright (C) 1999, 2002 Free Software Foundation, Inc.
+ Copyright (C) 1999, 2002, 2003 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -42,6 +42,7 @@ import java.awt.event.TextEvent;
import java.awt.event.TextListener;
import java.awt.peer.TextComponentPeer;
import java.awt.peer.ComponentPeer;
+import java.io.Serializable;
import java.util.EventListener;
/**
@@ -50,7 +51,8 @@ import java.util.EventListener;
*
* @author Aaron M. Renn (arenn@urbanophile.com)
*/
-public class TextComponent extends Component implements java.io.Serializable
+public class TextComponent extends Component
+ implements Serializable
{
/*
diff --git a/libjava/java/awt/image/ImagingOpException.java b/libjava/java/awt/image/ImagingOpException.java
index 28c3df1..51bf02b 100644
--- a/libjava/java/awt/image/ImagingOpException.java
+++ b/libjava/java/awt/image/ImagingOpException.java
@@ -1,5 +1,5 @@
/* ImagingOpException.java -- indicates an imaging filter failure
- Copyright (C) 2002 Free Software Foundation, Inc.
+ Copyright (C) 2002, 2003 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -52,7 +52,7 @@ public class ImagingOpException extends RuntimeException
/**
* Compatible with JDK 1.0+.
*/
- private static final long serialVersionUID = 96598996116164315L;
+ private static final long serialVersionUID = 8026288481846276658L;
/**
* Create a new instance with a descriptive error message.