RMIC.java, [...]: Reworked import statements and fixed file headers.

2004-10-09  Michael Koch  <konqueror@gmx.de>

	* gnu/java/rmi/rmic/RMIC.java,
	gnu/java/rmi/server/RMIHashes.java,
	gnu/java/rmi/server/RMIObjectInputStream.java,
	gnu/java/rmi/server/UnicastConnection.java,
	gnu/java/rmi/server/UnicastConnectionManager.java,
	gnu/java/rmi/server/UnicastRemoteCall.java,
	gnu/java/rmi/server/UnicastServerRef.java:
	Reworked import statements and fixed file headers.

From-SVN: r88816

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index f8350e6333e8ac74b5f6ffff526b20d05db0ba4f..43b60bd3d35450c3ad98011e18ec3216a7be8209 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,14 @@
+2004-10-09  Michael Koch  <konqueror@gmx.de>
+
+       * gnu/java/rmi/rmic/RMIC.java,
+       gnu/java/rmi/server/RMIHashes.java,
+       gnu/java/rmi/server/RMIObjectInputStream.java,
+       gnu/java/rmi/server/UnicastConnection.java,
+       gnu/java/rmi/server/UnicastConnectionManager.java,
+       gnu/java/rmi/server/UnicastRemoteCall.java,
+       gnu/java/rmi/server/UnicastServerRef.java:
+       Reworked import statements and fixed file headers.
+
 2004-10-04  Loren J. Rittle  <ljrittle@acm.org>
 
        * configure.ac (*-*-freebsd[[1234]]*): Refine error message

diff --git a/libjava/gnu/java/rmi/rmic/RMIC.java b/libjava/gnu/java/rmi/rmic/RMIC.java
index 82bb37ef07cc4651b85290b5749a63b27cdf5088..a7080f1f9d385f042a94618e27887b433b968d78 100644 (file)
--- a/libjava/gnu/java/rmi/rmic/RMIC.java
+++ b/libjava/gnu/java/rmi/rmic/RMIC.java
@@ -1,5 +1,6 @@
-/*
-  Copyright (c) 1996, 1997, 1998, 1999, 2001, 2002, 2003 Free Software Foundation, Inc.
+/* RMIC.java --
+   Copyright (c) 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004
+   Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -7,7 +8,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -37,20 +38,19 @@ exception statement from your version. */
 
 package gnu.java.rmi.rmic;
 
+import gnu.java.rmi.server.RMIHashes;
 import java.io.File;
 import java.io.FileWriter;
-import java.io.PrintWriter;
 import java.io.IOException;
+import java.io.PrintWriter;
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
 import java.rmi.RemoteException;
+import java.util.Arrays;
 import java.util.HashSet;
 import java.util.Iterator;
-import java.util.Arrays;
 import java.util.Set;
 
