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

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index dbbbe010626b6a39e10a779e2ec055ff8461ebea..6c6d36d1d418fd0ce78b39832e1d7b0cdc550069 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,28 @@
+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.
+
 2004-10-21  Tom Tromey  <tromey@redhat.com>
 
        * java/util/zip/InflaterInputStream.java (fill): Don't throw an

diff --git a/libjava/java/rmi/MarshalledObject.java b/libjava/java/rmi/MarshalledObject.java
index d6c594b8bb0f8f6b13e877faa14fe1a49f7c7c83..0ea62f46f37c5c69f2dc269af1afeeb20c2f8d78 100644 (file)
--- 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 3b92020196d88cb3a664d4f86c9ac65480a70abf..74ad9626256a77e2c60a6297924a25945b799b28 100644 (file)
--- 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 b237e69a40e1e911ee6a5c2ecde1b1f8de67fbeb..604c7021f86aa93c43f5ce1d287f9fff97be51e8 100644 (file)
--- 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 69f9d1d094bf4f85a6f67e2e858592784e7af593..2b97d20df4f1f0a5247905bae6bb25f0deb82d8c 100644 (file)
--- 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 67d971137dfa6c7c9441e2c426c4ccaa146ecb09..14ade880cc53f10c68cc54acbab3c900d9e86658 100644 (file)
--- 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 7fbcee5b9933444afbcd5fa1504c1f83fb2a37dc..5afa27d859b81870d08e94a2b85a17400f2c6b1e 100644 (file)
--- 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 6ce01f116cbf3ed473f7de7420f68a2f73f14075..c3736a470a7bd426cde7e6526d158a76daf5be05 100644 (file)
--- 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 944238941c3b1bab4c7954aae16e9421acb12fa9..55dedd6e958ab48eeb1a089dfc71f13c37478c2d 100644 (file)
--- 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 c9e6ef75b78a1e9b08509677e6e5b8be948a6acd..4d80c08d70adeca9b446de7ddc3b7d3a2e1f4490 100644 (file)
--- 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 d3ccd831309c707db6e319be835602b12f5a5290..aaf9333f3b87c485a24e34711afbc24e35daf106 100644 (file)
--- 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 eaf2be997a5d57be1a18bf6c4e830549e2ebaf88..46198b6421c217ef9e5e261e87534f92386a888d 100644 (file)
--- 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 3a58f2dd86e30578db6029810a764149a32a19b9..57a9e6e98b38c851146897c31f2fe0871ca83fe0 100644 (file)
--- 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 6f24057fcfc87321e8f8d002e0fad0015555d598..c7f470fd834fd5abd1212c05eb0ad8cd5634b991 100644 (file)
--- 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 6c3c4a1d3a131e2d13a7af89836f067e2b785108..0662a680143a8410e6b0ce868593eeaab95b1943 100644 (file)
--- 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 f0fa59f502e6cc020a01db37c261ec2ecec56ba4..6f9fe1c084fd117d887bed294302991e743b9a0c 100644 (file)
--- 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 3b068db869dd9a705d6b6a840172f12779f4ac6a..85ff5806d10f0551544c4e677fb70de7232eaa89 100644 (file)
--- 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 6596eb3e5a977c0e37fced04ac62578334c86335..fd8dc485434852581ed8ddb0461cd647dd54999f 100644 (file)
--- 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 5eef3c8d86599093bfa9a302e11f7a24ebaaa217..a10143c97af265f6e2fae1ed1d0da936ee0b0c26 100644 (file)
--- 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 b26253cec519d256fd20f0d37cd0dc64fa236d4f..a6e986750ba3e0596cbade6fde56acdeb2fed77f 100644 (file)
--- 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 40ff3770b2618dbc40c7c0a6ace36570c94ead14..c6fd30e463a3574f8678af389d64e55832a3c83f 100644 (file)
--- 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 d8e1a0227d224e07997719fc021f5f3d484d51dc..6e8fb253820b9989aacb198261573dce9c1c8d09 100644 (file)
--- 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;