MarshalledObject.java, [...]: Import cleanup.

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

	* java/rmi/MarshalledObject.java,
	java/rmi/Naming.java,
	java/rmi/activation/Activatable.java,
	java/rmi/activation/ActivationGroup.java,
	java/rmi/activation/ActivationGroupDesc.java,
	java/rmi/activation/ActivationInstantiator.java,
	java/rmi/activation/ActivationMonitor.java,
	java/rmi/activation/ActivationSystem.java,
	java/rmi/activation/Activator.java,
	java/rmi/registry/LocateRegistry.java,
	java/rmi/registry/Registry.java,
	java/rmi/server/LogStream.java,
	java/rmi/server/ObjID.java,
	java/rmi/server/RMIClientSocketFactory.java,
	java/rmi/server/RMIServerSocketFactory.java,
	java/rmi/server/RMISocketFactory.java,
	java/rmi/server/RemoteCall.java,
	java/rmi/server/RemoteServer.java,
	java/rmi/server/ServerRef.java,
	java/rmi/server/UID.java,
	java/rmi/server/UnicastRemoteObject.java:
	Import cleanup.

From-SVN: r89396

21 files changed, 85 insertions, 68 deletions

diff --git a/libjava/java/rmi/MarshalledObject.java b/libjava/java/rmi/MarshalledObject.java
index d6c594b..0ea62f4 100644
--- a/libjava/java/rmi/MarshalledObject.java
+++ b/libjava/java/rmi/MarshalledObject.java
@@ -35,10 +35,12 @@ 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;
 
 import gnu.java.rmi.RMIMarshalledObjectInputStream;
 import gnu.java.rmi.RMIMarshalledObjectOutputStream;
+
 import java.io.ByteArrayOutputStream;
 import java.io.Serializable;
 
