Commit d5a87c2b by Michael Koch Committed by Michael Koch

ActivationInstantiator.java, [...]: Removed redundant modifiers.

2003-10-11  Michael Koch  <konqueror@gmx.de>

	* java/rmi/activation/ActivationInstantiator.java,
	java/rmi/activation/ActivationMonitor.java,
	java/rmi/activation/ActivationSystem.java,
	java/rmi/activation/Activator.java,
	java/rmi/dgc/DGC.java,
	java/rmi/registry/Registry.java,
	java/rmi/registry/RegistryHandler.java,
	java/rmi/server/LoaderHandler.java,
	java/rmi/server/RMIClientSocketFactory.java,
	java/rmi/server/RMIFailureHandler.java,
	java/rmi/server/RMIServerSocketFactory.java,
	java/rmi/server/RemoteCall.java,
	java/rmi/server/RemoteRef.java,
	java/rmi/server/ServerRef.java,
	java/rmi/server/Skeleton.java,
	java/rmi/server/Unreferenced.java:
	Removed redundant modifiers.

From-SVN: r72354
parent 7afb0eea
2003-10-11 Michael Koch <konqueror@gmx.de>
* java/rmi/activation/ActivationInstantiator.java,
java/rmi/activation/ActivationMonitor.java,
java/rmi/activation/ActivationSystem.java,
java/rmi/activation/Activator.java,
java/rmi/dgc/DGC.java,
java/rmi/registry/Registry.java,
java/rmi/registry/RegistryHandler.java,
java/rmi/server/LoaderHandler.java,
java/rmi/server/RMIClientSocketFactory.java,
java/rmi/server/RMIFailureHandler.java,
java/rmi/server/RMIServerSocketFactory.java,
java/rmi/server/RemoteCall.java,
java/rmi/server/RemoteRef.java,
java/rmi/server/ServerRef.java,
java/rmi/server/Skeleton.java,
java/rmi/server/Unreferenced.java:
Removed redundant modifiers.
2003-10-11 Michael Koch <konqueror@gmx.de>
* java/net/ContentHandlerFactory.java,
java/net/DatagramSocketImplFactory.java,
java/net/FileNameMap.java,
......
......@@ -44,6 +44,6 @@ import java.rmi.MarshalledObject;
public interface ActivationInstantiator
extends Remote
{
public MarshalledObject newInstance (ActivationID id, ActivationDesc desc)
MarshalledObject newInstance (ActivationID id, ActivationDesc desc)
throws ActivationException, RemoteException;
}
......@@ -41,11 +41,14 @@ import java.rmi.Remote;
import java.rmi.RemoteException;
import java.rmi.MarshalledObject;
public interface ActivationMonitor
extends Remote {
public interface ActivationMonitor extends Remote
{
void inactiveObject (ActivationID id)
throws UnknownObjectException, RemoteException;
public void inactiveObject(ActivationID id) throws UnknownObjectException, RemoteException;
public void activeObject(ActivationID id, MarshalledObject obj) throws UnknownObjectException, RemoteException;
public void inactiveGroup(ActivationGroupID id, long incarnation) throws UnknownGroupException, RemoteException;
void activeObject (ActivationID id, MarshalledObject obj)
throws UnknownObjectException, RemoteException;
void inactiveGroup (ActivationGroupID id, long incarnation)
throws UnknownGroupException, RemoteException;
}
......@@ -40,20 +40,38 @@ package java.rmi.activation;
import java.rmi.Remote;
import java.rmi.RemoteException;
public interface ActivationSystem
extends Remote {
public static final int SYSTEM_PORT = 0; // XXX
public ActivationID registerObject(ActivationDesc desc) throws ActivationException, UnknownGroupException, RemoteException;
public void unregisterObject(ActivationID id) throws ActivationException, UnknownObjectException, RemoteException;
public ActivationGroupID registerGroup(ActivationGroupDesc desc) throws ActivationException, RemoteException;
public ActivationMonitor activeGroup(ActivationGroupID id, ActivationInstantiator group, long incarnation) throws UnknownGroupException, ActivationException, RemoteException;
public void unregisterGroup(ActivationGroupID id) throws ActivationException, UnknownGroupException, RemoteException;
public void shutdown() throws RemoteException;
public ActivationDesc setActivationDesc(ActivationID id, ActivationDesc desc) throws ActivationException, UnknownObjectException, UnknownGroupException, RemoteException;
public ActivationGroupDesc setActivationGroupDesc(ActivationGroupID id, ActivationGroupDesc desc) throws ActivationException, UnknownGroupException, RemoteException;
public ActivationDesc getActivationDesc(ActivationID id) throws ActivationException, UnknownObjectException, RemoteException;
public ActivationGroupDesc getActivationGroupDesc(ActivationGroupID id) throws ActivationException, UnknownGroupException, RemoteException;
public interface ActivationSystem extends Remote
{
int SYSTEM_PORT = 0; // XXX
ActivationID registerObject (ActivationDesc desc)
throws ActivationException, UnknownGroupException, RemoteException;
void unregisterObject (ActivationID id)
throws ActivationException, UnknownObjectException, RemoteException;
ActivationGroupID registerGroup (ActivationGroupDesc desc)
throws ActivationException, RemoteException;
ActivationMonitor activeGroup (ActivationGroupID id,
ActivationInstantiator group, long incarnation)
throws UnknownGroupException, ActivationException, RemoteException;
void unregisterGroup (ActivationGroupID id)
throws ActivationException, UnknownGroupException, RemoteException;
void shutdown()
throws RemoteException;
ActivationDesc setActivationDesc (ActivationID id, ActivationDesc desc)
throws ActivationException, UnknownObjectException, UnknownGroupException,
RemoteException;
ActivationGroupDesc setActivationGroupDesc (ActivationGroupID id,
ActivationGroupDesc desc)
throws ActivationException, UnknownGroupException, RemoteException;
ActivationDesc getActivationDesc (ActivationID id) throws ActivationException, UnknownObjectException, RemoteException;
ActivationGroupDesc getActivationGroupDesc (ActivationGroupID id) throws ActivationException, UnknownGroupException, RemoteException;
}
......@@ -44,6 +44,6 @@ import java.rmi.MarshalledObject;
public interface Activator
extends Remote
{
public MarshalledObject activate(ActivationID id, boolean force)
MarshalledObject activate (ActivationID id, boolean force)
throws ActivationException, UnknownObjectException, RemoteException;
}
......@@ -41,11 +41,11 @@ import java.rmi.Remote;
import java.rmi.RemoteException;
import java.rmi.server.ObjID;
public interface DGC
extends Remote {
public Lease dirty(ObjID[] ids, long sequenceNum, Lease lease) throws RemoteException;
public void clean(ObjID[] ids, long sequenceNum, VMID vmid, boolean strong) throws RemoteException;
public interface DGC extends Remote
{
Lease dirty (ObjID[] ids, long sequenceNum, Lease lease)
throws RemoteException;
void clean (ObjID[] ids, long sequenceNum, VMID vmid, boolean strong)
throws RemoteException;
}
......@@ -45,20 +45,20 @@ import java.rmi.Remote;
public interface Registry extends Remote
{
public static final int REGISTRY_PORT = 1099;
int REGISTRY_PORT = 1099;
public Remote lookup(String name)
Remote lookup(String name)
throws RemoteException, NotBoundException, AccessException;
public void bind(String name, Remote obj)
void bind(String name, Remote obj)
throws RemoteException, AlreadyBoundException, AccessException;
public void unbind(String name)
void unbind(String name)
throws RemoteException, NotBoundException, AccessException;
public void rebind(String name, Remote obj)
void rebind(String name, Remote obj)
throws RemoteException, AccessException;
public String[] list()
String[] list()
throws RemoteException, AccessException;
}
......@@ -48,11 +48,11 @@ public interface RegistryHandler
/**
* @deprecated
*/
public Registry registryStub (String host, int port)
Registry registryStub (String host, int port)
throws RemoteException, UnknownHostException;
/**
* @deprecated
*/
public Registry registryImpl (int port) throws RemoteException;
Registry registryImpl (int port) throws RemoteException;
}
......@@ -45,22 +45,22 @@ import java.net.URL;
*/
public interface LoaderHandler
{
public static final String packagePrefix = "";
String packagePrefix = "";
/**
* @deprecated
*/
public Class loadClass(String name)
Class loadClass(String name)
throws MalformedURLException, ClassNotFoundException;
/**
* @deprecated
*/
public Class loadClass(URL codebase, String name)
Class loadClass(URL codebase, String name)
throws MalformedURLException, ClassNotFoundException;
/**
* @deprecated
*/
public Object getSecurityContext(ClassLoader loader);
Object getSecurityContext(ClassLoader loader);
}
......@@ -40,8 +40,7 @@ package java.rmi.server;
import java.net.Socket;
import java.io.IOException;
public interface RMIClientSocketFactory {
public Socket createSocket(String host, int port) throws IOException;
public interface RMIClientSocketFactory
{
Socket createSocket (String host, int port) throws IOException;
}
......@@ -42,5 +42,5 @@ public interface RMIFailureHandler
/**
* @exception IOException If an error occurs
*/
public boolean failure (Exception ex);
boolean failure (Exception ex);
}
......@@ -40,8 +40,7 @@ package java.rmi.server;
import java.net.ServerSocket;
import java.io.IOException;
public interface RMIServerSocketFactory {
public ServerSocket createServerSocket(int port) throws IOException;
public interface RMIServerSocketFactory
{
ServerSocket createServerSocket(int port) throws IOException;
}
......@@ -51,36 +51,36 @@ public interface RemoteCall
/**
* @deprecated
*/
public ObjectOutput getOutputStream () throws IOException;
ObjectOutput getOutputStream () throws IOException;
/**
* @deprecated
*/
public void releaseOutputStream () throws IOException;
void releaseOutputStream () throws IOException;
/**
* @deprecated
*/
public ObjectInput getInputStream () throws IOException;
ObjectInput getInputStream () throws IOException;
/**
* @deprecated
*/
public void releaseInputStream () throws IOException;
void releaseInputStream () throws IOException;
/**
* @deprecated
*/
public ObjectOutput getResultStream (boolean success)
ObjectOutput getResultStream (boolean success)
throws IOException, StreamCorruptedException;
/**
* @deprecated
*/
public void executeCall () throws Exception;
void executeCall () throws Exception;
/**
* @deprecated
*/
public void done () throws IOException;
void done () throws IOException;
}
......@@ -45,35 +45,34 @@ import java.io.ObjectOutput;
public interface RemoteRef extends Externalizable
{
public static final long serialVersionUID = 0;
long serialVersionUID = 0;
public static final String packagePrefix = "gnu.java.rmi.server";
String packagePrefix = "gnu.java.rmi.server";
/**
* @deprecated
*/
public void invoke(RemoteCall call) throws Exception;
void invoke (RemoteCall call) throws Exception;
public Object invoke (Remote obj, Method method, Object[] params, long opnum)
Object invoke (Remote obj, Method method, Object[] params, long opnum)
throws Exception;
/**
* @deprecated
*/
public RemoteCall newCall (RemoteObject obj, Operation[] op, int opnum,
long hash)
RemoteCall newCall (RemoteObject obj, Operation[] op, int opnum, long hash)
throws RemoteException;
/**
* @deprecated
*/
public void done (RemoteCall call) throws RemoteException;
void done (RemoteCall call) throws RemoteException;
public boolean remoteEquals (RemoteRef ref);
boolean remoteEquals (RemoteRef ref);
public int remoteHashCode ();
int remoteHashCode();
public String getRefClass (ObjectOutput out);
String getRefClass (ObjectOutput out);
public String remoteToString ();
String remoteToString();
}
......@@ -37,17 +37,16 @@ exception statement from your version. */
package java.rmi.server;
import java.rmi.server.RemoteStub;
import java.rmi.Remote;
import java.rmi.RemoteException;
import java.rmi.server.RemoteStub;
import java.rmi.server.ServerNotActiveException;
public interface ServerRef
extends RemoteRef {
public static final long serialVersionUID = 0;
public interface ServerRef extends RemoteRef
{
long serialVersionUID = 0;
public RemoteStub exportObject(Remote obj, Object data) throws RemoteException;
public String getClientHost() throws ServerNotActiveException;
RemoteStub exportObject(Remote obj, Object data) throws RemoteException;
String getClientHost() throws ServerNotActiveException;
}
......@@ -48,11 +48,11 @@ public interface Skeleton
/**
* @deprecated
*/
public void dispatch (Remote obj, RemoteCall theCall, int opnum, long hash)
void dispatch (Remote obj, RemoteCall theCall, int opnum, long hash)
throws Exception;
/**
* @deprecated
*/
public Operation[] getOperations();
Operation[] getOperations();
}
......@@ -37,8 +37,7 @@ exception statement from your version. */
package java.rmi.server;
public interface Unreferenced {
public void unreferenced();
public interface Unreferenced
{
void unreferenced();
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment