From d5a87c2b1d8f556e3d0e01d1e24ffb48d7322cb0 Mon Sep 17 00:00:00 2001 From: Michael Koch Date: Sat, 11 Oct 2003 18:42:07 +0000 Subject: ActivationInstantiator.java, [...]: Removed redundant modifiers. 2003-10-11 Michael Koch * 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 --- libjava/java/rmi/server/LoaderHandler.java | 8 ++++---- libjava/java/rmi/server/RMIClientSocketFactory.java | 7 +++---- libjava/java/rmi/server/RMIFailureHandler.java | 2 +- libjava/java/rmi/server/RMIServerSocketFactory.java | 7 +++---- libjava/java/rmi/server/RemoteCall.java | 14 +++++++------- libjava/java/rmi/server/RemoteRef.java | 21 ++++++++++----------- libjava/java/rmi/server/ServerRef.java | 13 ++++++------- libjava/java/rmi/server/Skeleton.java | 4 ++-- libjava/java/rmi/server/Unreferenced.java | 7 +++---- 9 files changed, 39 insertions(+), 44 deletions(-) (limited to 'libjava/java/rmi/server') diff --git a/libjava/java/rmi/server/LoaderHandler.java b/libjava/java/rmi/server/LoaderHandler.java index 872585d..3f44142 100644 --- a/libjava/java/rmi/server/LoaderHandler.java +++ b/libjava/java/rmi/server/LoaderHandler.java @@ -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); } diff --git a/libjava/java/rmi/server/RMIClientSocketFactory.java b/libjava/java/rmi/server/RMIClientSocketFactory.java index af85ad9..cbb8dba 100644 --- a/libjava/java/rmi/server/RMIClientSocketFactory.java +++ b/libjava/java/rmi/server/RMIClientSocketFactory.java @@ -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; } diff --git a/libjava/java/rmi/server/RMIFailureHandler.java b/libjava/java/rmi/server/RMIFailureHandler.java index dace6fa..c48f250 100644 --- a/libjava/java/rmi/server/RMIFailureHandler.java +++ b/libjava/java/rmi/server/RMIFailureHandler.java @@ -42,5 +42,5 @@ public interface RMIFailureHandler /** * @exception IOException If an error occurs */ - public boolean failure (Exception ex); + boolean failure (Exception ex); } diff --git a/libjava/java/rmi/server/RMIServerSocketFactory.java b/libjava/java/rmi/server/RMIServerSocketFactory.java index c372c73..a5c52ff 100644 --- a/libjava/java/rmi/server/RMIServerSocketFactory.java +++ b/libjava/java/rmi/server/RMIServerSocketFactory.java @@ -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; } diff --git a/libjava/java/rmi/server/RemoteCall.java b/libjava/java/rmi/server/RemoteCall.java index bccbaf1..c244d6e 100644 --- a/libjava/java/rmi/server/RemoteCall.java +++ b/libjava/java/rmi/server/RemoteCall.java @@ -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; } diff --git a/libjava/java/rmi/server/RemoteRef.java b/libjava/java/rmi/server/RemoteRef.java index c9abfd6..1016869 100644 --- a/libjava/java/rmi/server/RemoteRef.java +++ b/libjava/java/rmi/server/RemoteRef.java @@ -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(); } diff --git a/libjava/java/rmi/server/ServerRef.java b/libjava/java/rmi/server/ServerRef.java index 46911c8..e347de9 100644 --- a/libjava/java/rmi/server/ServerRef.java +++ b/libjava/java/rmi/server/ServerRef.java @@ -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; } diff --git a/libjava/java/rmi/server/Skeleton.java b/libjava/java/rmi/server/Skeleton.java index 7516394..96c4214 100644 --- a/libjava/java/rmi/server/Skeleton.java +++ b/libjava/java/rmi/server/Skeleton.java @@ -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(); } diff --git a/libjava/java/rmi/server/Unreferenced.java b/libjava/java/rmi/server/Unreferenced.java index e0f337e..8602ce1 100644 --- a/libjava/java/rmi/server/Unreferenced.java +++ b/libjava/java/rmi/server/Unreferenced.java @@ -37,8 +37,7 @@ exception statement from your version. */ package java.rmi.server; -public interface Unreferenced { - -public void unreferenced(); - +public interface Unreferenced +{ + void unreferenced(); } -- cgit v1.1