diff options
Diffstat (limited to 'libjava/gnu/java/rmi')
15 files changed, 55 insertions, 53 deletions
diff --git a/libjava/gnu/java/rmi/RMIMarshalledObjectInputStream.java b/libjava/gnu/java/rmi/RMIMarshalledObjectInputStream.java index 8835280a0e0..e20dda8eb78 100644 --- a/libjava/gnu/java/rmi/RMIMarshalledObjectInputStream.java +++ b/libjava/gnu/java/rmi/RMIMarshalledObjectInputStream.java @@ -39,9 +39,10 @@ exception statement from your version. */ package gnu.java.rmi; import gnu.java.rmi.server.RMIObjectInputStream; -import java.io.ObjectInputStream; -import java.io.IOException; + import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.io.ObjectInputStream; /** * This class is only for java.rmi.MarshalledObject to deserialize object from diff --git a/libjava/gnu/java/rmi/RMIMarshalledObjectOutputStream.java b/libjava/gnu/java/rmi/RMIMarshalledObjectOutputStream.java index 53a5bf159df..931116a2234 100644 --- a/libjava/gnu/java/rmi/RMIMarshalledObjectOutputStream.java +++ b/libjava/gnu/java/rmi/RMIMarshalledObjectOutputStream.java @@ -40,10 +40,10 @@ 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.io.ObjectOutputStream; +import java.io.OutputStream; /** * This class is only for java.rmi.MarshalledObject to serialize object and diff --git a/libjava/gnu/java/rmi/dgc/DGCImpl.java b/libjava/gnu/java/rmi/dgc/DGCImpl.java index 483ac54f192..a41dabdedfe 100644 --- a/libjava/gnu/java/rmi/dgc/DGCImpl.java +++ b/libjava/gnu/java/rmi/dgc/DGCImpl.java @@ -1,5 +1,6 @@ -/* - Copyright (c) 1996, 1997, 1998, 1999, 2002 Free Software Foundation, Inc. +/* DGCImpl.java -- + Copyright (c) 1996, 1997, 1998, 1999, 2002, 2005 + Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -37,14 +38,14 @@ exception statement from your version. */ package gnu.java.rmi.dgc; +import gnu.java.rmi.server.UnicastServerRef; + +import java.rmi.RemoteException; import java.rmi.dgc.DGC; import java.rmi.dgc.Lease; import java.rmi.dgc.VMID; import java.rmi.server.ObjID; -import java.rmi.RemoteException; import java.rmi.server.RMISocketFactory; -import gnu.java.rmi.server.UnicastServerRef; - import java.util.Hashtable; /** diff --git a/libjava/gnu/java/rmi/registry/RegistryImpl.java b/libjava/gnu/java/rmi/registry/RegistryImpl.java index 43033c4b8ad..056ab804cd1 100644 --- a/libjava/gnu/java/rmi/registry/RegistryImpl.java +++ b/libjava/gnu/java/rmi/registry/RegistryImpl.java @@ -1,6 +1,6 @@ -/* - Copyright (c) 1996, 1997, 1998, 1999, 2002, 2005 - Free Software Foundation, Inc. +/* RegistryImpl.java -- + Copyright (c) 1996, 1997, 1998, 1999, 2002, 2005 + Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -38,21 +38,22 @@ exception statement from your version. */ package gnu.java.rmi.registry; -import java.rmi.registry.Registry; -import java.rmi.registry.LocateRegistry; -import java.rmi.RemoteException; -import java.rmi.NotBoundException; +import gnu.java.rmi.server.UnicastServerRef; + import java.rmi.AccessException; import java.rmi.AlreadyBoundException; +import java.rmi.NotBoundException; import java.rmi.Remote; -import java.rmi.server.UnicastRemoteObject; +import java.rmi.RemoteException; +import java.rmi.registry.LocateRegistry; +import java.rmi.registry.Registry; import java.rmi.server.ObjID; -import java.util.Hashtable; -import java.util.Enumeration; -import java.rmi.server.RMISocketFactory; import java.rmi.server.RMIClientSocketFactory; import java.rmi.server.RMIServerSocketFactory; -import gnu.java.rmi.server.UnicastServerRef; +import java.rmi.server.RMISocketFactory; +import java.rmi.server.UnicastRemoteObject; +import java.util.Enumeration; +import java.util.Hashtable; public class RegistryImpl extends UnicastRemoteObject implements Registry { diff --git a/libjava/gnu/java/rmi/server/ProtocolConstants.java b/libjava/gnu/java/rmi/server/ProtocolConstants.java index 7837a8e5132..9f214c96aa9 100644 --- a/libjava/gnu/java/rmi/server/ProtocolConstants.java +++ b/libjava/gnu/java/rmi/server/ProtocolConstants.java @@ -1,5 +1,5 @@ -/* - Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc. +/* ProtocolConstants.java -- + Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc. This file is part of GNU Classpath. diff --git a/libjava/gnu/java/rmi/server/RMIDefaultSocketFactory.java b/libjava/gnu/java/rmi/server/RMIDefaultSocketFactory.java index 887be9a4dd9..b58be1adefd 100644 --- a/libjava/gnu/java/rmi/server/RMIDefaultSocketFactory.java +++ b/libjava/gnu/java/rmi/server/RMIDefaultSocketFactory.java @@ -1,5 +1,5 @@ -/* - Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc. +/* RMIDefaultSocketFactory.java -- + Copyright (c) 1996, 1997, 1998, 1999, 2005 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -37,10 +37,10 @@ exception statement from your version. */ package gnu.java.rmi.server; -import java.rmi.server.RMISocketFactory; import java.io.IOException; -import java.net.Socket; import java.net.ServerSocket; +import java.net.Socket; +import java.rmi.server.RMISocketFactory; public class RMIDefaultSocketFactory extends RMISocketFactory { diff --git a/libjava/gnu/java/rmi/server/RMIIncomingThread.java b/libjava/gnu/java/rmi/server/RMIIncomingThread.java index 2855c039e87..a6e2fee83c4 100644 --- a/libjava/gnu/java/rmi/server/RMIIncomingThread.java +++ b/libjava/gnu/java/rmi/server/RMIIncomingThread.java @@ -1,5 +1,5 @@ -/* - Copyright (c) 1996, 1997, 1998, 1999, 2002 Free Software Foundation, Inc. +/* RMIIncomingThread.java -- + Copyright (c) 1996, 1997, 1998, 1999, 2002 Free Software Foundation, Inc. This file is part of GNU Classpath. diff --git a/libjava/gnu/java/rmi/server/RMIObjectInputStream.java b/libjava/gnu/java/rmi/server/RMIObjectInputStream.java index ffdccba4f62..c890a14337e 100644 --- a/libjava/gnu/java/rmi/server/RMIObjectInputStream.java +++ b/libjava/gnu/java/rmi/server/RMIObjectInputStream.java @@ -39,8 +39,8 @@ exception statement from your version. */ package gnu.java.rmi.server; -import java.io.InputStream; import java.io.IOException; +import java.io.InputStream; import java.io.ObjectInputStream; import java.io.ObjectStreamClass; import java.lang.reflect.Proxy; diff --git a/libjava/gnu/java/rmi/server/RMIObjectOutputStream.java b/libjava/gnu/java/rmi/server/RMIObjectOutputStream.java index 1ae2000da08..32aa5314ed5 100644 --- a/libjava/gnu/java/rmi/server/RMIObjectOutputStream.java +++ b/libjava/gnu/java/rmi/server/RMIObjectOutputStream.java @@ -43,8 +43,8 @@ import java.io.IOException; import java.io.ObjectOutputStream; import java.io.OutputStream; import java.rmi.Remote; -import java.rmi.server.RemoteStub; import java.rmi.server.RMIClassLoader; +import java.rmi.server.RemoteStub; public class RMIObjectOutputStream extends ObjectOutputStream { diff --git a/libjava/gnu/java/rmi/server/RMIVoidValue.java b/libjava/gnu/java/rmi/server/RMIVoidValue.java index 7829fc60138..bad8b96523f 100644 --- a/libjava/gnu/java/rmi/server/RMIVoidValue.java +++ b/libjava/gnu/java/rmi/server/RMIVoidValue.java @@ -1,5 +1,5 @@ -/* RMIVoidValue.java - Copyright (c) 2003 Free Software Foundation, Inc. +/* RMIVoidValue.java -- + Copyright (c) 2003 Free Software Foundation, Inc. This file is part of GNU Classpath. diff --git a/libjava/gnu/java/rmi/server/UnicastConnectionManager.java b/libjava/gnu/java/rmi/server/UnicastConnectionManager.java index ef01c8264e5..c8c1d57ca59 100644 --- a/libjava/gnu/java/rmi/server/UnicastConnectionManager.java +++ b/libjava/gnu/java/rmi/server/UnicastConnectionManager.java @@ -39,20 +39,17 @@ exception statement from your version. */ package gnu.java.rmi.server; -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.ObjectOutput; import java.net.InetAddress; -import java.net.Socket; import java.net.ServerSocket; +import java.net.Socket; 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.rmi.server.RMIServerSocketFactory; +import java.rmi.server.RMISocketFactory; import java.util.ArrayList; import java.util.ConcurrentModificationException; import java.util.Hashtable; diff --git a/libjava/gnu/java/rmi/server/UnicastRef.java b/libjava/gnu/java/rmi/server/UnicastRef.java index 60a745e84f5..77042d724b0 100644 --- a/libjava/gnu/java/rmi/server/UnicastRef.java +++ b/libjava/gnu/java/rmi/server/UnicastRef.java @@ -1,5 +1,6 @@ -/* - Copyright (c) 1996, 1997, 1998, 1999, 2002 Free Software Foundation, Inc. +/* UnicastRef.java -- + Copyright (c) 1996, 1997, 1998, 1999, 2002, 2005 + Free Software Foundation, Inc. This file is part of GNU Classpath. diff --git a/libjava/gnu/java/rmi/server/UnicastRemoteCall.java b/libjava/gnu/java/rmi/server/UnicastRemoteCall.java index abbe0272544..e38f0f92bb3 100644 --- a/libjava/gnu/java/rmi/server/UnicastRemoteCall.java +++ b/libjava/gnu/java/rmi/server/UnicastRemoteCall.java @@ -1,5 +1,6 @@ /* UnicastRemoteCall.java - Copyright (c) 1996, 1997, 1998, 1999, 2002, 2004 Free Software Foundation, Inc. + Copyright (c) 1996, 1997, 1998, 1999, 2002, 2004, 2005 + Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -44,11 +45,11 @@ import java.io.IOException; import java.io.ObjectInput; import java.io.ObjectOutput; import java.io.StreamCorruptedException; -import java.rmi.RemoteException; import java.rmi.MarshalException; +import java.rmi.RemoteException; import java.rmi.UnmarshalException; -import java.rmi.server.RemoteCall; import java.rmi.server.ObjID; +import java.rmi.server.RemoteCall; import java.rmi.server.UID; import java.util.Vector; diff --git a/libjava/gnu/java/rmi/server/UnicastRemoteStub.java b/libjava/gnu/java/rmi/server/UnicastRemoteStub.java index 97b91104783..f19ecccb925 100644 --- a/libjava/gnu/java/rmi/server/UnicastRemoteStub.java +++ b/libjava/gnu/java/rmi/server/UnicastRemoteStub.java @@ -1,5 +1,5 @@ -/* - Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc. +/* UnicastRemoteStub.java -- + Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -37,8 +37,8 @@ exception statement from your version. */ package gnu.java.rmi.server; -import java.rmi.server.RemoteStub; import java.rmi.server.RemoteRef; +import java.rmi.server.RemoteStub; public class UnicastRemoteStub extends RemoteStub { diff --git a/libjava/gnu/java/rmi/server/UnicastServerRef.java b/libjava/gnu/java/rmi/server/UnicastServerRef.java index ce4420c4701..71c84a58aed 100644 --- a/libjava/gnu/java/rmi/server/UnicastServerRef.java +++ b/libjava/gnu/java/rmi/server/UnicastServerRef.java @@ -41,17 +41,17 @@ package gnu.java.rmi.server; import java.io.ObjectInputStream; import java.lang.reflect.Constructor; -import java.lang.reflect.Method; import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; import java.rmi.Remote; import java.rmi.RemoteException; -import java.rmi.server.RemoteStub; import java.rmi.server.ObjID; -import java.rmi.server.ServerRef; -import java.rmi.server.RemoteServer; +import java.rmi.server.RMIServerSocketFactory; import java.rmi.server.RemoteRef; +import java.rmi.server.RemoteServer; +import java.rmi.server.RemoteStub; import java.rmi.server.ServerNotActiveException; -import java.rmi.server.RMIServerSocketFactory; +import java.rmi.server.ServerRef; import java.rmi.server.Skeleton; import java.util.Hashtable; |
