RMIMarshalledObjectOutputStream.java [...]: File headers and import statements cleane...

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

	* 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

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index d16ebabd43da46ae61d1cbbf5a9db45c1c25befa..06f2a5cb887136ab9a0ea8d197ab7041de05c412 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,58 @@
+2004-10-16  Michael Koch  <konqueror@gmx.de>
+
+       * 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.
+
 2004-10-16  Michael Koch  <konqueror@gmx.de>
 
        * libjava/gnu/java/nio/charset/UTF_16.java,

diff --git a/libjava/gnu/java/rmi/RMIMarshalledObjectOutputStream.java b/libjava/gnu/java/rmi/RMIMarshalledObjectOutputStream.java
index a721fc47194cf1e0fc7d2c29238a2f1c57482171..53a5bf159dfe8fd6a9c90c8a0bbca97a2f28576c 100644 (file)
--- a/libjava/gnu/java/rmi/RMIMarshalledObjectOutputStream.java
+++ b/libjava/gnu/java/rmi/RMIMarshalledObjectOutputStream.java
@@ -1,5 +1,5 @@
 /* gnu.java.rmi.RMIMarshalledObjectOutputStream
-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -38,16 +38,12 @@ exception statement from your version. */
 
 package gnu.java.rmi;
 
+import gnu.java.rmi.server.RMIObjectOutputStream;
+
 import java.io.OutputStream;
 import java.io.ObjectOutputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
-import java.rmi.Remote;
-import java.rmi.server.ObjID;
-import java.rmi.server.RemoteStub;
-
-import gnu.java.rmi.server.RMIObjectOutputStream;
-import gnu.java.rmi.server.UnicastServerRef;
 
 /**
  * This class is only for java.rmi.MarshalledObject to serialize object and 

diff --git a/libjava/gnu/java/rmi/rmic/RMIC.java b/libjava/gnu/java/rmi/rmic/RMIC.java
index a7080f1f9d385f042a94618e27887b433b968d78..d34a84ce7eb736a46ab8942a84e9ec75f5f4e3b3 100644 (file)
--- a/libjava/gnu/java/rmi/rmic/RMIC.java
+++ b/libjava/gnu/java/rmi/rmic/RMIC.java
@@ -36,15 +36,16 @@ 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.rmic;
 
 import gnu.java.rmi.server.RMIHashes;
+
 import java.io.File;
 import java.io.FileWriter;
 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;

diff --git a/libjava/gnu/java/rmi/server/RMIHashes.java b/libjava/gnu/java/rmi/server/RMIHashes.java
index ee6b0bd9ee9fc7d89f41f5e1c10c8528c03ba37f..bb15733f8caddf95e576722714a38de5c22a7b3b 100644 (file)
--- 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 0c484b68547c9f8d1cba70e877efa3ded2ffc589..ffdccba4f62769b76b887e358102ec1a0d0cdbab 100644 (file)
--- 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 97ac88aabc145910156d2512577ec6cc5f4e0ab6..1ae2000da08307446b3f50474d5072689935d786 100644 (file)
--- 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 7c592767d449e829a31e55323f48784c8843291f..ce7b75bdab62baf38f9df1632342a728267b41ab 100644 (file)
--- 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 a4c7d5aca06d0c03c9b43d65ab35fa68e3dd34da..2c1f5fc3a024ec840e594c05eaa9e210094c381c 100644 (file)
--- 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 64d45bd7d7250b6d59504a6b1a3292c96b3fc827..78442952ee446b030fd10c8b7e974b8db9e6cf3c 100644 (file)
--- 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 4230954044202916ece7fb808fb0fd11b3f29101..99aef483f9c5f1f2df05064899c333123a1a0e5b 100644 (file)
--- 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 67707e363a3d517ad208ee0d405f0034387b3323..ce4420c4701b5a5768d0d7e40845fcdd7a913cea 100644 (file)
--- 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

diff --git a/libjava/java/rmi/MarshalledObject.java b/libjava/java/rmi/MarshalledObject.java
index ef22310c7b1b7fd7eec5b272fe24894f4bc86ec7..d6c594b8bb0f8f6b13e877faa14fe1a49f7c7c83 100644 (file)
--- a/libjava/java/rmi/MarshalledObject.java
+++ b/libjava/java/rmi/MarshalledObject.java
@@ -1,5 +1,5 @@
-/*
-  Copyright (c) 1996, 1997, 1998, 1999, 2004 Free Software Foundation, Inc.
+/* MarshalledObject.java --
+   Copyright (c) 1996, 1997, 1998, 1999, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -37,18 +37,16 @@ exception statement from your version. */
 
 package java.rmi;
 
