procyberian/gcc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
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
This commit is contained in:
Michael Koch 2004-10-21 20:14:03 +00:00 • committed by Michael Koch
parent c28fdf712f
commit 02db0fc1ce
22 changed files with 110 additions and 68 deletions
Download patch file Download diff file Expand all files Collapse all files

2
libjava/java/rmi/MarshalledObject.java
View file

@ -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;

5
libjava/java/rmi/Naming.java
View file

@ -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 {

18
libjava/java/rmi/activation/Activatable.java
View file

@ -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 {

14
libjava/java/rmi/activation/ActivationGroup.java
View file

@ -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 {

5
libjava/java/rmi/activation/ActivationGroupDesc.java
View file

@ -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
{

5
libjava/java/rmi/activation/ActivationInstantiator.java
View file

@ -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

5
libjava/java/rmi/activation/ActivationMonitor.java
View file

@ -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
{

3
libjava/java/rmi/activation/ActivationSystem.java
View file

@ -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;

5
libjava/java/rmi/activation/Activator.java
View file

@ -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

13
libjava/java/rmi/registry/LocateRegistry.java
View file

@ -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 {

7
libjava/java/rmi/registry/Registry.java
View file

@ -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
{

5
libjava/java/rmi/server/LogStream.java
View file

@ -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

18
libjava/java/rmi/server/ObjID.java
View file

@ -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;

5
libjava/java/rmi/server/RMIClientSocketFactory.java
View file

@ -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
{

5
libjava/java/rmi/server/RMIServerSocketFactory.java
View file

@ -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
{

10
libjava/java/rmi/server/RMISocketFactory.java
View file

@ -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
{

5
libjava/java/rmi/server/RemoteCall.java
View file

@ -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;
/**

10
libjava/java/rmi/server/RemoteServer.java
View file

@ -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() {

3
libjava/java/rmi/server/ServerRef.java
View file

@ -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
{

3
libjava/java/rmi/server/UID.java
View file

@ -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;

7
libjava/java/rmi/server/UnicastRemoteObject.java
View file

@ -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;