[kaffe] CVS kaffe (robilad): Resynced with GNU Classpath: cleaups in java.rmi

Kaffe CVS cvs-commits at kaffe.org
Sat Oct 23 11:07:59 PDT 2004


PatchSet 5340 
Date: 2004/10/23 18:03:34
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
Resynced with GNU Classpath: cleaups in java.rmi

2004-10-23  Dalibor Topic  <robilad at kaffe.org>

        * libraries/javalib/java/rmi/MarshalledObject.java,
        libraries/javalib/java/rmi/Naming.java,
        libraries/javalib/java/rmi/activation/Activatable.java,
        libraries/javalib/java/rmi/activation/ActivationGroup.java,
        libraries/javalib/java/rmi/activation/ActivationGroupDesc.java,
        libraries/javalib/java/rmi/activation/ActivationInstantiator.java,
        libraries/javalib/java/rmi/activation/ActivationMonitor.java,
        libraries/javalib/java/rmi/activation/ActivationSystem.java,
        libraries/javalib/java/rmi/activation/Activator.java,
        libraries/javalib/java/rmi/registry/LocateRegistry.java,
        libraries/javalib/java/rmi/registry/Registry.java,
        libraries/javalib/java/rmi/server/LogStream.java,
        libraries/javalib/java/rmi/server/ObjID.java,
        libraries/javalib/java/rmi/server/RMIClassLoader.java,
        libraries/javalib/java/rmi/server/RMIClientSocketFactory.java,
        libraries/javalib/java/rmi/server/RMIServerSocketFactory.java,
        libraries/javalib/java/rmi/server/RMISocketFactory.java,
        libraries/javalib/java/rmi/server/RemoteCall.java,
        libraries/javalib/java/rmi/server/RemoteServer.java,
        libraries/javalib/java/rmi/server/ServerRef.java,
        libraries/javalib/java/rmi/server/UID.java,
        libraries/javalib/java/rmi/server/UnicastRemoteObject.java:
        Resynced with GNU Classpath.

        2004-10-21  Michael Koch  <konqueror at 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.

Members: 
	ChangeLog:1.2892->1.2893 
	libraries/javalib/java/rmi/MarshalledObject.java:1.6->1.7 
	libraries/javalib/java/rmi/Naming.java:1.6->1.7 
	libraries/javalib/java/rmi/activation/Activatable.java:1.4->1.5 
	libraries/javalib/java/rmi/activation/ActivationGroup.java:1.4->1.5 
	libraries/javalib/java/rmi/activation/ActivationGroupDesc.java:1.4->1.5 
	libraries/javalib/java/rmi/activation/ActivationInstantiator.java:1.5->1.6 
	libraries/javalib/java/rmi/activation/ActivationMonitor.java:1.5->1.6 
	libraries/javalib/java/rmi/activation/ActivationSystem.java:1.4->1.5 
	libraries/javalib/java/rmi/activation/Activator.java:1.5->1.6 
	libraries/javalib/java/rmi/registry/LocateRegistry.java:1.4->1.5 
	libraries/javalib/java/rmi/registry/Registry.java:1.5->1.6 
	libraries/javalib/java/rmi/server/LogStream.java:1.4->1.5 
	libraries/javalib/java/rmi/server/ObjID.java:1.4->1.5 
	libraries/javalib/java/rmi/server/RMIClassLoader.java:1.6->1.7 
	libraries/javalib/java/rmi/server/RMIClientSocketFactory.java:1.5->1.6 
	libraries/javalib/java/rmi/server/RMIServerSocketFactory.java:1.5->1.6 
	libraries/javalib/java/rmi/server/RMISocketFactory.java:1.4->1.5 
	libraries/javalib/java/rmi/server/RemoteCall.java:1.5->1.6 
	libraries/javalib/java/rmi/server/RemoteServer.java:1.5->1.6 
	libraries/javalib/java/rmi/server/ServerRef.java:1.5->1.6 
	libraries/javalib/java/rmi/server/UID.java:1.5->1.6 
	libraries/javalib/java/rmi/server/UnicastRemoteObject.java:1.4->1.5 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.2892 kaffe/ChangeLog:1.2893