-import gnu.java.rmi.server.RMIHashes;
-
 public class RMIC {
 
 private String[] args;

diff --git a/libjava/gnu/java/rmi/server/RMIHashes.java b/libjava/gnu/java/rmi/server/RMIHashes.java
index 6e32724d50a4b11c46b653cdebb95cdc376e58cf..ee6b0bd9ee9fc7d89f41f5e1c10c8528c03ba37f 100644 (file)
--- a/libjava/gnu/java/rmi/server/RMIHashes.java
+++ b/libjava/gnu/java/rmi/server/RMIHashes.java
@@ -38,7 +38,6 @@ exception statement from your version. */
 package gnu.java.rmi.server;
 
 import java.lang.reflect.Method;
-import java.lang.Class;
 import gnu.java.io.NullOutputStream;
 import gnu.java.lang.reflect.TypeSignature;
 import java.security.MessageDigest;

diff --git a/libjava/gnu/java/rmi/server/RMIObjectInputStream.java b/libjava/gnu/java/rmi/server/RMIObjectInputStream.java
index 3e862c3c184d43ca97b1bcdc7e4a6c5c96532cf6..0c484b68547c9f8d1cba70e877efa3ded2ffc589 100644 (file)
--- a/libjava/gnu/java/rmi/server/RMIObjectInputStream.java
+++ b/libjava/gnu/java/rmi/server/RMIObjectInputStream.java
@@ -41,11 +41,10 @@ import java.io.ObjectStreamClass;
 import java.io.ObjectInputStream;
 import java.io.InputStream;
 import java.io.IOException;
+import java.lang.reflect.Proxy;
 import java.net.URL;
 import java.net.MalformedURLException;
 import java.rmi.server.RMIClassLoader;
-import java.lang.ClassNotFoundException;
-import java.lang.reflect.Proxy;
 
 public class RMIObjectInputStream
        extends ObjectInputStream {

diff --git a/libjava/gnu/java/rmi/server/UnicastConnection.java b/libjava/gnu/java/rmi/server/UnicastConnection.java
index 19e074a08602cbabaf4352287ff591782c7a5bf5..7c592767d449e829a31e55323f48784c8843291f 100644 (file)
--- a/libjava/gnu/java/rmi/server/UnicastConnection.java
+++ b/libjava/gnu/java/rmi/server/UnicastConnection.java
@@ -37,9 +37,6 @@ exception statement from your version. */
 
 package gnu.java.rmi.server;
 
-import java.lang.Runnable;
-import java.net.Socket;
-import java.net.ServerSocket;
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.ObjectInputStream;
@@ -49,6 +46,8 @@ import java.io.BufferedOutputStream;
 import java.io.ObjectOutput;
 import java.io.ObjectInput;
 import java.io.IOException;
+import java.net.Socket;
+import java.net.ServerSocket;
 import java.rmi.RemoteException;
 
 public class UnicastConnection 

diff --git a/libjava/gnu/java/rmi/server/UnicastConnectionManager.java b/libjava/gnu/java/rmi/server/UnicastConnectionManager.java
index b7a505d20840ac8b765abe9083e057cbfe695cb9..a4c7d5aca06d0c03c9b43d65ab35fa68e3dd34da 100644 (file)
--- a/libjava/gnu/java/rmi/server/UnicastConnectionManager.java
+++ b/libjava/gnu/java/rmi/server/UnicastConnectionManager.java
@@ -1,5 +1,6 @@
-/*
-  Copyright (c) 1996, 1997, 1998, 1999, 2002 Free Software Foundation, Inc.
+/* UnicastConnectionManager.java --
+   Copyright (c) 1996, 1997, 1998, 1999, 2002, 2004
+   Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -45,13 +46,10 @@ import java.io.IOException;
 import java.io.ObjectOutput;
 import java.io.ObjectInput;
 import java.io.DataInputStream;
-import java.lang.Thread;
-import java.lang.Runnable;
 import java.net.InetAddress;
 import java.net.Socket;
 import java.net.ServerSocket;
 import java.net.UnknownHostException;
-
 import java.util.ArrayList;
 import java.util.ConcurrentModificationException;
 import java.util.Enumeration;

diff --git a/libjava/gnu/java/rmi/server/UnicastRemoteCall.java b/libjava/gnu/java/rmi/server/UnicastRemoteCall.java
index 76dd8e215b75d2194bffc34f5d2fc8e32d0a8288..64d45bd7d7250b6d59504a6b1a3292c96b3fc827 100644 (file)
--- a/libjava/gnu/java/rmi/server/UnicastRemoteCall.java
+++ b/libjava/gnu/java/rmi/server/UnicastRemoteCall.java
@@ -37,7 +37,6 @@ exception statement from your version. */
 
 package gnu.java.rmi.server;
 
-import java.lang.Exception;
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;

diff --git a/libjava/gnu/java/rmi/server/UnicastServerRef.java b/libjava/gnu/java/rmi/server/UnicastServerRef.java
index 1c5823a7070fdfb712568a220bded0f98284226e..67707e363a3d517ad208ee0d405f0034387b3323 100644 (file)
--- a/libjava/gnu/java/rmi/server/UnicastServerRef.java
+++ b/libjava/gnu/java/rmi/server/UnicastServerRef.java
@@ -1,5 +1,6 @@
-/*
-  Copyright (c) 1996, 1997, 1998, 1999, 2002, 2003 Free Software Foundation, Inc.
+/* UnicastServerRef.java --
+   Copyright (c) 1996, 1997, 1998, 1999, 2002, 2003, 2004
+   Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -57,8 +58,6 @@ import java.rmi.server.RemoteCall;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Method;
 import java.lang.reflect.InvocationTargetException;
-import java.lang.Thread;
-import java.lang.Exception;
 import java.io.IOException;
 import java.io.DataInputStream;
 import java.io.DataOutputStream;