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.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@72354 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index b4f242a..4261e15 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,5 +1,25 @@
 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,

diff --git a/libjava/java/rmi/activation/ActivationInstantiator.java b/libjava/java/rmi/activation/ActivationInstantiator.java
index 76cbd21..d47071a 100644 (file)
--- a/libjava/java/rmi/activation/ActivationInstantiator.java
+++ b/libjava/java/rmi/activation/ActivationInstantiator.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;
 }

diff --git a/libjava/java/rmi/activation/ActivationMonitor.java b/libjava/java/rmi/activation/ActivationMonitor.java
index 2bdf64c..67b7755 100644 (file)
--- a/libjava/java/rmi/activation/ActivationMonitor.java
+++ b/libjava/java/rmi/activation/ActivationMonitor.java
@@ -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;
 }

diff --git a/libjava/java/rmi/activation/ActivationSystem.java b/libjava/java/rmi/activation/ActivationSystem.java
index 399df17..a4b9a05 100644 (file)
--- a/libjava/java/rmi/activation/ActivationSystem.java
+++ b/libjava/java/rmi/activation/ActivationSystem.java
@@ -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;
 }

diff --git a/libjava/java/rmi/activation/Activator.java b/libjava/java/rmi/activation/Activator.java
index 4c8391b..834f68e 100644 (file)
--- a/libjava/java/rmi/activation/Activator.java
+++ b/libjava/java/rmi/activation/Activator.java
@@ -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;
 }

diff --git a/libjava/java/rmi/dgc/DGC.java b/libjava/java/rmi/dgc/DGC.java
index 176af0c..b62c7fd 100644 (file)
--- a/libjava/java/rmi/dgc/DGC.java
+++ b/libjava/java/rmi/dgc/DGC.java
@@ -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;
 }

diff --git a/libjava/java/rmi/registry/Registry.java b/libjava/java/rmi/registry/Registry.java
index 203da11..cbab4e7 100644 (file)
--- a/libjava/java/rmi/registry/Registry.java
+++ b/libjava/java/rmi/registry/Registry.java
@@ -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;
 }

diff --git a/libjava/java/rmi/registry/RegistryHandler.java b/libjava/java/rmi/registry/RegistryHandler.java
index bf89b6a..27cedfb 100644 (file)
--- a/libjava/java/rmi/registry/RegistryHandler.java
+++ b/libjava/java/rmi/registry/RegistryHandler.java
@@ -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;
 }

diff --git a/libjava/java/rmi/server/LoaderHandler.java b/libjava/java/rmi/server/LoaderHandler.java
index 872585d..3f44142 100644 (file)
--- 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 (file)
--- 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 (file)
--- 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 (file)
--- 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 (file)
--- 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 (file)
--- 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 (file)
--- 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 (file)
--- 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 (file)
--- 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();
 }