diff --git a/libjava/java/rmi/Naming.java b/libjava/java/rmi/Naming.java
index 3b92020..74ad962 100644
--- a/libjava/java/rmi/Naming.java
+++ b/libjava/java/rmi/Naming.java
@@ -1,5 +1,5 @@
 /* Naming.java --
-   Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
+   Copyright (c) 1996, 1997, 1998, 1999, 2004  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -35,12 +35,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 java.rmi;
 
 import java.net.MalformedURLException;
 import java.net.URL;
-import java.rmi.registry.Registry;
 import java.rmi.registry.LocateRegistry;
+import java.rmi.registry.Registry;
 
 public final class Naming {
 
diff --git a/libjava/java/rmi/activation/Activatable.java b/libjava/java/rmi/activation/Activatable.java
index b237e69a..604c702 100644
--- a/libjava/java/rmi/activation/Activatable.java
+++ b/libjava/java/rmi/activation/Activatable.java
@@ -1,5 +1,5 @@
 /* Activatable.java --
-   Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
+   Copyright (c) 1996, 1997, 1998, 1999, 2004  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -35,19 +35,19 @@ 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.activation;
 
-import java.rmi.server.RemoteServer;
+import java.rmi.MarshalledObject;
+import java.rmi.NoSuchObjectException;
+import java.rmi.Remote;
+import java.rmi.RemoteException;
 import java.rmi.server.RMIClientSocketFactory;
 import java.rmi.server.RMIServerSocketFactory;
-import java.rmi.RemoteException;
-import java.rmi.Remote;
-import java.rmi.NoSuchObjectException;
-import java.rmi.MarshalledObject;
-
-public abstract class Activatable
-	extends RemoteServer {
+import java.rmi.server.RemoteServer;
 
+public abstract class Activatable extends RemoteServer
+{
 static final long serialVersionUID = -3120617863591563455L;
 
 protected Activatable(String location, MarshalledObject data, boolean restart, int port) throws ActivationException, RemoteException {
diff --git a/libjava/java/rmi/activation/ActivationGroup.java b/libjava/java/rmi/activation/ActivationGroup.java
index 69f9d1d..2b97d20 100644
--- a/libjava/java/rmi/activation/ActivationGroup.java
+++ b/libjava/java/rmi/activation/ActivationGroup.java
@@ -35,17 +35,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 java.rmi.activation;
 
-import java.rmi.server.UnicastRemoteObject;
-import java.rmi.RemoteException;
-import java.rmi.Remote;
 import java.rmi.MarshalledObject;
+import java.rmi.Remote;
+import java.rmi.RemoteException;
+import java.rmi.server.UnicastRemoteObject;
 
-public abstract class ActivationGroup
-	extends UnicastRemoteObject
-	implements ActivationInstantiator {
-
+public abstract class ActivationGroup extends UnicastRemoteObject
+  implements ActivationInstantiator
+{
 static final long serialVersionUID = -7696947875314805420L;
 
 protected ActivationGroup(ActivationGroupID groupID) throws RemoteException {
diff --git a/libjava/java/rmi/activation/ActivationGroupDesc.java b/libjava/java/rmi/activation/ActivationGroupDesc.java
index 67d9711..14ade88 100644
--- a/libjava/java/rmi/activation/ActivationGroupDesc.java
+++ b/libjava/java/rmi/activation/ActivationGroupDesc.java
@@ -1,5 +1,5 @@
 /* ActivationGroupDesc.java --
-   Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
+   Copyright (c) 1996, 1997, 1998, 1999, 2004  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -35,11 +35,12 @@ 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.activation;
 
 import java.io.Serializable;
-import java.util.Properties;
 import java.rmi.MarshalledObject;
+import java.util.Properties;
 
 public final class ActivationGroupDesc implements Serializable
 {
diff --git a/libjava/java/rmi/activation/ActivationInstantiator.java b/libjava/java/rmi/activation/ActivationInstantiator.java
index 7fbcee5..5afa27d 100644
--- a/libjava/java/rmi/activation/ActivationInstantiator.java
+++ b/libjava/java/rmi/activation/ActivationInstantiator.java
@@ -1,5 +1,5 @@
 /* ActivationInstantiator.java --
-   Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
+   Copyright (c) 1996, 1997, 1998, 1999, 2004  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -35,11 +35,12 @@ 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.activation;
 
+import java.rmi.MarshalledObject;
 import java.rmi.Remote;
 import java.rmi.RemoteException;
-import java.rmi.MarshalledObject;
 
 public interface ActivationInstantiator
   extends Remote
diff --git a/libjava/java/rmi/activation/ActivationMonitor.java b/libjava/java/rmi/activation/ActivationMonitor.java
index 6ce01f1..c3736a4 100644
--- a/libjava/java/rmi/activation/ActivationMonitor.java
+++ b/libjava/java/rmi/activation/ActivationMonitor.java
@@ -1,5 +1,5 @@
 /* ActivationMonitor.java --
-   Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
+   Copyright (c) 1996, 1997, 1998, 1999, 2004  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -35,11 +35,12 @@ 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.activation;
 
+import java.rmi.MarshalledObject;
 import java.rmi.Remote;
 import java.rmi.RemoteException;
-import java.rmi.MarshalledObject;
 
 public interface ActivationMonitor extends Remote
 {
diff --git a/libjava/java/rmi/activation/ActivationSystem.java b/libjava/java/rmi/activation/ActivationSystem.java
index 9442389..55dedd6 100644
--- a/libjava/java/rmi/activation/ActivationSystem.java
+++ b/libjava/java/rmi/activation/ActivationSystem.java
@@ -1,5 +1,5 @@
 /* ActivationSystem.java --
-i  Copyright (c) 1996, 1997, 1998, 1999, 2004  Free Software Foundation, Inc.
+   Copyright (c) 1996, 1997, 1998, 1999, 2004  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -35,6 +35,7 @@ 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.activation;
 
 import java.rmi.Remote;
diff --git a/libjava/java/rmi/activation/Activator.java b/libjava/java/rmi/activation/Activator.java
index c9e6ef7..4d80c08 100644
--- a/libjava/java/rmi/activation/Activator.java
+++ b/libjava/java/rmi/activation/Activator.java
@@ -1,5 +1,5 @@
 /* Activator.java --
-   Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
+   Copyright (c) 1996, 1997, 1998, 1999, 2004  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -35,11 +35,12 @@ 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.activation;
 
+import java.rmi.MarshalledObject;
 import java.rmi.Remote;
 import java.rmi.RemoteException;
-import java.rmi.MarshalledObject;
 
 public interface Activator
   extends Remote
diff --git a/libjava/java/rmi/registry/LocateRegistry.java b/libjava/java/rmi/registry/LocateRegistry.java
index d3ccd8313..aaf9333 100644
--- a/libjava/java/rmi/registry/LocateRegistry.java
+++ b/libjava/java/rmi/registry/LocateRegistry.java
@@ -1,5 +1,5 @@
 /* LocateRegistry.java --
-   Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
+   Copyright (c) 1996, 1997, 1998, 1999, 2004  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -35,18 +35,19 @@ 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.registry;
 
+import gnu.java.rmi.registry.RegistryImpl;
+import gnu.java.rmi.registry.RegistryImpl_Stub;
+import gnu.java.rmi.server.UnicastRef;
+
 import java.rmi.RemoteException;
+import java.rmi.server.ObjID;
 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 gnu.java.rmi.server.UnicastRef;
-import gnu.java.rmi.registry.RegistryImpl;
-import gnu.java.rmi.registry.RegistryImpl_Stub;
 
 public final class LocateRegistry {
 
diff --git a/libjava/java/rmi/registry/Registry.java b/libjava/java/rmi/registry/Registry.java
index eaf2be9..46198b6 100644
--- a/libjava/java/rmi/registry/Registry.java
+++ b/libjava/java/rmi/registry/Registry.java
@@ -1,5 +1,5 @@
 /* Registry.java --
-   Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
+   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.registry;
 
-import java.rmi.RemoteException;
-import java.rmi.NotBoundException;
 import java.rmi.AccessException;
 import java.rmi.AlreadyBoundException;
+import java.rmi.NotBoundException;
 import java.rmi.Remote;
+import java.rmi.RemoteException;
 
 public interface Registry extends Remote
 {
diff --git a/libjava/java/rmi/server/LogStream.java b/libjava/java/rmi/server/LogStream.java
index 3a58f2d..57a9e6e 100644
--- a/libjava/java/rmi/server/LogStream.java
+++ b/libjava/java/rmi/server/LogStream.java
@@ -1,5 +1,5 @@
 /* LogStream.java --
-   Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
+   Copyright (c) 1996, 1997, 1998, 1999, 2004  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -35,10 +35,11 @@ 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.io.PrintStream;
 import java.io.OutputStream;
+import java.io.PrintStream;
 
 /**
  * @deprecated
diff --git a/libjava/java/rmi/server/ObjID.java b/libjava/java/rmi/server/ObjID.java
index 6f24057..c7f470f 100644
--- a/libjava/java/rmi/server/ObjID.java
+++ b/libjava/java/rmi/server/ObjID.java
@@ -1,5 +1,5 @@
-/* ObjID.java
-   Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
+/* ObjID.java --
+   Copyright (c) 1996, 1997, 1998, 1999, 2004  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -35,18 +35,18 @@ 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.io.Serializable;
-import java.io.ObjectOutput;
-import java.io.ObjectInput;
-import java.io.IOException;
 import java.io.DataInput;
 import java.io.DataOutput;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.io.Serializable;
 
-public final class ObjID
-	implements Serializable {
-
+public final class ObjID implements Serializable
+{
 static final long serialVersionUID = -6386392263968365220L;
 
 private static long next = 0x8000000000000000L;
diff --git a/libjava/java/rmi/server/RMIClientSocketFactory.java b/libjava/java/rmi/server/RMIClientSocketFactory.java
index 6c3c4a1..0662a68 100644
--- a/libjava/java/rmi/server/RMIClientSocketFactory.java
+++ b/libjava/java/rmi/server/RMIClientSocketFactory.java
@@ -1,5 +1,5 @@
 /* RMIClientSocketFactory.java --
-   Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
+   Copyright (c) 1996, 1997, 1998, 1999, 2004  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -35,10 +35,11 @@ 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.net.Socket;
 import java.io.IOException;
+import java.net.Socket;
 
 public interface RMIClientSocketFactory
 {
diff --git a/libjava/java/rmi/server/RMIServerSocketFactory.java b/libjava/java/rmi/server/RMIServerSocketFactory.java
index f0fa59f..6f9fe1c 100644
--- a/libjava/java/rmi/server/RMIServerSocketFactory.java
+++ b/libjava/java/rmi/server/RMIServerSocketFactory.java
@@ -1,5 +1,5 @@
 /* RMIServerSocketFactory.java --
-   Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
+   Copyright (c) 1996, 1997, 1998, 1999, 2004  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -35,10 +35,11 @@ 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.net.ServerSocket;
 import java.io.IOException;
+import java.net.ServerSocket;
 
 public interface RMIServerSocketFactory
 {
diff --git a/libjava/java/rmi/server/RMISocketFactory.java b/libjava/java/rmi/server/RMISocketFactory.java
index 3b068db..85ff580 100644
--- a/libjava/java/rmi/server/RMISocketFactory.java
+++ b/libjava/java/rmi/server/RMISocketFactory.java
@@ -1,5 +1,5 @@
 /* RMISocketFactory.java --
-   Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
+   Copyright (c) 1996, 1997, 1998, 1999, 2004  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -35,13 +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 java.rmi.server;
 
-import java.net.Socket;
-import java.net.ServerSocket;
-import java.io.IOException;
 import gnu.java.rmi.server.RMIDefaultSocketFactory;
 
+import java.io.IOException;
+import java.net.ServerSocket;
+import java.net.Socket;
+
 public abstract class RMISocketFactory
   implements RMIClientSocketFactory, RMIServerSocketFactory
 {
diff --git a/libjava/java/rmi/server/RemoteCall.java b/libjava/java/rmi/server/RemoteCall.java
index 6596eb3..fd8dc48 100644
--- a/libjava/java/rmi/server/RemoteCall.java
+++ b/libjava/java/rmi/server/RemoteCall.java
@@ -1,5 +1,5 @@
 /* RemoteCall.java --
-   Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
+   Copyright (c) 1996, 1997, 1998, 1999, 2004  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -35,11 +35,12 @@ 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.io.IOException;
-import java.io.ObjectOutput;
 import java.io.ObjectInput;
+import java.io.ObjectOutput;
 import java.io.StreamCorruptedException;
 
 /**
diff --git a/libjava/java/rmi/server/RemoteServer.java b/libjava/java/rmi/server/RemoteServer.java
index 5eef3c8..a10143c 100644
--- a/libjava/java/rmi/server/RemoteServer.java
+++ b/libjava/java/rmi/server/RemoteServer.java
@@ -1,5 +1,5 @@
 /* RemoteServer.java --
-   Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
+   Copyright (c) 1996, 1997, 1998, 1999, 2004  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -37,13 +37,13 @@ exception statement from your version. */
 
 package java.rmi.server;
 