--- kaffe/ChangeLog:1.2892	Sat Oct 23 17:15:37 2004
+++ kaffe/ChangeLog	Sat Oct 23 18:03:34 2004
@@ -1,5 +1,56 @@
 2004-10-23  Dalibor Topic  <robilad at kaffe.org>
 
+	* libraries/javalib/java/rmi/MarshalledObject.java,
+	libraries/javalib/java/rmi/Naming.java,
+	libraries/javalib/java/rmi/activation/Activatable.java,
+	libraries/javalib/java/rmi/activation/ActivationGroup.java,
+	libraries/javalib/java/rmi/activation/ActivationGroupDesc.java,
+	libraries/javalib/java/rmi/activation/ActivationInstantiator.java,
+	libraries/javalib/java/rmi/activation/ActivationMonitor.java,
+	libraries/javalib/java/rmi/activation/ActivationSystem.java,
+	libraries/javalib/java/rmi/activation/Activator.java,
+	libraries/javalib/java/rmi/registry/LocateRegistry.java,
+	libraries/javalib/java/rmi/registry/Registry.java,
+	libraries/javalib/java/rmi/server/LogStream.java,
+	libraries/javalib/java/rmi/server/ObjID.java,
+	libraries/javalib/java/rmi/server/RMIClassLoader.java,
+	libraries/javalib/java/rmi/server/RMIClientSocketFactory.java,
+	libraries/javalib/java/rmi/server/RMIServerSocketFactory.java,
+	libraries/javalib/java/rmi/server/RMISocketFactory.java,
+	libraries/javalib/java/rmi/server/RemoteCall.java,
+	libraries/javalib/java/rmi/server/RemoteServer.java,
+	libraries/javalib/java/rmi/server/ServerRef.java,
+	libraries/javalib/java/rmi/server/UID.java,
+	libraries/javalib/java/rmi/server/UnicastRemoteObject.java:
+	Resynced with GNU Classpath.
+
+	2004-10-21  Michael Koch  <konqueror at 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-23  Dalibor Topic  <robilad at kaffe.org>
+
 	* libraries/javalib/java/util/Collections.java,
 	libraries/javalib/java/util/Currency.java,
 	libraries/javalib/java/util/SortedMap.java,
Index: kaffe/libraries/javalib/java/rmi/MarshalledObject.java
diff -u kaffe/libraries/javalib/java/rmi/MarshalledObject.java:1.6 kaffe/libraries/javalib/java/rmi/MarshalledObject.java:1.7
--- kaffe/libraries/javalib/java/rmi/MarshalledObject.java:1.6	Sat Oct 16 16:06:52 2004
+++ kaffe/libraries/javalib/java/rmi/MarshalledObject.java	Sat Oct 23 18:03:38 2004
@@ -35,10 +35,12 @@
 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;
 
