[Patch] gnu.java.net - socket classes partly merged

[Michael Koch]

Hi list,


I just commited the attached patch to merge the socket classes in
gnu.java.net more with GNU classpath.


Michael


2005-04-20  Michael Koch  <konqueror@gmx.de>

	* gnu/java/net/PlainDatagramSocketImpl.java:
	Merged copyright header.
	* gnu/java/net/PlainSocketImpl.java:
	Reorganized import statements. Fixed @author tags.

-------------- next part --------------
Index: gnu/java/net/PlainDatagramSocketImpl.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/gnu/java/net/PlainDatagramSocketImpl.java,v
retrieving revision 1.7
diff -u -r1.7 PlainDatagramSocketImpl.java
--- gnu/java/net/PlainDatagramSocketImpl.java	18 Oct 2004 10:14:23 -0000	1.7
+++ gnu/java/net/PlainDatagramSocketImpl.java	20 Apr 2005 05:58:24 -0000
@@ -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.
 
Index: gnu/java/net/PlainSocketImpl.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/gnu/java/net/PlainSocketImpl.java,v
retrieving revision 1.7
diff -u -r1.7 PlainSocketImpl.java
--- gnu/java/net/PlainSocketImpl.java	17 Feb 2005 18:59:55 -0000	1.7
+++ gnu/java/net/PlainSocketImpl.java	20 Apr 2005 05:58:24 -0000
@@ -39,8 +39,10 @@
 
 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.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 @@
  * 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 <bothner@cygnus.com>
- * @author Nic Ferrier <nferrier@tapsellferrier.co.uk>
- * @author Aaron M. Renn <arenn@urbanophile.com>
+ * @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
 {