From: Michael Koch Date: Wed, 20 Apr 2005 05:58:46 +0000 (+0000) Subject: PlainDatagramSocketImpl.java: Merged copyright header. X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=47af138fc5dff44f0fcdf0a125fb22d02b7f2008;p=gcc.git PlainDatagramSocketImpl.java: Merged copyright header. 2005-04-20 Michael Koch * gnu/java/net/PlainDatagramSocketImpl.java: Merged copyright header. * gnu/java/net/PlainSocketImpl.java: Reorganized import statements. Fixed @author tags. From-SVN: r98443 --- diff --git a/libjava/ChangeLog b/libjava/ChangeLog index b424c372005..aeca35fb08a 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,10 @@ +2005-04-20 Michael Koch + + * gnu/java/net/PlainDatagramSocketImpl.java: + Merged copyright header. + * gnu/java/net/PlainSocketImpl.java: + Reorganized import statements. Fixed @author tags. + 2005-04-20 Michael Koch * gnu/java/lang/ClassHelper.java, diff --git a/libjava/gnu/java/net/PlainDatagramSocketImpl.java b/libjava/gnu/java/net/PlainDatagramSocketImpl.java index 23ac67687d4..7c3a8db4d6d 100644 --- a/libjava/gnu/java/net/PlainDatagramSocketImpl.java +++ b/libjava/gnu/java/net/PlainDatagramSocketImpl.java @@ -1,5 +1,5 @@ /* PlainDatagramSocketImpl.java -- Default DatagramSocket implementation - Copyright (C) 1998, 1999, 2001, 2003, 2004 Free Software Foundation, Inc. + Copyright (C) 1998, 1999, 2001, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Classpath. diff --git a/libjava/gnu/java/net/PlainSocketImpl.java b/libjava/gnu/java/net/PlainSocketImpl.java index f7e6cb89052..b6fef0808b8 100644 --- a/libjava/gnu/java/net/PlainSocketImpl.java +++ b/libjava/gnu/java/net/PlainSocketImpl.java @@ -39,8 +39,10 @@ exception statement from your version. */ package gnu.java.net; -import java.io.InputStream; +import gnu.classpath.Configuration; + import java.io.IOException; +import java.io.InputStream; import java.io.OutputStream; import java.net.InetAddress; import java.net.InetSocketAddress; @@ -48,7 +50,6 @@ import java.net.SocketAddress; import java.net.SocketException; import java.net.SocketImpl; import java.net.SocketOptions; -import gnu.classpath.Configuration; /** * Written using on-line Java Platform 1.2 API Specification, as well @@ -62,9 +63,9 @@ import gnu.classpath.Configuration; * combination of Java and native routines to implement standard BSD * style sockets of family AF_INET and types SOCK_STREAM and SOCK_DGRAM * - * @author Per Bothner - * @author Nic Ferrier - * @author Aaron M. Renn + * @author Per Bothner (bothner@cygnus.com) + * @author Nic Ferrier (nferrier@tapsellferrier.co.uk) + * @author Aaron M. Renn (arenn@urbanophile.com) */ public final class PlainSocketImpl extends SocketImpl {