-import java.io.OutputStream;
-import java.io.PrintStream;
 import gnu.java.rmi.server.RMIIncomingThread;
 
-public abstract class RemoteServer
-	extends RemoteObject {
+import java.io.OutputStream;
+import java.io.PrintStream;
 
+public abstract class RemoteServer extends RemoteObject
+{
 private static final long serialVersionUID = -4100238210092549637L;
 
 protected RemoteServer() {
diff --git a/libjava/java/rmi/server/ServerRef.java b/libjava/java/rmi/server/ServerRef.java
index b26253c..a6e9867 100644
--- a/libjava/java/rmi/server/ServerRef.java
+++ b/libjava/java/rmi/server/ServerRef.java
@@ -35,12 +35,11 @@ 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.rmi.Remote;
 import java.rmi.RemoteException;
-import java.rmi.server.RemoteStub;
-import java.rmi.server.ServerNotActiveException;
 
 public interface ServerRef extends RemoteRef
 {
diff --git a/libjava/java/rmi/server/UID.java b/libjava/java/rmi/server/UID.java
index 40ff377..c6fd30e 100644
--- a/libjava/java/rmi/server/UID.java
+++ b/libjava/java/rmi/server/UID.java
@@ -35,10 +35,11 @@ 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.io.DataOutput;
 import java.io.DataInput;
+import java.io.DataOutput;
 import java.io.IOException;
 import java.io.Serializable;
 
diff --git a/libjava/java/rmi/server/UnicastRemoteObject.java b/libjava/java/rmi/server/UnicastRemoteObject.java
index d8e1a02..6e8fb25 100644
--- a/libjava/java/rmi/server/UnicastRemoteObject.java
+++ b/libjava/java/rmi/server/UnicastRemoteObject.java
@@ -38,11 +38,12 @@ exception statement from your version. */
 
 package java.rmi.server;
 
-import java.rmi.RemoteException;
-import java.rmi.Remote;
-import java.rmi.NoSuchObjectException;
 import gnu.java.rmi.server.UnicastServerRef;
 
+import java.rmi.NoSuchObjectException;
+import java.rmi.Remote;
+import java.rmi.RemoteException;
+
 public class UnicastRemoteObject extends RemoteServer
 {
 private static final long serialVersionUID = 4974527148936298033L;