-import java.io.Serializable;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
 import gnu.java.rmi.RMIMarshalledObjectInputStream;
 import gnu.java.rmi.RMIMarshalledObjectOutputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.Serializable;
 
 /**
  * FIXME - doc missing
  */
 public final class MarshalledObject implements Serializable 
 {
-  
   //The following fields are from Java API Documentation "Serialized form"
   private static final long serialVersionUID = 8988374069173025854L;
   byte[] objBytes;

diff --git a/libjava/java/rmi/Naming.java b/libjava/java/rmi/Naming.java
index 1a30c1f2c07564fb8a4d342d0cd5ab922d74873b..3b92020196d88cb3a664d4f86c9ac65480a70abf 100644 (file)
--- a/libjava/java/rmi/Naming.java
+++ b/libjava/java/rmi/Naming.java
@@ -1,5 +1,5 @@
-/*
-  Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
+/* Naming.java --
+   Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 

diff --git a/libjava/java/rmi/RMISecurityManager.java b/libjava/java/rmi/RMISecurityManager.java
index 5ec70f70a48b6527811a5e668deee03c411d8cec..1ddaa04e23efe9ab8bbcdbb809708c05acf8fa1f 100644 (file)
--- a/libjava/java/rmi/RMISecurityManager.java
+++ b/libjava/java/rmi/RMISecurityManager.java
@@ -1,5 +1,5 @@
-/*
-  Copyright (c) 1996, 1997, 1998, 1999, 2003 Free Software Foundation, Inc.
+/* RMISecurityManager.java --
+   Copyright (c) 1996, 1997, 1998, 1999, 2003 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 

diff --git a/libjava/java/rmi/Remote.java b/libjava/java/rmi/Remote.java
index 2b1b9634cc6979a6aa80342fe5dd538272f2fd2d..77bdf3f501b6d39d009188936f69c5495c03f32f 100644 (file)
--- a/libjava/java/rmi/Remote.java
+++ b/libjava/java/rmi/Remote.java
@@ -1,5 +1,5 @@
-/*
-  Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
+/* Remote.java
+   Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 

diff --git a/libjava/java/rmi/activation/Activatable.java b/libjava/java/rmi/activation/Activatable.java
index 95913199f091b6f9b6b5ca5b155c7f6cb311fda0..b237e69a40e1e911ee6a5c2ecde1b1f8de67fbeb 100644 (file)
--- a/libjava/java/rmi/activation/Activatable.java
+++ b/libjava/java/rmi/activation/Activatable.java
@@ -1,5 +1,5 @@
-/*
-  Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
+/* Activatable.java --
+   Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 

diff --git a/libjava/java/rmi/activation/ActivationDesc.java b/libjava/java/rmi/activation/ActivationDesc.java
index b0f22aae7606ac42f11a24941ff6e0cf481432cd..b8f14baa7d3c231f1cf4ac8eff668dcc2380e5b5 100644 (file)
--- a/libjava/java/rmi/activation/ActivationDesc.java
+++ b/libjava/java/rmi/activation/ActivationDesc.java
@@ -1,5 +1,5 @@
-/*
-  Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
+/* ActivationDecc.java --
+   Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 

diff --git a/libjava/java/rmi/activation/ActivationGroup.java b/libjava/java/rmi/activation/ActivationGroup.java
index e9cd472113b44452139a32b54b7d42bb328b8155..69f9d1d094bf4f85a6f67e2e858592784e7af593 100644 (file)
--- a/libjava/java/rmi/activation/ActivationGroup.java
+++ b/libjava/java/rmi/activation/ActivationGroup.java
@@ -1,5 +1,5 @@
-/*
-  Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
+/* ActivationGroup.java --
+   Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 

diff --git a/libjava/java/rmi/activation/ActivationGroupDesc.java b/libjava/java/rmi/activation/ActivationGroupDesc.java
index 2afb8440b0b26f510872b7739e52cf7846bbb6d7..67d971137dfa6c7c9441e2c426c4ccaa146ecb09 100644 (file)
--- a/libjava/java/rmi/activation/ActivationGroupDesc.java
+++ b/libjava/java/rmi/activation/ActivationGroupDesc.java
@@ -1,5 +1,5 @@
-/*
-  Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
+/* ActivationGroupDesc.java --
+   Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 

diff --git a/libjava/java/rmi/activation/ActivationGroupID.java b/libjava/java/rmi/activation/ActivationGroupID.java
index 9fff53bb7068ffccff2ed39dd774fc16d7586c6e..bf889be11d60d79ca527a5d371da9946716249fc 100644 (file)
--- a/libjava/java/rmi/activation/ActivationGroupID.java
+++ b/libjava/java/rmi/activation/ActivationGroupID.java
@@ -1,5 +1,5 @@
-/*
-  Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
+/* ActivationGroupID.java --
+   Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 

diff --git a/libjava/java/rmi/activation/ActivationID.java b/libjava/java/rmi/activation/ActivationID.java
index 62bd7763b42cc9a4c5553071398340b48d026402..cc32349bdb3d3a7bdcede842905234df7f50e984 100644 (file)
--- a/libjava/java/rmi/activation/ActivationID.java
+++ b/libjava/java/rmi/activation/ActivationID.java
@@ -1,5 +1,5 @@
-/*
-  Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
+/* ActivationID.java --
+   Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 

diff --git a/libjava/java/rmi/activation/ActivationInstantiator.java b/libjava/java/rmi/activation/ActivationInstantiator.java
index d47071a22deffc4c88c7dd73899d1d52a8e9526b..7fbcee5b9933444afbcd5fa1504c1f83fb2a37dc 100644 (file)
--- a/libjava/java/rmi/activation/ActivationInstantiator.java
+++ b/libjava/java/rmi/activation/ActivationInstantiator.java
@@ -1,5 +1,5 @@
-/*
-  Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
+/* ActivationInstantiator.java --
+   Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 

diff --git a/libjava/java/rmi/activation/ActivationMonitor.java b/libjava/java/rmi/activation/ActivationMonitor.java
index 67b7755533c6326dae3a0245c82973759a59605b..6ce01f116cbf3ed473f7de7420f68a2f73f14075 100644 (file)
--- a/libjava/java/rmi/activation/ActivationMonitor.java
+++ b/libjava/java/rmi/activation/ActivationMonitor.java
@@ -1,5 +1,5 @@
-/*
-  Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
+/* ActivationMonitor.java --
+   Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 

diff --git a/libjava/java/rmi/activation/ActivationSystem.java b/libjava/java/rmi/activation/ActivationSystem.java
index a4b9a054d300d31777b77473bdf5b12dba926f76..fd8a9aa78a38ef40f87c4990844cefd76dac3833 100644 (file)
--- a/libjava/java/rmi/activation/ActivationSystem.java
+++ b/libjava/java/rmi/activation/ActivationSystem.java
@@ -1,5 +1,5 @@
-/*
-  Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
+/* ActivationSystem.java --
+i  Copyright (c) 1996, 1997, 1998, 1999, 2004  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 

diff --git a/libjava/java/rmi/activation/Activator.java b/libjava/java/rmi/activation/Activator.java
index 834f68e28823e6eb1868e35381ce54b3542e0b9e..c9e6ef75b78a1e9b08509677e6e5b8be948a6acd 100644 (file)
--- a/libjava/java/rmi/activation/Activator.java
+++ b/libjava/java/rmi/activation/Activator.java
@@ -1,5 +1,5 @@
-/*
-  Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
+/* Activator.java --
+   Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 

diff --git a/libjava/java/rmi/dgc/DGC.java b/libjava/java/rmi/dgc/DGC.java
index b62c7fdbde734a07bc962475cd993ee6a36f2915..08563a6781506d9050b0da025ab327c9971faf31 100644 (file)
--- a/libjava/java/rmi/dgc/DGC.java
+++ b/libjava/java/rmi/dgc/DGC.java
@@ -1,5 +1,5 @@
-/*
-  Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
+/* DGC.java --
+   Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 

diff --git a/libjava/java/rmi/dgc/Lease.java b/libjava/java/rmi/dgc/Lease.java
index 14c8fd7644376fbf205b7fafe3657c640fb44c5e..febe80aec0e453471930cb639ddb50d6452f86b4 100644 (file)
--- a/libjava/java/rmi/dgc/Lease.java
+++ b/libjava/java/rmi/dgc/Lease.java
@@ -1,5 +1,5 @@
-/*
-  Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
+/* Lease.java
+   Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -38,7 +38,6 @@ exception statement from your version. */
 package java.rmi.dgc;
 
 import java.io.Serializable;
-import java.rmi.dgc.VMID;
 
 public final class Lease
        implements Serializable {

diff --git a/libjava/java/rmi/dgc/VMID.java b/libjava/java/rmi/dgc/VMID.java
index a29a02836eb1d86db7427d90023930eb1235716d..7cdfe1c69b0aacf6b4318cc2156a5ce45ba96e1c 100644 (file)
--- a/libjava/java/rmi/dgc/VMID.java
+++ b/libjava/java/rmi/dgc/VMID.java
@@ -1,5 +1,5 @@
-/*
-  Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
+/* VMID.java
+   Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 

diff --git a/libjava/java/rmi/registry/LocateRegistry.java b/libjava/java/rmi/registry/LocateRegistry.java
index 508596377f9cffedc7f8aab83d29b9a7b713f863..d3ccd831309c707db6e319be835602b12f5a5290 100644 (file)
--- a/libjava/java/rmi/registry/LocateRegistry.java
+++ b/libjava/java/rmi/registry/LocateRegistry.java
@@ -1,5 +1,5 @@
-/*
-  Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
+/* LocateRegistry.java --
+   Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -37,17 +37,14 @@ exception statement from your version. */
 
 package java.rmi.registry;
 
-import java.io.IOException;
 import java.rmi.RemoteException;
 import java.rmi.server.RMIClientSocketFactory;
 import java.rmi.server.RMIServerSocketFactory;
 import java.rmi.server.RMISocketFactory;
 import java.rmi.server.RemoteRef;
 import java.rmi.server.ObjID;
-import java.net.Socket;
 
 import gnu.java.rmi.server.UnicastRef;
-import gnu.java.rmi.server.UnicastServerRef;
 import gnu.java.rmi.registry.RegistryImpl;
 import gnu.java.rmi.registry.RegistryImpl_Stub;
 

diff --git a/libjava/java/rmi/registry/Registry.java b/libjava/java/rmi/registry/Registry.java
index cbab4e725972359742666505d3eedd1b4583787e..eaf2be997a5d57be1a18bf6c4e830549e2ebaf88 100644 (file)
--- a/libjava/java/rmi/registry/Registry.java
+++ b/libjava/java/rmi/registry/Registry.java
@@ -1,5 +1,5 @@
-/*
-  Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
+/* Registry.java --
+   Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 

diff --git a/libjava/java/rmi/registry/RegistryHandler.java b/libjava/java/rmi/registry/RegistryHandler.java
index 27cedfb5457804e19ee8744256c370d6fa56d6be..fc9c3375a05ce459585d2350a603eeddc2f02852 100644 (file)
--- a/libjava/java/rmi/registry/RegistryHandler.java
+++ b/libjava/java/rmi/registry/RegistryHandler.java
@@ -1,5 +1,5 @@
-/*
-  Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
+/* RegistryHandler.java --
+   Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 

diff --git a/libjava/java/rmi/server/LoaderHandler.java b/libjava/java/rmi/server/LoaderHandler.java
index 3f44142ce0478fc384cb666b12384a2a3a4c0cde..8ebb56f46fc66fbbe7342f0097792c5654d36c91 100644 (file)
--- a/libjava/java/rmi/server/LoaderHandler.java
+++ b/libjava/java/rmi/server/LoaderHandler.java
@@ -1,5 +1,5 @@
-/*
-  Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
+/* LoaderHandler.java --
+   Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 

diff --git a/libjava/java/rmi/server/LogStream.java b/libjava/java/rmi/server/LogStream.java
index 5bf0689413b4ac645530c978660d0a02ed63a3df..3a58f2dd86e30578db6029810a764149a32a19b9 100644 (file)
--- a/libjava/java/rmi/server/LogStream.java
+++ b/libjava/java/rmi/server/LogStream.java
@@ -1,5 +1,5 @@
-/*
-  Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
+/* LogStream.java --
+   Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -39,7 +39,6 @@ package java.rmi.server;
 
 import java.io.PrintStream;
 import java.io.OutputStream;
-import java.io.IOException;
 
 /**
  * @deprecated

diff --git a/libjava/java/rmi/server/ObjID.java b/libjava/java/rmi/server/ObjID.java
index 3693bfe6ec6ce803fc0b356d311c4738ba6da86c..6f24057fcfc87321e8f8d002e0fad0015555d598 100644 (file)
--- a/libjava/java/rmi/server/ObjID.java
+++ b/libjava/java/rmi/server/ObjID.java
@@ -1,5 +1,5 @@
-/*
-  Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
+/* ObjID.java
+   Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -41,10 +41,8 @@ import java.io.Serializable;
 import java.io.ObjectOutput;
 import java.io.ObjectInput;
 import java.io.IOException;
-import java.lang.Math;
 import java.io.DataInput;
 import java.io.DataOutput;
-import java.util.Random;
 
 public final class ObjID
        implements Serializable {

diff --git a/libjava/java/rmi/server/Operation.java b/libjava/java/rmi/server/Operation.java
index 477446cbbeb1da75de43ac2b728c06ec91557f75..3f855dbca5200ac69f8314379916fb4be5ece3db 100644 (file)
--- a/libjava/java/rmi/server/Operation.java
+++ b/libjava/java/rmi/server/Operation.java
@@ -1,5 +1,5 @@
-/*
-  Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
+/* Operation.java --
+   Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 

diff --git a/libjava/java/rmi/server/RMIClassLoader.java b/libjava/java/rmi/server/RMIClassLoader.java
index e6af682a4526ceaf05da79ae470069a17bc92da5..4e36bf72c20d003e0dccc967bd07a9a21f8eaa3c 100644 (file)
--- a/libjava/java/rmi/server/RMIClassLoader.java
+++ b/libjava/java/rmi/server/RMIClassLoader.java
@@ -1,6 +1,6 @@
-/* RMIClassLoader.java
-  Copyright (c) 1996, 1997, 1998, 1999, 2002, 2003
-  Free Software Foundation, Inc.
+/* RMIClassLoader.java --
+   Copyright (c) 1996, 1997, 1998, 1999, 2002, 2003
+   Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 

diff --git a/libjava/java/rmi/server/RMIClassLoaderSpi.java b/libjava/java/rmi/server/RMIClassLoaderSpi.java
index 2dbb3849c272d364f20d76e4b1c0763d059754e1..ba3bef6b0ea18b3876f437cbed0db0982059a43d 100644 (file)
--- a/libjava/java/rmi/server/RMIClassLoaderSpi.java
+++ b/libjava/java/rmi/server/RMIClassLoaderSpi.java
@@ -1,5 +1,5 @@
-/* RMIClassLoaderSpi.java
-  Copyright (c) 2002 Free Software Foundation, Inc.
+/* RMIClassLoaderSpi.java --
+   Copyright (c) 2002 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 

diff --git a/libjava/java/rmi/server/RMIClientSocketFactory.java b/libjava/java/rmi/server/RMIClientSocketFactory.java
index cbb8dba7b1d1aa58995be5fd57003ea952b13c45..6c3c4a1d3a131e2d13a7af89836f067e2b785108 100644 (file)
--- a/libjava/java/rmi/server/RMIClientSocketFactory.java
+++ b/libjava/java/rmi/server/RMIClientSocketFactory.java
@@ -1,5 +1,5 @@
-/*
-  Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
+/* RMIClientSocketFactory.java --
+   Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 

diff --git a/libjava/java/rmi/server/RMIFailureHandler.java b/libjava/java/rmi/server/RMIFailureHandler.java
index c48f250aaa226ecf4230c39d261d17278284bef8..f87321d2058bfaaec498f355152fceb24db63f2b 100644 (file)
--- a/libjava/java/rmi/server/RMIFailureHandler.java
+++ b/libjava/java/rmi/server/RMIFailureHandler.java
@@ -1,5 +1,5 @@
-/*
-  Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
+/* RMIFailureHandler.java --
+   Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 

diff --git a/libjava/java/rmi/server/RMIServerSocketFactory.java b/libjava/java/rmi/server/RMIServerSocketFactory.java
index a5c52ffb6fd3bdd3a6568a186a94854a7cf72091..f0fa59f502e6cc020a01db37c261ec2ecec56ba4 100644 (file)
--- a/libjava/java/rmi/server/RMIServerSocketFactory.java
+++ b/libjava/java/rmi/server/RMIServerSocketFactory.java
@@ -1,5 +1,5 @@
-/*
-  Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
+/* RMIServerSocketFactory.java --
+   Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 

diff --git a/libjava/java/rmi/server/RMISocketFactory.java b/libjava/java/rmi/server/RMISocketFactory.java
index 544b1250660e6037ff9d99f117343cf77108119f..3b068db869dd9a705d6b6a840172f12779f4ac6a 100644 (file)
--- a/libjava/java/rmi/server/RMISocketFactory.java
+++ b/libjava/java/rmi/server/RMISocketFactory.java
@@ -1,5 +1,5 @@
-/*
-  Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
+/* RMISocketFactory.java --
+   Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 

diff --git a/libjava/java/rmi/server/RemoteCall.java b/libjava/java/rmi/server/RemoteCall.java
index c244d6e94f8a085225185b56de035b79fb27e60f..6596eb3e5a977c0e37fced04ac62578334c86335 100644 (file)
--- a/libjava/java/rmi/server/RemoteCall.java
+++ b/libjava/java/rmi/server/RemoteCall.java
@@ -1,5 +1,5 @@
-/*
-  Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
+/* RemoteCall.java --
+   Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -37,7 +37,6 @@ exception statement from your version. */
 
 package java.rmi.server;
 
-import java.lang.Exception;
 import java.io.IOException;
 import java.io.ObjectOutput;
 import java.io.ObjectInput;

diff --git a/libjava/java/rmi/server/RemoteObject.java b/libjava/java/rmi/server/RemoteObject.java
index a1febf2dd62708871be3ed14b0d2d545d8325f59..1bc7648c8fc6931ff1b6669cd82493604adbdde1 100644 (file)
--- a/libjava/java/rmi/server/RemoteObject.java
+++ b/libjava/java/rmi/server/RemoteObject.java
@@ -1,5 +1,5 @@
-/*
-  Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
+/* RemoteObject.java --
+   Copyright (c) 1996, 1997, 1998, 1999, 2004  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -37,18 +37,14 @@ exception statement from your version. */
 
 package java.rmi.server;
 
-import java.io.Serializable;
-import java.rmi.Remote;
-import java.rmi.NoSuchObjectException;
-import java.rmi.UnmarshalException;
-import java.rmi.server.RemoteRef;
+import java.io.IOException;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
-import java.io.IOException;
-import java.lang.ClassNotFoundException;
-import java.lang.InstantiationException;
-import java.lang.IllegalAccessException;
+import java.io.Serializable;
 import java.lang.reflect.Constructor;
+import java.rmi.NoSuchObjectException;
+import java.rmi.Remote;
+import java.rmi.UnmarshalException;
 
 public abstract class RemoteObject
        implements Remote, Serializable {

diff --git a/libjava/java/rmi/server/RemoteRef.java b/libjava/java/rmi/server/RemoteRef.java
index 10168690dc083a413bf42c5da6c2c613fbd4d9cf..a3f22c27a66eb46f666f771df27a4a6b41ad9228 100644 (file)
--- a/libjava/java/rmi/server/RemoteRef.java
+++ b/libjava/java/rmi/server/RemoteRef.java
@@ -1,5 +1,5 @@
-/*
-  Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
+/* RemoteRef.java --
+   Copyright (c) 1996, 1997, 1998, 1999, 2004  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -35,13 +35,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 java.rmi.server;
 
-import java.lang.reflect.Method;
 import java.io.Externalizable;
+import java.io.ObjectOutput;
+import java.lang.reflect.Method;
 import java.rmi.Remote;
 import java.rmi.RemoteException;
-import java.io.ObjectOutput;
 
 public interface RemoteRef extends Externalizable
 {

diff --git a/libjava/java/rmi/server/RemoteServer.java b/libjava/java/rmi/server/RemoteServer.java
index 85a2d955124978343ff9cc2f36e71cb8b75a0ba3..5eef3c8d86599093bfa9a302e11f7a24ebaaa217 100644 (file)
--- a/libjava/java/rmi/server/RemoteServer.java
+++ b/libjava/java/rmi/server/RemoteServer.java
@@ -1,5 +1,5 @@
-/*
-  Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
+/* RemoteServer.java --
+   Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 

diff --git a/libjava/java/rmi/server/RemoteStub.java b/libjava/java/rmi/server/RemoteStub.java
index 07b61d64a00788890c1f13d567da725f8970e66c..0266aceb82a3608e8c550a5646b85755703e46a1 100644 (file)
--- a/libjava/java/rmi/server/RemoteStub.java
+++ b/libjava/java/rmi/server/RemoteStub.java
@@ -1,5 +1,5 @@
-/*
-  Copyright (c) 1996, 1997, 1998, 1999, 2002 Free Software Foundation, Inc.
+/* RemoteStub.java --
+   Copyright (c) 1996, 1997, 1998, 1999, 2002 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 

diff --git a/libjava/java/rmi/server/ServerRef.java b/libjava/java/rmi/server/ServerRef.java
index e347de974bd1b4e0ec212d8128de9be0d5a49609..b26253cec519d256fd20f0d37cd0dc64fa236d4f 100644 (file)
--- a/libjava/java/rmi/server/ServerRef.java
+++ b/libjava/java/rmi/server/ServerRef.java
@@ -1,5 +1,5 @@
-/*
-  Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
+/* ServerRef.java --
+   Copyright (c) 1996, 1997, 1998, 1999, 2004  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 

diff --git a/libjava/java/rmi/server/Skeleton.java b/libjava/java/rmi/server/Skeleton.java
index 96c421456f5e76161a27f2e83afa5a9da507b01f..3d4455cacffb6ef4e876bd599b41179da9ec0ec3 100644 (file)
--- a/libjava/java/rmi/server/Skeleton.java
+++ b/libjava/java/rmi/server/Skeleton.java
@@ -1,5 +1,5 @@
-/*
-  Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
+/* Skeleton.java --
+   Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -38,7 +38,6 @@ exception statement from your version. */
 package java.rmi.server;
 
 import java.rmi.Remote;
-import java.rmi.server.RemoteCall;
 
 /**
  * @deprecated

diff --git a/libjava/java/rmi/server/SkeletonMismatchException.java b/libjava/java/rmi/server/SkeletonMismatchException.java
index 5a4b6ae96df96f42cff2d81ce2e1cce89dde3256..dc0fcf87d591f3746e1d16e6cd2d88bd7c51a672 100644 (file)
--- a/libjava/java/rmi/server/SkeletonMismatchException.java
+++ b/libjava/java/rmi/server/SkeletonMismatchException.java
@@ -1,5 +1,5 @@
 /* SkeletonMismatchException.java -- thrown when stub class versions mismatch
-  Copyright (c) 1996, 1997, 1998, 1999, 2002 Free Software Foundation, Inc.
+   Copyright (c) 1996, 1997, 1998, 1999, 2002 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 

diff --git a/libjava/java/rmi/server/UID.java b/libjava/java/rmi/server/UID.java
index 4c8a04110a8edd7f43e1ffb9345253e4f9d277ba..40ff3770b2618dbc40c7c0a6ace36570c94ead14 100644 (file)
--- a/libjava/java/rmi/server/UID.java
+++ b/libjava/java/rmi/server/UID.java
@@ -1,5 +1,5 @@
-/*
-  Copyright (c) 1996, 1997, 1998, 1999, 2004 Free Software Foundation, Inc.
+/* UID.java --
+   Copyright (c) 1996, 1997, 1998, 1999, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -37,17 +37,13 @@ exception statement from your version. */
 
 package java.rmi.server;
 
-import java.io.Serializable;
 import java.io.DataOutput;
 import java.io.DataInput;
 import java.io.IOException;
-import java.util.Random;
-import java.lang.Thread;
-import java.lang.InterruptedException;
-
-public final class UID
-       implements Serializable {
+import java.io.Serializable;
 
+public final class UID implements Serializable
+{
 public static final long serialVersionUID = 1086053664494604050L;
 
 private static final Object lock = UID.class;

diff --git a/libjava/java/rmi/server/UnicastRemoteObject.java b/libjava/java/rmi/server/UnicastRemoteObject.java
index 8e010e7e5e80c14f224543669f1af1c90aba3ea6..d8e1a0227d224e07997719fc021f5f3d484d51dc 100644 (file)
--- a/libjava/java/rmi/server/UnicastRemoteObject.java
+++ b/libjava/java/rmi/server/UnicastRemoteObject.java
@@ -1,5 +1,5 @@
-/*
-  Copyright (c) 1996, 1997, 1998, 1999, 2002, 2003 Free Software Foundation, Inc.
+/* UnicastRemoteObject.java --
+   Copyright (c) 1996, 1997, 1998, 1999, 2002, 2003 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -40,14 +40,11 @@ package java.rmi.server;
 
 import java.rmi.RemoteException;
 import java.rmi.Remote;
-import java.rmi.server.RemoteRef;
 import java.rmi.NoSuchObjectException;
 import gnu.java.rmi.server.UnicastServerRef;
-import gnu.java.rmi.server.UnicastServer;
-
-public class UnicastRemoteObject
-       extends RemoteServer {
 
+public class UnicastRemoteObject extends RemoteServer
+{
 private static final long serialVersionUID = 4974527148936298033L;
 //The following serialized fields are from Java API Documentation "Serialized form"
 private int port = 0;

diff --git a/libjava/java/rmi/server/Unreferenced.java b/libjava/java/rmi/server/Unreferenced.java
index 8602ce16e2de6b5804ae1857ce517d26458c66ba..057a8b2dae2626c1899cc7766c79ea3787dc1606 100644 (file)
--- a/libjava/java/rmi/server/Unreferenced.java
+++ b/libjava/java/rmi/server/Unreferenced.java
@@ -1,5 +1,5 @@
-/*
-  Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
+/* Unreferenced.java --
+   Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.