From 882c99184313386f9153e463b08c8c041678a902 Mon Sep 17 00:00:00 2001 From: mkoch Date: Thu, 4 Dec 2003 19:31:01 +0000 Subject: [PATCH] 2003-12-04 Michael Koch * 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. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@74286 138bc75d-0d04-0410-961f-82ee72b054a4 --- libjava/ChangeLog | 8 ++++++++ libjava/java/awt/MenuComponent.java | 7 ++++--- libjava/java/awt/MenuItem.java | 6 ++++-- libjava/java/awt/TextComponent.java | 6 ++++-- libjava/java/awt/image/ImagingOpException.java | 4 ++-- 5 files changed, 22 insertions(+), 9 deletions(-) diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 99b92503635..1cd7e2b26bd 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,5 +1,13 @@ 2003-12-04 Michael Koch + * 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 + * 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 7cd85325747..91ef48fbbf3 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 55e2666af91..02c4d0d0999 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 c193b9ef8b3..f0c5d6f54b2 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 28c3df132cc..51bf02b281c 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. -- 2.11.4.GIT