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

	* gnu/java/rmi/server/ProtocolConstants.java,
	gnu/java/security/der/DER.java,
	java/net/URLStreamHandlerFactory.java,
	java/rmi/activation/ActivationInstantiator.java,
	java/rmi/activation/ActivationMonitor.java,
	java/rmi/activation/ActivationSystem.java,
	java/rmi/activation/Activator.java:
	Removed redundant modifiers.
	* java/sql/DatabaseMetaData.java,
	java/sql/ParameterMetaData.java,
	java/sql/PreparedStatement.java:
	Readded accidently removed modifiers.

8 files changed, 47 insertions, 26 deletions

diff --git a/java/net/URLStreamHandlerFactory.java b/java/net/URLStreamHandlerFactory.java
index a9ecbad8f..268bddb4b 100644
--- a/java/net/URLStreamHandlerFactory.java
+++ b/java/net/URLStreamHandlerFactory.java
@@ -61,7 +61,7 @@ public interface URLStreamHandlerFactory
     *
     * @return The <code>URLStreamHandler</code> for the specified protocol
     */
-  public URLStreamHandler createURLStreamHandler(String protocol);
+  URLStreamHandler createURLStreamHandler (String protocol);
 
 } // interface URLStreamHandlerFactory
 
diff --git a/java/rmi/activation/ActivationInstantiator.java b/java/rmi/activation/ActivationInstantiator.java
index 76cbd21be..d47071a22 100644
--- a/java/rmi/activation/ActivationInstantiator.java
+++ b/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/java/rmi/activation/ActivationMonitor.java b/java/rmi/activation/ActivationMonitor.java
index 2bdf64cb9..67b775553 100644
--- a/java/rmi/activation/ActivationMonitor.java
+++ b/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/java/rmi/activation/ActivationSystem.java b/java/rmi/activation/ActivationSystem.java
index 399df17b8..a4b9a054d 100644
--- a/java/rmi/activation/ActivationSystem.java
+++ b/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/java/rmi/activation/Activator.java b/java/rmi/activation/Activator.java
index 4c8391b09..834f68e28 100644
--- a/java/rmi/activation/Activator.java
+++ b/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/java/sql/DatabaseMetaData.java b/java/sql/DatabaseMetaData.java
index 056c8ba58..d3cfd7c2e 100644
--- a/java/sql/DatabaseMetaData.java
+++ b/java/sql/DatabaseMetaData.java
@@ -37,7 +37,7 @@ exception statement from your version. */
 
 package java.sql;
 
-interface DatabaseMetaData 
+public interface DatabaseMetaData 
 {
   /**
    * It is unknown whether or not the procedure returns a result.
diff --git a/java/sql/ParameterMetaData.java b/java/sql/ParameterMetaData.java
index 118c76e66..11ac6ebda 100644
--- a/java/sql/ParameterMetaData.java
+++ b/java/sql/ParameterMetaData.java
@@ -40,7 +40,7 @@ package java.sql;
 /**
  * @since 1.4
  */
-interface ParameterMetaData 
+public interface ParameterMetaData 
 {
   int parameterNoNulls = 0;
 
diff --git a/java/sql/PreparedStatement.java b/java/sql/PreparedStatement.java
index 3d095e0a6..0fc5d4d26 100644
--- a/java/sql/PreparedStatement.java
+++ b/java/sql/PreparedStatement.java
@@ -51,7 +51,7 @@ import java.util.Calendar;
  *
  * @author Aaron M. Renn (arenn@urbanophile.com)
  */
-interface PreparedStatement extends Statement 
+public interface PreparedStatement extends Statement 
 {
   /**
    * This method executes a prepared SQL query and returns its ResultSet.