From 86b28213d4a132eee74b459eaf7352a7c39fbd1a Mon Sep 17 00:00:00 2001 From: Michael Koch Date: Sat, 16 Oct 2004 18:27:51 +0000 Subject: RMIMarshalledObjectOutputStream.java [...]: File headers and import statements cleaned up. 2004-10-16 Michael Koch * gnu/java/rmi/RMIMarshalledObjectOutputStream.java gnu/java/rmi/rmic/RMIC.java, gnu/java/rmi/server/RMIHashes.java, gnu/java/rmi/server/RMIObjectInputStream.java, gnu/java/rmi/server/RMIObjectOutputStream.java, gnu/java/rmi/server/UnicastConnection.java, gnu/java/rmi/server/UnicastConnectionManager.java, gnu/java/rmi/server/UnicastRemoteCall.java, gnu/java/rmi/server/UnicastServer.java, gnu/java/rmi/server/UnicastServerRef.java, java/rmi/MarshalledObject.java, java/rmi/Naming.java, java/rmi/RMISecurityManager.java, java/rmi/Remote.java, java/rmi/activation/Activatable.java, java/rmi/activation/ActivationDesc.java, java/rmi/activation/ActivationGroup.java, java/rmi/activation/ActivationGroupDesc.java, java/rmi/activation/ActivationGroupID.java, java/rmi/activation/ActivationID.java, java/rmi/activation/ActivationInstantiator.java, java/rmi/activation/ActivationMonitor.java, java/rmi/activation/ActivationSystem.java, java/rmi/activation/Activator.java, java/rmi/dgc/DGC.java, java/rmi/dgc/Lease.java, java/rmi/dgc/VMID.java, java/rmi/registry/LocateRegistry.java, java/rmi/registry/Registry.java, java/rmi/registry/RegistryHandler.java, java/rmi/server/LoaderHandler.java, java/rmi/server/LogStream.java, java/rmi/server/ObjID.java, java/rmi/server/Operation.java, java/rmi/server/RMIClassLoader.java, java/rmi/server/RMIClassLoaderSpi.java, java/rmi/server/RMIClientSocketFactory.java, java/rmi/server/RMIFailureHandler.java, java/rmi/server/RMIServerSocketFactory.java, java/rmi/server/RMISocketFactory.java, java/rmi/server/RemoteCall.java, java/rmi/server/RemoteObject.java, java/rmi/server/RemoteRef.java, java/rmi/server/RemoteServer.java, java/rmi/server/RemoteStub.java, java/rmi/server/ServerRef.java, java/rmi/server/Skeleton.java, java/rmi/server/SkeletonMismatchException.java, java/rmi/server/UID.java, java/rmi/server/UnicastRemoteObject.java, java/rmi/server/Unreferenced.java: File headers and import statements cleaned up. From-SVN: r89153 --- libjava/gnu/java/rmi/server/RMIHashes.java | 14 +++++++------- .../gnu/java/rmi/server/RMIObjectInputStream.java | 11 ++++++----- .../gnu/java/rmi/server/RMIObjectOutputStream.java | 11 ++++++----- libjava/gnu/java/rmi/server/UnicastConnection.java | 15 +++++++-------- .../java/rmi/server/UnicastConnectionManager.java | 16 ++++++++-------- libjava/gnu/java/rmi/server/UnicastRemoteCall.java | 11 +++++------ libjava/gnu/java/rmi/server/UnicastServer.java | 22 ++++++++++------------ libjava/gnu/java/rmi/server/UnicastServerRef.java | 22 +++++----------------- 8 files changed, 54 insertions(+), 68 deletions(-) (limited to 'libjava/gnu/java/rmi/server') diff --git a/libjava/gnu/java/rmi/server/RMIHashes.java b/libjava/gnu/java/rmi/server/RMIHashes.java index ee6b0bd..bb15733 100644 --- a/libjava/gnu/java/rmi/server/RMIHashes.java +++ b/libjava/gnu/java/rmi/server/RMIHashes.java @@ -1,5 +1,5 @@ -/* - Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc. +/* RMIHashes.java -- + Copyright (c) 1996, 1997, 1998, 1999, 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -35,15 +35,15 @@ this exception to your version of the library, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. */ + package gnu.java.rmi.server; -import java.lang.reflect.Method; -import gnu.java.io.NullOutputStream; import gnu.java.lang.reflect.TypeSignature; -import java.security.MessageDigest; -import java.security.DigestOutputStream; -import java.io.DataOutputStream; + import java.io.ByteArrayOutputStream; +import java.io.DataOutputStream; +import java.lang.reflect.Method; +import java.security.MessageDigest; public class RMIHashes { diff --git a/libjava/gnu/java/rmi/server/RMIObjectInputStream.java b/libjava/gnu/java/rmi/server/RMIObjectInputStream.java index 0c484b6..ffdccba 100644 --- a/libjava/gnu/java/rmi/server/RMIObjectInputStream.java +++ b/libjava/gnu/java/rmi/server/RMIObjectInputStream.java @@ -1,5 +1,6 @@ -/* - Copyright (c) 1996, 1997, 1998, 1999, 2002 Free Software Foundation, Inc. +/* RMIObjectInputStream.java -- + Copyright (c) 1996, 1997, 1998, 1999, 2002, 2004 + Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -35,14 +36,14 @@ this exception to your version of the library, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. */ + package gnu.java.rmi.server; -import java.io.ObjectStreamClass; -import java.io.ObjectInputStream; import java.io.InputStream; import java.io.IOException; +import java.io.ObjectInputStream; +import java.io.ObjectStreamClass; import java.lang.reflect.Proxy; -import java.net.URL; import java.net.MalformedURLException; import java.rmi.server.RMIClassLoader; diff --git a/libjava/gnu/java/rmi/server/RMIObjectOutputStream.java b/libjava/gnu/java/rmi/server/RMIObjectOutputStream.java index 97ac88a..1ae2000 100644 --- a/libjava/gnu/java/rmi/server/RMIObjectOutputStream.java +++ b/libjava/gnu/java/rmi/server/RMIObjectOutputStream.java @@ -1,5 +1,6 @@ -/* - Copyright (c) 1996, 1997, 1998, 1999, 2002 Free Software Foundation, Inc. +/* RMIObjectOutputStream.java - + Copyright (c) 1996, 1997, 1998, 1999, 2002, 2004 + Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -35,15 +36,15 @@ this exception to your version of the library, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. */ + package gnu.java.rmi.server; +import java.io.IOException; import java.io.ObjectOutputStream; import java.io.OutputStream; -import java.io.IOException; -import java.rmi.server.RMIClassLoader; import java.rmi.Remote; import java.rmi.server.RemoteStub; -import java.rmi.server.ObjID; +import java.rmi.server.RMIClassLoader; public class RMIObjectOutputStream extends ObjectOutputStream { diff --git a/libjava/gnu/java/rmi/server/UnicastConnection.java b/libjava/gnu/java/rmi/server/UnicastConnection.java index 7c59276..ce7b75b 100644 --- a/libjava/gnu/java/rmi/server/UnicastConnection.java +++ b/libjava/gnu/java/rmi/server/UnicastConnection.java @@ -1,5 +1,6 @@ -/* - Copyright (c) 1996, 1997, 1998, 1999, 2002 Free Software Foundation, Inc. +/* UnicastConnection.java -- + Copyright (c) 1996, 1997, 1998, 1999, 2002, 2004 + Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -35,19 +36,17 @@ this exception to your version of the library, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. */ + package gnu.java.rmi.server; +import java.io.BufferedInputStream; +import java.io.BufferedOutputStream; import java.io.DataInputStream; import java.io.DataOutputStream; +import java.io.IOException; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; -import java.io.BufferedInputStream; -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 a4c7d5a..2c1f5fc 100644 --- a/libjava/gnu/java/rmi/server/UnicastConnectionManager.java +++ b/libjava/gnu/java/rmi/server/UnicastConnectionManager.java @@ -36,29 +36,29 @@ this exception to your version of the library, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. */ + package gnu.java.rmi.server; -import java.rmi.server.RMISocketFactory; -import java.rmi.server.RMIServerSocketFactory; -import java.rmi.server.RMIClientSocketFactory; -import java.rmi.RemoteException; +import gnu.java.rmi.server.RMIIncomingThread; +import gnu.java.rmi.server.UnicastConnection; + import java.io.IOException; import java.io.ObjectOutput; import java.io.ObjectInput; -import java.io.DataInputStream; import java.net.InetAddress; import java.net.Socket; import java.net.ServerSocket; import java.net.UnknownHostException; +import java.rmi.RemoteException; +import java.rmi.server.RMISocketFactory; +import java.rmi.server.RMIServerSocketFactory; +import java.rmi.server.RMIClientSocketFactory; import java.util.ArrayList; import java.util.ConcurrentModificationException; import java.util.Enumeration; import java.util.Hashtable; import java.util.Iterator; -import gnu.java.rmi.server.UnicastConnection; -import gnu.java.rmi.server.RMIIncomingThread; - public class UnicastConnectionManager implements Runnable, ProtocolConstants { diff --git a/libjava/gnu/java/rmi/server/UnicastRemoteCall.java b/libjava/gnu/java/rmi/server/UnicastRemoteCall.java index 64d45bd..7844295 100644 --- a/libjava/gnu/java/rmi/server/UnicastRemoteCall.java +++ b/libjava/gnu/java/rmi/server/UnicastRemoteCall.java @@ -1,5 +1,5 @@ /* UnicastRemoteCall.java - Copyright (c) 1996, 1997, 1998, 1999, 2002 Free Software Foundation, Inc. + Copyright (c) 1996, 1997, 1998, 1999, 2002, 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -35,22 +35,21 @@ this exception to your version of the library, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. */ + package gnu.java.rmi.server; import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; -import java.io.ObjectOutput; import java.io.ObjectInput; +import java.io.ObjectOutput; import java.io.StreamCorruptedException; -import java.rmi.server.RemoteCall; import java.rmi.RemoteException; import java.rmi.MarshalException; import java.rmi.UnmarshalException; -import java.rmi.server.UID; +import java.rmi.server.RemoteCall; import java.rmi.server.ObjID; -import java.rmi.server.RemoteObject; - +import java.rmi.server.UID; import java.util.Vector; public class UnicastRemoteCall diff --git a/libjava/gnu/java/rmi/server/UnicastServer.java b/libjava/gnu/java/rmi/server/UnicastServer.java index 4230954..99aef48 100644 --- a/libjava/gnu/java/rmi/server/UnicastServer.java +++ b/libjava/gnu/java/rmi/server/UnicastServer.java @@ -1,5 +1,6 @@ -/* - Copyright (c) 1996, 1997, 1998, 1999, 2002 Free Software Foundation, Inc. +/* UnicastServer.java -- + Copyright (c) 1996, 1997, 1998, 1999, 2002, 2004 + Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -35,25 +36,22 @@ this exception to your version of the library, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. */ + package gnu.java.rmi.server; -import java.io.DataInputStream; +import gnu.java.rmi.dgc.DGCImpl; + import java.io.DataOutputStream; +import java.io.IOException; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; -import java.io.IOException; -import java.net.InetAddress; -import java.util.Hashtable; -import java.net.UnknownHostException; +import java.rmi.NoSuchObjectException; import java.rmi.Remote; +import java.rmi.RemoteException; import java.rmi.ServerError; import java.rmi.server.ObjID; -import java.rmi.server.UnicastRemoteObject; import java.rmi.server.UID; -import java.rmi.server.RemoteRef; -import java.rmi.RemoteException; -import java.rmi.NoSuchObjectException; -import gnu.java.rmi.dgc.DGCImpl; +import java.util.Hashtable; public class UnicastServer implements ProtocolConstants { diff --git a/libjava/gnu/java/rmi/server/UnicastServerRef.java b/libjava/gnu/java/rmi/server/UnicastServerRef.java index 67707e3..ce4420c 100644 --- a/libjava/gnu/java/rmi/server/UnicastServerRef.java +++ b/libjava/gnu/java/rmi/server/UnicastServerRef.java @@ -36,12 +36,13 @@ this exception to your version of the library, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. */ + package gnu.java.rmi.server; -import java.net.ServerSocket; -import java.net.Socket; -import java.net.InetAddress; -import java.net.UnknownHostException; +import java.io.ObjectInputStream; +import java.lang.reflect.Constructor; +import java.lang.reflect.Method; +import java.lang.reflect.InvocationTargetException; import java.rmi.Remote; import java.rmi.RemoteException; import java.rmi.server.RemoteStub; @@ -50,21 +51,8 @@ import java.rmi.server.ServerRef; import java.rmi.server.RemoteServer; import java.rmi.server.RemoteRef; import java.rmi.server.ServerNotActiveException; -import java.rmi.server.RMIClientSocketFactory; import java.rmi.server.RMIServerSocketFactory; -import java.rmi.server.UID; import java.rmi.server.Skeleton; -import java.rmi.server.RemoteCall; -import java.lang.reflect.Constructor; -import java.lang.reflect.Method; -import java.lang.reflect.InvocationTargetException; -import java.io.IOException; -import java.io.DataInputStream; -import java.io.DataOutputStream; -import java.io.ObjectInputStream; -import java.io.ObjectOutputStream; -import java.io.ObjectInput; -import java.io.ObjectOutput; import java.util.Hashtable; public class UnicastServerRef -- cgit v1.1