Index: kaffe/libraries/javalib/java/rmi/Naming.java
diff -u kaffe/libraries/javalib/java/rmi/Naming.java:1.6 kaffe/libraries/javalib/java/rmi/Naming.java:1.7
--- kaffe/libraries/javalib/java/rmi/Naming.java:1.6	Sat Oct 16 16:06:52 2004
+++ kaffe/libraries/javalib/java/rmi/Naming.java	Sat Oct 23 18:03:38 2004
@@ -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 @@
 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 {
 
Index: kaffe/libraries/javalib/java/rmi/activation/Activatable.java
diff -u kaffe/libraries/javalib/java/rmi/activation/Activatable.java:1.4 kaffe/libraries/javalib/java/rmi/activation/Activatable.java:1.5
--- kaffe/libraries/javalib/java/rmi/activation/Activatable.java:1.4	Sat Oct 16 16:06:52 2004
+++ kaffe/libraries/javalib/java/rmi/activation/Activatable.java	Sat Oct 23 18:03:39 2004
@@ -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 @@
 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 {
Index: kaffe/libraries/javalib/java/rmi/activation/ActivationGroup.java
diff -u kaffe/libraries/javalib/java/rmi/activation/ActivationGroup.java:1.4 kaffe/libraries/javalib/java/rmi/activation/ActivationGroup.java:1.5
--- kaffe/libraries/javalib/java/rmi/activation/ActivationGroup.java:1.4	Sat Oct 16 16:06:52 2004
+++ kaffe/libraries/javalib/java/rmi/activation/ActivationGroup.java	Sat Oct 23 18:03:39 2004
@@ -35,17 +35,17 @@
 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 {
Index: kaffe/libraries/javalib/java/rmi/activation/ActivationGroupDesc.java
diff -u kaffe/libraries/javalib/java/rmi/activation/ActivationGroupDesc.java:1.4 kaffe/libraries/javalib/java/rmi/activation/ActivationGroupDesc.java:1.5
--- kaffe/libraries/javalib/java/rmi/activation/ActivationGroupDesc.java:1.4	Sat Oct 16 16:06:52 2004
+++ kaffe/libraries/javalib/java/rmi/activation/ActivationGroupDesc.java	Sat Oct 23 18:03:39 2004
@@ -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 @@
 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
 {
Index: kaffe/libraries/javalib/java/rmi/activation/ActivationInstantiator.java
diff -u kaffe/libraries/javalib/java/rmi/activation/ActivationInstantiator.java:1.5 kaffe/libraries/javalib/java/rmi/activation/ActivationInstantiator.java:1.6
--- kaffe/libraries/javalib/java/rmi/activation/ActivationInstantiator.java:1.5	Sat Oct 16 16:06:52 2004
+++ kaffe/libraries/javalib/java/rmi/activation/ActivationInstantiator.java	Sat Oct 23 18:03:39 2004
@@ -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 @@
 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
Index: kaffe/libraries/javalib/java/rmi/activation/ActivationMonitor.java
diff -u kaffe/libraries/javalib/java/rmi/activation/ActivationMonitor.java:1.5 kaffe/libraries/javalib/java/rmi/activation/ActivationMonitor.java:1.6
--- kaffe/libraries/javalib/java/rmi/activation/ActivationMonitor.java:1.5	Sat Oct 16 16:06:52 2004
+++ kaffe/libraries/javalib/java/rmi/activation/ActivationMonitor.java	Sat Oct 23 18:03:39 2004
@@ -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 @@
 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
 {
Index: kaffe/libraries/javalib/java/rmi/activation/ActivationSystem.java
diff -u kaffe/libraries/javalib/java/rmi/activation/ActivationSystem.java:1.4 kaffe/libraries/javalib/java/rmi/activation/ActivationSystem.java:1.5
--- kaffe/libraries/javalib/java/rmi/activation/ActivationSystem.java:1.4	Sat Oct 16 16:06:52 2004
+++ kaffe/libraries/javalib/java/rmi/activation/ActivationSystem.java	Sat Oct 23 18:03:39 2004
@@ -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.
 
@@ -34,6 +34,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;
 
Index: kaffe/libraries/javalib/java/rmi/activation/Activator.java
diff -u kaffe/libraries/javalib/java/rmi/activation/Activator.java:1.5 kaffe/libraries/javalib/java/rmi/activation/Activator.java:1.6
--- kaffe/libraries/javalib/java/rmi/activation/Activator.java:1.5	Sat Oct 16 16:06:52 2004
+++ kaffe/libraries/javalib/java/rmi/activation/Activator.java	Sat Oct 23 18:03:39 2004
@@ -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 @@
 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
Index: kaffe/libraries/javalib/java/rmi/registry/LocateRegistry.java
diff -u kaffe/libraries/javalib/java/rmi/registry/LocateRegistry.java:1.4 kaffe/libraries/javalib/java/rmi/registry/LocateRegistry.java:1.5
--- kaffe/libraries/javalib/java/rmi/registry/LocateRegistry.java:1.4	Sat Oct 16 16:06:53 2004
+++ kaffe/libraries/javalib/java/rmi/registry/LocateRegistry.java	Sat Oct 23 18:03:40 2004
@@ -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 @@
 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 {
 
Index: kaffe/libraries/javalib/java/rmi/registry/Registry.java
diff -u kaffe/libraries/javalib/java/rmi/registry/Registry.java:1.5 kaffe/libraries/javalib/java/rmi/registry/Registry.java:1.6
--- kaffe/libraries/javalib/java/rmi/registry/Registry.java:1.5	Sat Oct 16 16:06:53 2004
+++ kaffe/libraries/javalib/java/rmi/registry/Registry.java	Sat Oct 23 18:03:40 2004
@@ -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 @@
 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
 {
Index: kaffe/libraries/javalib/java/rmi/server/LogStream.java
diff -u kaffe/libraries/javalib/java/rmi/server/LogStream.java:1.4 kaffe/libraries/javalib/java/rmi/server/LogStream.java:1.5
--- kaffe/libraries/javalib/java/rmi/server/LogStream.java:1.4	Sat Oct 16 16:06:54 2004
+++ kaffe/libraries/javalib/java/rmi/server/LogStream.java	Sat Oct 23 18:03:41 2004
@@ -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 @@
 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
Index: kaffe/libraries/javalib/java/rmi/server/ObjID.java
diff -u kaffe/libraries/javalib/java/rmi/server/ObjID.java:1.4 kaffe/libraries/javalib/java/rmi/server/ObjID.java:1.5
--- kaffe/libraries/javalib/java/rmi/server/ObjID.java:1.4	Sat Oct 16 16:06:54 2004
+++ kaffe/libraries/javalib/java/rmi/server/ObjID.java	Sat Oct 23 18:03:41 2004
@@ -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 @@
 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;
Index: kaffe/libraries/javalib/java/rmi/server/RMIClassLoader.java
diff -u kaffe/libraries/javalib/java/rmi/server/RMIClassLoader.java:1.6 kaffe/libraries/javalib/java/rmi/server/RMIClassLoader.java:1.7
--- kaffe/libraries/javalib/java/rmi/server/RMIClassLoader.java:1.6	Sat Oct 16 16:06:54 2004
+++ kaffe/libraries/javalib/java/rmi/server/RMIClassLoader.java	Sat Oct 23 18:03:42 2004
@@ -1,5 +1,5 @@
 /* RMIClassLoader.java --
-   Copyright (c) 1996, 1997, 1998, 1999, 2002, 2003
+   Copyright (c) 1996, 1997, 1998, 1999, 2002, 2003, 2004
    Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -55,7 +55,7 @@
  */
 public class RMIClassLoader
 {
-  static private class MyClassLoader extends URLClassLoader
+  private static class MyClassLoader extends URLClassLoader
   {
     private MyClassLoader (URL[] urls, ClassLoader parent, String annotation)
     {
Index: kaffe/libraries/javalib/java/rmi/server/RMIClientSocketFactory.java
diff -u kaffe/libraries/javalib/java/rmi/server/RMIClientSocketFactory.java:1.5 kaffe/libraries/javalib/java/rmi/server/RMIClientSocketFactory.java:1.6
--- kaffe/libraries/javalib/java/rmi/server/RMIClientSocketFactory.java:1.5	Sat Oct 16 16:06:54 2004
+++ kaffe/libraries/javalib/java/rmi/server/RMIClientSocketFactory.java	Sat Oct 23 18:03:42 2004
@@ -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 @@
 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
 {
Index: kaffe/libraries/javalib/java/rmi/server/RMIServerSocketFactory.java
diff -u kaffe/libraries/javalib/java/rmi/server/RMIServerSocketFactory.java:1.5 kaffe/libraries/javalib/java/rmi/server/RMIServerSocketFactory.java:1.6
--- kaffe/libraries/javalib/java/rmi/server/RMIServerSocketFactory.java:1.5	Sat Oct 16 16:06:54 2004
+++ kaffe/libraries/javalib/java/rmi/server/RMIServerSocketFactory.java	Sat Oct 23 18:03:42 2004
@@ -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 @@
 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
 {
Index: kaffe/libraries/javalib/java/rmi/server/RMISocketFactory.java
diff -u kaffe/libraries/javalib/java/rmi/server/RMISocketFactory.java:1.4 kaffe/libraries/javalib/java/rmi/server/RMISocketFactory.java:1.5
--- kaffe/libraries/javalib/java/rmi/server/RMISocketFactory.java:1.4	Sat Oct 16 16:06:54 2004
+++ kaffe/libraries/javalib/java/rmi/server/RMISocketFactory.java	Sat Oct 23 18:03:42 2004
@@ -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,19 +35,21 @@
 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
 {
-  static private RMISocketFactory defaultFactory;
-  static private RMISocketFactory currentFactory;
-  static private RMIFailureHandler currentHandler;
+  private static RMISocketFactory defaultFactory;
+  private static RMISocketFactory currentFactory;
+  private static RMIFailureHandler currentHandler;
 
   static
     {
Index: kaffe/libraries/javalib/java/rmi/server/RemoteCall.java
diff -u kaffe/libraries/javalib/java/rmi/server/RemoteCall.java:1.5 kaffe/libraries/javalib/java/rmi/server/RemoteCall.java:1.6
--- kaffe/libraries/javalib/java/rmi/server/RemoteCall.java:1.5	Sat Oct 16 16:06:54 2004
+++ kaffe/libraries/javalib/java/rmi/server/RemoteCall.java	Sat Oct 23 18:03:42 2004
@@ -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 @@
 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;
 
 /**
Index: kaffe/libraries/javalib/java/rmi/server/RemoteServer.java
diff -u kaffe/libraries/javalib/java/rmi/server/RemoteServer.java:1.5 kaffe/libraries/javalib/java/rmi/server/RemoteServer.java:1.6
--- kaffe/libraries/javalib/java/rmi/server/RemoteServer.java:1.5	Sat Oct 16 16:06:54 2004
+++ kaffe/libraries/javalib/java/rmi/server/RemoteServer.java	Sat Oct 23 18:03:42 2004
@@ -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 @@
 
 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() {
Index: kaffe/libraries/javalib/java/rmi/server/ServerRef.java
diff -u kaffe/libraries/javalib/java/rmi/server/ServerRef.java:1.5 kaffe/libraries/javalib/java/rmi/server/ServerRef.java:1.6
--- kaffe/libraries/javalib/java/rmi/server/ServerRef.java:1.5	Sat Oct 16 16:06:54 2004
+++ kaffe/libraries/javalib/java/rmi/server/ServerRef.java	Sat Oct 23 18:03:42 2004
@@ -35,12 +35,11 @@
 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
 {
Index: kaffe/libraries/javalib/java/rmi/server/UID.java
diff -u kaffe/libraries/javalib/java/rmi/server/UID.java:1.5 kaffe/libraries/javalib/java/rmi/server/UID.java:1.6
--- kaffe/libraries/javalib/java/rmi/server/UID.java:1.5	Sat Oct 16 16:06:54 2004
+++ kaffe/libraries/javalib/java/rmi/server/UID.java	Sat Oct 23 18:03:42 2004
@@ -35,10 +35,11 @@
 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;
 
Index: kaffe/libraries/javalib/java/rmi/server/UnicastRemoteObject.java
diff -u kaffe/libraries/javalib/java/rmi/server/UnicastRemoteObject.java:1.4 kaffe/libraries/javalib/java/rmi/server/UnicastRemoteObject.java:1.5
--- kaffe/libraries/javalib/java/rmi/server/UnicastRemoteObject.java:1.4	Sat Oct 16 16:06:54 2004
+++ kaffe/libraries/javalib/java/rmi/server/UnicastRemoteObject.java	Sat Oct 23 18:03:42 2004
@@ -38,10 +38,11 @@
 
 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
 {




More information about the kaffe mailing list